Fixed display bug for branch tables and moved message setting to the bottom of contin...

diff --git a/mod/lesson/action/continue.php b/mod/lesson/action/continue.php
index abeb6d4d5e0a1004fa37c0b2e0c000bda22e00d8..f05d9e875ca31577b99aa8f4d4902ab4b11aec87 100644 (file)
--- a/mod/lesson/action/continue.php
+++ b/mod/lesson/action/continue.php
@@ -9,13 +9,6 @@
     if (!has_capability('mod/lesson:manage', $context)) {
         $lesson->displayleft = lesson_displayleftif($lesson);
     }
-    
-    // This is the warning msg for teachers to inform them that cluster and unseen does not work while logged in as a teacher
-    if(has_capability('mod/lesson:manage', $context) and lesson_display_teacher_warning($lesson->id)) {
-        $warningvars->cluster = get_string("clusterjump", "lesson");
-        $warningvars->unseen = get_string("unseenpageinbranch", "lesson");
-        lesson_set_message(get_string("teacherjumpwarning", "lesson", $warningvars));
-    }
 
     // This is the code updates the lesson time for a timed test
     // get time information for this user
@@ -46,11 +39,6 @@
             error("Error: could not update lesson_timer table");
         }
     }
-    
-    // Inform teacher that s/he will not see the timer
-    if ($lesson->timed and has_capability('mod/lesson:manage', $context)) {
-        lesson_set_message(get_string("teachertimerwarning", "lesson"));
-    }
 
     // record answer (if necessary) and show response (if none say if answer is correct or not)
     $pageid = required_param('pageid', PARAM_INT);
@@ -768,6 +756,18 @@
         }
     }
     
+/// Set Messages
+
+    // This is the warning msg for teachers to inform them that cluster and unseen does not work while logged in as a teacher
+    if(has_capability('mod/lesson:manage', $context) and lesson_display_teacher_warning($lesson->id)) {
+        $warningvars->cluster = get_string("clusterjump", "lesson");
+        $warningvars->unseen = get_string("unseenpageinbranch", "lesson");
+        lesson_set_message(get_string("teacherjumpwarning", "lesson", $warningvars));
+    }
+    // Inform teacher that s/he will not see the timer
+    if ($lesson->timed and has_capability('mod/lesson:manage', $context)) {
+        lesson_set_message(get_string("teachertimerwarning", "lesson"));
+    }
     // Report attempts remaining
     if ($attemptsremaining != 0) {
         lesson_set_message(get_string('attemptsremaining', 'lesson', $attemptsremaining));

diff --git a/mod/lesson/viewstart.html b/mod/lesson/viewstart.html
index 9824ddf130ecec742ba81180050c53715ef2b8f0..8d243546253b7ae68099ed46232e42aa205117c7 100644 (file)
--- a/mod/lesson/viewstart.html
+++ b/mod/lesson/viewstart.html
@@ -34,7 +34,7 @@ if ($lesson->displayleft) {
 } // End if ($lesson->displayleft)
 ?>
         <!-- Start main column -->
-        <td width="100%">
+        <td width="100%" align="center">
             
             <?php if ($lesson->displayleft) { ?>
             
@@ -44,7 +44,7 @@ if ($lesson->displayleft) {
 
 <?php if($lesson->slideshow && $page->qtype == LESSON_BRANCHTABLE) { // Starts the slideshow div ?>
     
-            <div class="slideshow\" style="background-color: <?php echo $lesson->bgcolor?>; height: <?php echo $lesson->height ?>px; width: <?php echo $lesson->width?>px;">
+            <div class="slideshow" style="background-color: <?php echo $lesson->bgcolor?>; height: <?php echo $lesson->height ?>px; width: <?php echo $lesson->width?>px;">
                 
 <?php } ?>