[BugFix] Bug #5396 - Found that the css float was causing the odd problem. Removed...

Also improved some logic in the button processing for branch tables

diff --git a/mod/lesson/styles.php b/mod/lesson/styles.php
index 0a44c509084ce83105fae197b3b0d662229340a2..7f62f4b1e9706d274dabd3fa2a1e36cd160d848d 100644 (file)
--- a/mod/lesson/styles.php
+++ b/mod/lesson/styles.php
@@ -145,27 +145,22 @@
 
 /* Next three classes are for branch table buttons when displayed horizontally */
 .mod-lesson .prevhorizontal {
-    display: inline;
-    float: left;
 }
 
 .mod-lesson .nexthorizontal {
-    display: inline;
-    float: right;
 }
 
 .mod-lesson .standardhorizontal {
-    display: inline;
 }
 
 /* Next three classes are for branch table buttons when displayed vertically */
 .mod-lesson .prevvertical {
 }
 
-.mod-lesson .nextvertical a {
+.mod-lesson .nextvertical {
 }
 
-.mod-lesson .standardvertical a {
+.mod-lesson .standardvertical {
 }
 
 /*  branchbuttoncontainer wraps around branch table buttons */

diff --git a/mod/lesson/view.php b/mod/lesson/view.php
index 68f9a792e0c2cbbb9991570eaef494cdf91f2294..b7e2755a749ca5bde0c699619f88a61da13a0d7e 100644 (file)
--- a/mod/lesson/view.php
+++ b/mod/lesson/view.php
@@ -859,15 +859,14 @@
                     /// seperate out next and previous jumps from the other jumps 
                         foreach ($answers as $answer) {
                             if ($answer->jumpto == LESSON_NEXTPAGE) {
-                                $buttons['next'][] = '<a href="javascript:document.answerform.jumpto.value='.$answer->jumpto.';document.answerform.submit();">'.
-                                        strip_tags(format_text($answer->answer, FORMAT_MOODLE, $options)).'</a>';
+                                $type = 'next';
                             } else if ($answer->jumpto == LESSON_PREVIOUSPAGE) {
-                                $buttons['prev'][] = '<a href="javascript:document.answerform.jumpto.value='.$answer->jumpto.';document.answerform.submit();">'.
-                                        strip_tags(format_text($answer->answer, FORMAT_MOODLE, $options)).'</a>';
+                                $type = 'prev';
                             } else {
-                                $buttons['other'][] = '<a href="javascript:document.answerform.jumpto.value='.$answer->jumpto.';document.answerform.submit();">'.
-                                        strip_tags(format_text($answer->answer, FORMAT_MOODLE, $options)).'</a>';
+                                $type = 'other';
                             }
+                            $buttons[$type][] = '<a href="javascript:document.answerform.jumpto.value='.$answer->jumpto.';document.answerform.submit();">'.
+                                    strip_tags(format_text($answer->answer, FORMAT_MOODLE, $options)).'</a>';
                         }
                     
                     /// set the order and orientation (order is very important for the divs to work for horizontal!)
@@ -889,12 +888,12 @@
                             $b = 'a';
                             $c = 'b';
                             $implode = '<br /><br />';
-                            $implode2 = "<br />\n    ";
+                            $implode2 = "<br /><br />\n    ";
                         }
                         $buttonsarranged = array();
-                        $buttonsarranged[$a] = '<div class="lessonbutton prevbutton prev'.$orientation.'">'.implode($implode, $buttons['prev']).'</div>';
-                        $buttonsarranged[$b] = '<div class="lessonbutton nextbutton next'.$orientation.'">'.implode($implode, $buttons['next']).'</div>';
-                        $buttonsarranged[$c] = '<div class="lessonbutton standardbutton standard'.$orientation.'">'.implode($implode, $buttons['other']).'</div>';
+                        $buttonsarranged[$a] = '<span class="lessonbutton prevbutton prev'.$orientation.'">'.implode($implode, $buttons['prev']).'</span>';
+                        $buttonsarranged[$b] = '<span class="lessonbutton nextbutton next'.$orientation.'">'.implode($implode, $buttons['next']).'</span>';
+                        $buttonsarranged[$c] = '<span class="lessonbutton standardbutton standard'.$orientation.'">'.implode($implode, $buttons['other']).'</span>';
                         ksort($buttonsarranged); // sort by key
                         
                         $fullbuttonhtml = "\n<div class=\"branchbuttoncontainer\">\n    " . implode($implode2, $buttonsarranged). "\n</div>\n";