Merging in fixes for MDL-8929 from MOODLE_18_STABLE

diff --git a/lang/en_utf8/lesson.php b/lang/en_utf8/lesson.php
index 94c65be9939bed40d65049a68b428888ac005284..c860999fd2791571b5cc9ed022681537e95a04c4 100644 (file)
--- a/lang/en_utf8/lesson.php
+++ b/lang/en_utf8/lesson.php
@@ -23,7 +23,7 @@ $string['and'] = 'AND';
 $string['answer'] = 'Answer';
 $string['answeredcorrectly'] = 'answered correctly.';
 $string['answersfornumerical'] = 'Answers for Numerical questions should be matched pairs of Minimum and Maximum values';
-$string['arrangebuttonshorizontally'] = 'Arrange Branch buttons horizontally in slideshow mode?';
+$string['arrangebuttonshorizontally'] = 'Arrange Branch buttons horizontally?';
 $string['attempt'] = 'Attempt: $a';
 $string['attempts'] = 'Attempts';
 $string['attemptsdeleted'] = 'Deleted attempts';

diff --git a/mod/lesson/styles.php b/mod/lesson/styles.php
index af51fc20b98b67a0171619177e5557b3902ec29d..95bd04c440caf0cc3bef851a6d4851183889faaf 100644 (file)
--- a/mod/lesson/styles.php
+++ b/mod/lesson/styles.php
@@ -193,11 +193,11 @@
 
 /* Next classes are for branch table buttons when displayed horizontally */
 .mod-lesson .prevhorizontal,
-.mod-lesson .prevhorizontal .lessonbutton,
+.mod-lesson .prevhorizontal div,
 .mod-lesson .nexthorizontal,
-.mod-lesson .nexthorizontal .lessonbutton,
+.mod-lesson .nexthorizontal div,
 .mod-lesson .standardhorizontal,
-.mod-lesson .standardhorizontal .lessonbutton {
+.mod-lesson .standardhorizontal div {
     display: inline;
 }