From: vyshane <vyshane>
Date: Thu, 11 Jan 2007 08:51:46 +0000 (+0000)
Subject: xhtml fixes for MDL-7861.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=4085962ae95594d4ef32eace46069240aae48585;p=moodle.git

xhtml fixes for MDL-7861.
---

diff --git a/mod/lesson/action/addbranchtable.php b/mod/lesson/action/addbranchtable.php
index 931978344b..afd31463b1 100644
--- a/mod/lesson/action/addbranchtable.php
+++ b/mod/lesson/action/addbranchtable.php
@@ -36,28 +36,29 @@
     // give teacher a blank proforma
     print_heading_with_help(get_string("addabranchtable", "lesson"), "overview", "lesson");
     ?>
-    <form id="form" method="post" action="lesson.php">
+    <form id="form" method="post" action="lesson.php" class="addform">
+    <fieldset class="invisiblefieldset">
     <input type="hidden" name="id" value="<?PHP echo $cm->id ?>" />
     <input type="hidden" name="action" value="insertpage" />
     <input type="hidden" name="pageid" value="<?PHP echo $pageid ?>" />
     <input type="hidden" name="qtype" value="<?PHP echo LESSON_BRANCHTABLE ?>" />
     <input type="hidden" name="sesskey" value="<?PHP echo $USER->sesskey ?>" />
-    <center><table class="generalbox" cellpadding="5" border="1">
+    <table class="generalbox boxaligncenter" cellpadding="5" border="1">
     <tr valign="top">
     <td><b><label for="title"><?php print_string("pagetitle", "lesson"); ?>:</label></b><br />
-    <input type="text" id="title" name="title" size="80" maxsize="255" value="" /></td></tr>
+    <input type="text" id="title" name="title" size="80" value="" /></td></tr>
     <?php
-    echo "<tr><td><b>";
-    echo get_string("pagecontents", "lesson").":</b><br />\n";
+    echo "<tr><td><strong>";
+    echo get_string("pagecontents", "lesson").":</strong><br />\n";
     print_textarea($usehtmleditor, 25,70, 630, 400, "contents");
     use_html_editor("contents");
     echo "</td></tr>\n";
     echo "<tr><td>\n";
-    echo "<center><input name=\"layout\" type=\"checkbox\" value=\"1\" checked=\"checked\" />";
+    echo "<div class=\"boxaligncenter addform\"><input name=\"layout\" type=\"checkbox\" value=\"1\" checked=\"checked\" />";
     echo get_string("arrangebuttonshorizontally", "lesson")."\n";
     echo "<br /><input name=\"display\" type=\"checkbox\" value=\"1\" checked=\"checked\" />";
     echo get_string("displayinleftmenu", "lesson");
-    echo "</center>\n";
+    echo "</div>\n";
     echo "</td></tr>\n";
     for ($i = 0; $i < $lesson->maxanswers; $i++) {
         $iplus1 = $i + 1;
@@ -80,5 +81,5 @@
     </table><br />
     <input type="submit" value="<?php  print_string("addabranchtable", "lesson") ?>" />
     <input type="submit" name="cancel" value="<?php  print_string("cancel") ?>" />
-    </center>
+    </fieldset>
     </form>
diff --git a/mod/lesson/action/addpage.php b/mod/lesson/action/addpage.php
index a5d6ec9e48..e6ef9ef1c2 100644
--- a/mod/lesson/action/addpage.php
+++ b/mod/lesson/action/addpage.php
@@ -46,12 +46,12 @@
     // give teacher a blank proforma
     print_heading_with_help(get_string("addaquestionpage", "lesson"), "overview", "lesson");
     ?>
-    <form id="form" method="post" action="lesson.php">
+    <form id="form" method="post" action="lesson.php" class="addform">
+    <fieldset class="invisiblefieldset">
     <input type="hidden" name="id" value="<?php echo $cm->id ?>" />
     <input type="hidden" name="action" value="insertpage" />
     <input type="hidden" name="pageid" value="<?php echo $pageid ?>" />
     <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-    <center>
       <?php
         echo '<b>'.get_string("questiontype", "lesson").":</b> \n";
         echo helpbutton("questiontypes", get_string("questiontype", "lesson"), "lesson")."<br />";
@@ -70,10 +70,10 @@
             echo '</p>';
         }
     ?>
-    <table cellpadding="5" class="generalbox" border="1">
+    <table cellpadding="5" class="generalbox boxaligncenter" border="1">
     <tr valign="top">
     <td><b><label for="title"><?php print_string("pagetitle", "lesson"); ?>:</label></b><br />
-    <input type="text" id="title" name="title" size="80" maxsize="255" value="" /></td></tr>
+    <input type="text" id="title" name="title" size="80" value="" /></td></tr>
     <?php
     echo "<tr><td><b>";
     echo get_string("pagecontents", "lesson").":</b><br />\n";
@@ -193,5 +193,5 @@
     </table><br />
     <input type="submit" value="<?php  print_string("addaquestionpage", "lesson") ?>" />
     <input type="submit" name="cancel" value="<?php  print_string("cancel") ?>" />
-    </center>
+    </fieldset>
     </form>
diff --git a/mod/lesson/action/editpage.php b/mod/lesson/action/editpage.php
index da4f303da0..35e85eddb6 100644
--- a/mod/lesson/action/editpage.php
+++ b/mod/lesson/action/editpage.php
@@ -473,7 +473,7 @@
     ?>
     </table><br />
     <input type="button" value="<?php print_string("redisplaypage", "lesson") ?>" 
-        onClick="getElementById('editpage').redisplay.value=1;getElementById('editpage').submit();" />
+        onclick="getElementById('editpage').redisplay.value=1;getElementById('editpage').submit();" />
     <input type="submit" value="<?php  print_string("savepage", "lesson") ?>" />
     <input type="submit" name="cancel" value="<?php  print_string("cancel") ?>" />
     </center>
diff --git a/mod/lesson/edit.php b/mod/lesson/edit.php
index 99ba5cac10..82d17558f9 100644
--- a/mod/lesson/edit.php
+++ b/mod/lesson/edit.php
@@ -102,7 +102,7 @@
                 $pages[$singlepage->id] = $singlepage;
                 
             case 'full':
-                echo '<table align="center" cellpadding="5" border="0" width="80%">
+                echo '<table class="boxaligncenter" cellpadding="5" border="0" style="width:80%;">
                          <tr>
                              <td align="left">';
                 lesson_print_add_links($cm->id, $prevpageid);
@@ -113,7 +113,7 @@
                     $page = $pages[$pageid];
 
                     echo "<tr><td>\n";
-                    echo "<table width=\"100%\" border=\"1\" class=\"generalbox\"><tr><th colspan=\"2\" scope=\"col\">".format_string($page->title)."&nbsp;&nbsp;\n";
+                    echo "<table style=\"width:100%;\" border=\"1\" class=\"generalbox\"><tr><th colspan=\"2\" scope=\"col\">".format_string($page->title)."&nbsp;&nbsp;\n";
                     lesson_print_page_actions($cm->id, $page, $npages);
                     echo "</th></tr>\n";             
                     echo "<tr><td colspan=\"2\">\n";
@@ -123,7 +123,7 @@
                     echo "</td></tr>\n";
                     // get the answers in a set order, the id order
                     if ($answers = get_records("lesson_answers", "pageid", $page->id, "id")) {
-                        echo "<tr><td colspan=\"2\" align=\"center\"><b>\n";
+                        echo "<tr><td colspan=\"2\" align=\"center\"><strong>\n";
                         echo lesson_get_qtype_name($page->qtype);
                         switch ($page->qtype) {
                             case LESSON_SHORTANSWER :
@@ -140,7 +140,7 @@
                                 echo get_string("firstanswershould", "lesson");
                                 break;
                         }
-                        echo "</b></td></tr>\n";
+                        echo "</strong></td></tr>\n";
                         $i = 1;
                         $n = 0;
                         $options = new stdClass;
@@ -152,26 +152,26 @@
                                 case LESSON_TRUEFALSE:
                                 case LESSON_SHORTANSWER:
                                 case LESSON_NUMERICAL:
-                                    echo "<tr><td align=\"right\" valign=\"top\" width=\"20%\">\n";
+                                    echo "<tr><td align=\"right\" valign=\"top\" style=\"width:20%;\">\n";
                                     if ($lesson->custom) {
                                         // if the score is > 0, then it is correct
                                         if ($answer->score > 0) {
-                                            echo "<b><u>".get_string("answer", "lesson")." $i:</u></b> \n";
+                                            echo '<span class="labelcorrect">'.get_string("answer", "lesson")." $i</span>: \n";
                                         } else {
-                                            echo "<b>".get_string("answer", "lesson")." $i:</b> \n";
+                                            echo '<span class="label">'.get_string("answer", "lesson")." $i</span>: \n";
                                         }
                                     } else {
                                         if (lesson_iscorrect($page->id, $answer->jumpto)) {
                                             // underline correct answers
-                                            echo "<b><u>".get_string("answer", "lesson")." $i:</u></b> \n";
+                                            echo '<span class="correct">'.get_string("answer", "lesson")." $i</span>: \n";
                                         } else {
-                                            echo "<b>".get_string("answer", "lesson")." $i:</b> \n";
+                                            echo '<span class="labelcorrect">'.get_string("answer", "lesson")." $i</span>: \n";
                                         }
                                     }
-                                    echo "</td><td width=\"80%\">\n";
+                                    echo "</td><td style=\"width:80%;\">\n";
                                     echo format_text($answer->answer, FORMAT_MOODLE, $options);
                                     echo "</td></tr>\n";
-                                    echo "<tr><td align=\"right\" valign=\"top\"><b>".get_string("response", "lesson")." $i:</b> \n";
+                                    echo "<tr><td align=\"right\" valign=\"top\"><span class=\"label\">".get_string("response", "lesson")." $i</span>: \n";
                                     echo "</td><td>\n";
                                     echo format_text($answer->response, FORMAT_MOODLE, $options); 
                                     echo "</td></tr>\n";
@@ -180,12 +180,12 @@
                                     if ($n < 2) {
                                         if ($answer->answer != NULL) {
                                             if ($n == 0) {
-                                                echo "<tr><td align=\"right\" valign=\"top\"><b>".get_string("correctresponse", "lesson").":</b> \n";
+                                                echo "<tr><td align=\"right\" valign=\"top\"><span class=\"label\">".get_string("correctresponse", "lesson")."</span>: \n";
                                                 echo "</td><td>\n";
                                                 echo format_text($answer->answer, FORMAT_MOODLE, $options); 
                                                 echo "</td></tr>\n";
                                             } else {
-                                                echo "<tr><td align=\"right\" valign=\"top\"><b>".get_string("wrongresponse", "lesson").":</b> \n";
+                                                echo "<tr><td align=\"right\" valign=\"top\"><span class=\"label\">".get_string("wrongresponse", "lesson")."</span>: \n";
                                                 echo "</td><td>\n";
                                                 echo format_text($answer->answer, FORMAT_MOODLE, $options); 
                                                 echo "</td></tr>\n";
@@ -194,35 +194,35 @@
                                         $n++;
                                         $i--;
                                     } else {
-                                        echo "<tr><td align=\"right\" valign=\"top\" width=\"20%\">\n";
+                                        echo "<tr><td align=\"right\" valign=\"top\" style=\"width:20%;\">\n";
                                         if ($lesson->custom) {
                                             // if the score is > 0, then it is correct
                                             if ($answer->score > 0) {
-                                                echo "<b><u>".get_string("answer", "lesson")." $i:</u></b> \n";
+                                                echo '<span class="labelcorrect">'.get_string("answer", "lesson")." $i</span>: \n";
                                             } else {
-                                                echo "<b>".get_string("answer", "lesson")." $i:</b> \n";
+                                                echo '<span class="label">'.get_string("answer", "lesson")." $i</span>: \n";
                                             }
                                         } else {
                                             if (lesson_iscorrect($page->id, $answer->jumpto)) {
                                                 // underline correct answers
-                                                echo "<b><u>".get_string("answer", "lesson")." $i:</u></b> \n";
+                                                echo '<span class="labelcorrect">'.get_string("answer", "lesson")." $i</span>: \n";
                                             } else {
-                                                echo "<b>".get_string("answer", "lesson")." $i:</b> \n";
+                                                echo '<span class="label">'.get_string("answer", "lesson")." $i</span>: \n";
                                             }
                                         }
-                                        echo "</td><td width=\"80%\">\n";
+                                        echo "</td><td style=\"width:80%;\">\n";
                                         echo format_text($answer->answer, FORMAT_MOODLE, $options);
                                         echo "</td></tr>\n";
-                                        echo "<tr><td align=\"right\" valign=\"top\"><b>".get_string("matchesanswer", "lesson")." $i:</b> \n";
+                                        echo "<tr><td align=\"right\" valign=\"top\">'<span class=\"label\">'.".get_string("matchesanswer", "lesson")." $i</span>: \n";
                                         echo "</td><td>\n";
                                         echo format_text($answer->response, FORMAT_MOODLE, $options); 
                                         echo "</td></tr>\n";
                                     }
                                     break;
                                 case LESSON_BRANCHTABLE:
-                                    echo "<tr><td align=\"right\" valign=\"top\" width=\"20%\">\n";
-                                    echo "<b>".get_string("description", "lesson")." $i:</b> \n";
-                                    echo "</td><td width=\"80%\">\n";
+                                    echo "<tr><td align=\"right\" valign=\"top\" style=\"width:20%;\">\n";
+                                    echo '<span class="label">'.get_string("description", "lesson")." $i</span>: \n";
+                                    echo "</td><td style=\"width:80%;\">\n";
                                     echo format_text($answer->answer, FORMAT_MOODLE, $options);
                                     echo "</td></tr>\n";
                                     break;
@@ -231,18 +231,18 @@
                             $jumptitle = lesson_get_jump_name($answer->jumpto);
                             if ($page->qtype == LESSON_MATCHING) {
                                 if ($i == 1) {
-                                    echo "<tr><td align=\"right\" width=\"20%\"><b>".get_string("correctanswerscore", "lesson").":";
-                                    echo "</b></td><td width=\"80%\">\n";
+                                    echo "<tr><td align=\"right\" style=\"width:20%;\"><span class=\"label\">".get_string("correctanswerscore", "lesson");
+                                    echo "</span>: </td><td style=\"width:80%;\">\n";
                                     echo "$answer->score</td></tr>\n";
-                                    echo "<tr><td align=\"right\" width=\"20%\"><b>".get_string("correctanswerjump", "lesson").":";
-                                    echo "</b></td><td width=\"80%\">\n";
+                                    echo "<tr><td align=\"right\" style=\"width:20%;\"><span class=\"label\">".get_string("correctanswerjump", "lesson");
+                                    echo "</span>:</td><td style=\"width:80%;\">\n";
                                     echo "$jumptitle</td></tr>\n";
                                 } elseif ($i == 2) {
-                                    echo "<tr><td align=\"right\" width=\"20%\"><b>".get_string("wronganswerscore", "lesson").":";
-                                    echo "</b></td><td width=\"80%\">\n";
+                                    echo "<tr><td align=\"right\" style=\"width:20%;\"><span class=\"label\">".get_string("wronganswerscore", "lesson");
+                                    echo "</span>: </td><td style=\"width:80%;\">\n";
                                     echo "$answer->score</td></tr>\n";
-                                    echo "<tr><td align=\"right\" width=\"20%\"><b>".get_string("wronganswerjump", "lesson").":";
-                                    echo "</b></td><td width=\"80%\">\n";
+                                    echo "<tr><td align=\"right\" style=\"width:20%;\"><span class=\"label\">".get_string("wronganswerjump", "lesson");
+                                    echo "</span>: </td><td style=\"width:80%;\">\n";
                                     echo "$jumptitle</td></tr>\n";
                                 }
                             } else {
@@ -251,12 +251,12 @@
                                     $page->qtype != LESSON_ENDOFBRANCH and
                                     $page->qtype != LESSON_CLUSTER and 
                                     $page->qtype != LESSON_ENDOFCLUSTER) {
-                                    echo "<tr><td align=\"right\" width=\"20%\"><b>".get_string("score", "lesson")." $i:";
-                                    echo "</b></td><td width=\"80%\">\n";
+                                    echo "<tr><td align=\"right\" style=\"width:20%;\"><span class=\"label\">".get_string("score", "lesson")." $i";
+                                    echo "</span>: </td><td style=\"width:80%;\">\n";
                                     echo "$answer->score</td></tr>\n";
                                 }
-                                echo "<tr><td align=\"right\" width=\"20%\"><b>".get_string("jump", "lesson")." $i:";
-                                echo "</b></td><td width=\"80%\">\n";
+                                echo "<tr><td align=\"right\" style=\"width:20%;\"><span class=\"label\">".get_string("jump", "lesson")." $i";
+                                echo "</span>: </td><td style=\"width:80%;\">\n";
                                 echo "$jumptitle</td></tr>\n";
                             }
                             $i++;
diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php
index 4c074bc670..dad672e581 100644
--- a/mod/lesson/locallib.php
+++ b/mod/lesson/locallib.php
@@ -245,12 +245,15 @@ function lesson_print_header($cm, $course, $lesson, $currenttab = '') {
                 $button =  '<table><tr><td>'.$button.
                            '</td><td>'.
                            '<form '.$CFG->frametarget.' method="get" action="'. $CFG->wwwroot .'/mod/lesson/lesson.php">'.
+                           '<fieldset class="invisiblefieldset">'.
                            '<input type="hidden" name="id" value="'. $cm->id .'" />'.
                            '<input type="hidden" name="action" value="editpage" />'.
                            '<input type="hidden" name="redirect" value="navigation" />'.
                            '<input type="hidden" name="pageid" value="'. $pageid .'" />'.
-                           '<input type="submit" value="'. get_string('editpagecontent', 'lesson') .'" /></form>
-                           </td></tr></table>';
+                           '<input type="submit" value="'. get_string('editpagecontent', 'lesson') .'" />'.
+                           '</fieldset>'.
+                           '</form>'.
+                           '</td></tr></table>';
             }
         }
     } else {
@@ -401,7 +404,7 @@ function lesson_print_messages() {
  **/
 function lesson_print_submit_link($name, $form, $align = 'center', $class='standardbutton', $title = '', $id = '', $return = false) {
     if (!empty($align)) {
-        $align = " align=\"$align\"";
+        $align = " style=\"text-align:$align\"";
     }
     if (!empty($id)) {
         $id = " id=\"$id\"";
@@ -1593,7 +1596,7 @@ function lesson_qtype_menu($qtypes, $selected="", $link="", $onclick="") {
     $tabrows = array();
 
     foreach ($qtypes as $qtype => $qtypename) {
-        $tabrows[] = new tabobject($qtype, "$link&amp;qtype=$qtype\" onClick=\"$onclick", $qtypename);
+        $tabrows[] = new tabobject($qtype, "$link&amp;qtype=$qtype\" onclick=\"$onclick", $qtypename);
     }
     $tabs[] = $tabrows;
     print_tabs($tabs, $selected);
@@ -1700,7 +1703,7 @@ function lesson_print_progress_bar($lesson, $course) {
     echo '<div class="progress_bar" align="center">';
     echo '<table class="progress_bar_table"><tr>';
     if ($progress != 0) {  // some browsers do not repsect the 0 width.
-        echo '<td width="'.$progress.'%" class="progress_bar_completed">';
+        echo '<td style="width:'.$progress.'%;" class="progress_bar_completed">';
         echo '</td>';
     }
     echo '<td class="progress_bar_todo">';
diff --git a/mod/lesson/view.php b/mod/lesson/view.php
index 113c6fb8d2..76102c01b4 100644
--- a/mod/lesson/view.php
+++ b/mod/lesson/view.php
@@ -36,7 +36,7 @@
             
             lesson_print_header($cm, $course, $lesson);
             print_simple_box_start('center');
-            echo '<div align="center">';
+            echo '<div style="text-align:center;">';
             echo '<p>'.$message.'</p>';
             echo '<div class="lessonbutton standardbutton" style="padding: 5px;"><a href="'.$CFG->wwwroot.'/course/view.php?id='. $course->id .'">'. get_string('returnto', 'lesson', format_string($course->fullname, true)) .'</a></div>';
             echo '</div>';
@@ -62,6 +62,7 @@
                 echo "<div class=\"password-form\">\n";
                 print_simple_box_start('center');
                 echo '<form id="password" method="post" action="'.$CFG->wwwroot.'/mod/lesson/view.php">' . "\n";
+                echo '<fieldset class="invisiblefieldset">';
                 echo '<input type="hidden" name="id" value="'. $cm->id .'" />' . "\n";
                 if (optional_param('userpassword', 0, PARAM_CLEAN)) {
                     notify(get_string('loginfail', 'lesson'));
@@ -141,7 +142,7 @@
                     echo '<p>';
                     print_simple_box_start('center');
                     print_string('completethefollowingconditions', 'lesson', $dependentlesson->name);
-                    echo '<p align="center">'.implode('<br />'.get_string('and', 'lesson').'<br />', $errors).'</p>';
+                    echo '<p style="text-align:center;">'.implode('<br />'.get_string('and', 'lesson').'<br />', $errors).'</p>';
                     print_simple_box_end();
                     echo '</p>';
                     print_footer($course);
@@ -250,13 +251,13 @@
             lesson_print_header($cm, $course, $lesson);
             if ($lesson->timed) {
                 if ($lesson->retake) {
-                    print_simple_box('<p align="center">'. get_string('leftduringtimed', 'lesson') .'</p>', 'center');
-                    echo '<div align="center" class="lessonbutton standardbutton">'.
+                    print_simple_box('<p style="text-align:center;">'. get_string('leftduringtimed', 'lesson') .'</p>', 'center');
+                    echo '<div style="text-align:center;" class="lessonbutton standardbutton">'.
                               '<a href="view.php?id='.$cm->id.'&amp;pageid='.$firstpageid.'&amp;startlastseen=no">'.
                                 get_string('continue', 'lesson').'</a></div>';
                 } else {
                     print_simple_box_start('center');
-                    echo '<div align="center">';
+                    echo '<div style="text-align:center;">';
                     echo get_string('leftduringtimednoretake', 'lesson');
                     echo '<br /><br /><div class="lessonbutton standardbutton"><a href="../../course/view.php?id='. $course->id .'">'. get_string('returntocourse', 'lesson') .'</a></div>';
                     echo '</div>';
@@ -264,10 +265,10 @@
                 }
                 
             } else {
-                print_simple_box("<p align=\"center\">".get_string('youhaveseen','lesson').'</p>',
+                print_simple_box("<p style=\"text-align:center;\">".get_string('youhaveseen','lesson').'</p>',
                         "center");
                 
-                echo '<div align="center">';
+                echo '<div style="text-align:center;">';
                 echo '<span class="lessonbutton standardbutton">'.
                         '<a href="view.php?id='.$cm->id.'&amp;pageid='.$lastpageseen.'&amp;startlastseen=yes">'.
                         get_string('yes').'</a></span>&nbsp;&nbsp;&nbsp;';
@@ -288,7 +289,7 @@
             if (!$lesson->retake) {
                 lesson_print_header($cm, $course, $lesson, 'view');
                 print_simple_box_start('center');
-                echo "<div align=\"center\">";
+                echo "<div style=\"text-align:center;\">";
                 echo get_string("noretake", "lesson");
                 echo "<br /><br /><div class=\"lessonbutton standardbutton\"><a href=\"../../course/view.php?id=$course->id\">".get_string('returntocourse', 'lesson').'</a></div>';
                 echo "</div>";
@@ -524,6 +525,7 @@
         // get the answers in a set order, the id order
         if ($answers = get_records("lesson_answers", "pageid", $page->id, "id")) {
             echo "<form id=\"answerform\" method =\"post\" action=\"lesson.php\">";
+            echo '<fieldset class="invisiblefieldset">';
             echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\" />";
             echo "<input type=\"hidden\" name=\"action\" value=\"continue\" />";
             echo "<input type=\"hidden\" name=\"pageid\" value=\"$pageid\" />";
@@ -547,7 +549,7 @@
                     } else {
                         $value = "";
                     }       
-                    echo '<tr><td align="center"><label for="answer">'.get_string('youranswer', 'lesson').'</label>'.
+                    echo '<tr><td style="text-align:center;"><label for="answer">'.get_string('youranswer', 'lesson').'</label>'.
                         ": <input type=\"text\" id=\"answer\" name=\"answer\" size=\"50\" maxlength=\"200\" $value />\n";
                     echo '</td></tr></table>';
                     print_simple_box_end();
@@ -686,12 +688,14 @@
                         }
                         // Each button must have its own form inorder for it to work with JavaScript turned off
                         $button  = "<form id=\"answerform$i\" method=\"post\" action=\"$CFG->wwwroot/mod/lesson/lesson.php\">\n".
+                                   '<fieldset class="invisiblefieldset">';
                                    "<input type=\"hidden\" name=\"id\" value=\"$cm->id\" />\n".
                                    "<input type=\"hidden\" name=\"action\" value=\"continue\" />\n".
                                    "<input type=\"hidden\" name=\"pageid\" value=\"$pageid\" />\n".
                                    "<input type=\"hidden\" name=\"sesskey\" value=\"".sesskey()."\" />\n".
                                    "<input type=\"hidden\" name=\"jumpto\" value=\"$answer->jumpto\" />\n".
                                    lesson_print_submit_link(strip_tags(format_text($answer->answer, FORMAT_MOODLE, $options)), "answerform$i", '', $class, '', '', true).
+                                   '<fieldset>'.
                                    '</form>';
                         
                         $buttons[$type][] = $button;
@@ -733,7 +737,7 @@
                     } else {
                         $value = "";
                     }
-                    echo '<tr><td align="center" valign="top" nowrap="nowrap"><label for="answer">'.get_string("youranswer", "lesson").'</label>:</td><td>'.
+                    echo '<tr><td style="text-align:center;" valign="top" nowrap="nowrap"><label for="answer">'.get_string("youranswer", "lesson").'</label>:</td><td>'.
                          '<textarea id="answer" name="answer" rows="15" cols="60">'.$value."</textarea>\n";
                     echo '</td></tr></table>';
                     print_simple_box_end();
@@ -744,10 +748,12 @@
                     print_simple_box_end();
                 break;
             }
+            echo '</fieldset>';
             echo "</form>\n"; 
         } else {
             // a page without answers - find the next (logical) page
             echo "<form id=\"pageform\" method =\"post\" action=\"$CFG->wwwroot/mod/lesson/view.php\">\n";
+            echo '<fieldset class="invisiblefieldset">';
             echo "<input type=\"hidden\" name=\"id\" value=\"$cm->id\" />\n";
             if ($lesson->nextpagedefault) {
                 // in Flash Card mode...
@@ -795,6 +801,7 @@
             }
             echo "<input type=\"hidden\" name=\"pageid\" value=\"$newpageid\" />\n";
             lesson_print_submit_link(get_string('continue', 'lesson'), 'pageform');
+            echo '</fieldset>';
             echo "</form>\n";
         }
         
@@ -837,16 +844,16 @@
             
             if ($gradeinfo->attempts) {
                 if (!$lesson->custom) {
-                    echo "<p align=\"center\">".get_string("numberofpagesviewed", "lesson", $gradeinfo->nquestions).
+                    echo "<p style=\"text-align:center;\">".get_string("numberofpagesviewed", "lesson", $gradeinfo->nquestions).
                         "</p>\n";
                     if ($lesson->minquestions) {
                         if ($gradeinfo->nquestions < $lesson->minquestions) {
                             // print a warning and set nviewed to minquestions
-                            echo "<p align=\"center\">".get_string("youshouldview", "lesson", 
+                            echo "<p style=\"text-align:center;\">".get_string("youshouldview", "lesson", 
                                     $lesson->minquestions)."</p>\n";
                         }
                     }
-                    echo "<p align=\"center\">".get_string("numberofcorrectanswers", "lesson", $gradeinfo->earned).
+                    echo "<p style=\"text-align:center;\">".get_string("numberofcorrectanswers", "lesson", $gradeinfo->earned).
                         "</p>\n";
                 }
                 $a = new stdClass;
@@ -855,14 +862,14 @@
                 if ($gradeinfo->nmanual) {
                     $a->tempmaxgrade = $gradeinfo->total - $gradeinfo->manualpoints;
                     $a->essayquestions = $gradeinfo->nmanual;
-                    echo "<div align=\"center\">".get_string("displayscorewithessays", "lesson", $a)."</div>";
+                    echo "<div style=\"text-align:center;\">".get_string("displayscorewithessays", "lesson", $a)."</div>";
                 } else {
-                    echo "<div align=\"center\">".get_string("displayscorewithoutessays", "lesson", $a)."</div>";                        
+                    echo "<div style=\"text-align:center;\">".get_string("displayscorewithoutessays", "lesson", $a)."</div>";                        
                 }
                 $a = new stdClass;
                 $a->grade = number_format($gradeinfo->grade * $lesson->grade / 100, 1);
                 $a->total = $lesson->grade;
-                echo "<p align=\"center\">".get_string('yourcurrentgradeisoutof', 'lesson', $a)."</p>\n";
+                echo "<p style=\"text-align:center;\">".get_string('yourcurrentgradeisoutof', 'lesson', $a)."</p>\n";
                     
                 $grade->lessonid = $lesson->id;
                 $grade->userid = $USER->id;
@@ -909,7 +916,7 @@
             }   
         } else { 
             // display for teacher
-            echo "<p align=\"center\">".get_string("displayofgrade", "lesson")."</p>\n";
+            echo "<p style=\"text-align:center;\">".get_string("displayofgrade", "lesson")."</p>\n";
         }
         print_simple_box_end(); //End of Lesson button to Continue.
 
@@ -921,7 +928,7 @@
 
         // high scores code
         if ($lesson->highscores && !has_capability('mod/lesson:manage', $context) && !$lesson->practice) {
-            echo "<div align=\"center\"><br />";
+            echo "<div style=\"text-align:center;\"><br />";
             if ($grades = get_records_select("lesson_grades", "lessonid = $lesson->id", "completed")) {
                 $madeit = false;
                 if ($highscores = get_records_select("lesson_high_scores", "lessonid = $lesson->id")) {
@@ -943,14 +950,16 @@
                 }
                 if (!$highscores or $madeit) {
                     echo '<p>'.get_string("youmadehighscore", "lesson", $lesson->maxhighscores).
-                         '</p><p>
+                         '</p>
                           <form method="post" id="highscores" action="'.$CFG->wwwroot.'/mod/lesson/highscores.php">
+                          <fieldset class="invisiblefieldset">
                           <input type="hidden" name="mode" value="add" />
                           <input type="hidden" name="id" value="'.$cm->id.'" />
                           <input type="hidden" name="sesskey" value="'.sesskey().'" />
                           <p>';
                           lesson_print_submit_link(get_string('clicktopost', 'lesson'), 'highscores');
                     echo '</p>
+                          </fieldset>
                           </form>';
                 } else {
                     echo get_string("nothighscore", "lesson", $lesson->maxhighscores)."<br />";
@@ -974,24 +983,24 @@
             // sure that the student can leave the lesson via pushing the continue button.
             $lastattempt = end($attempts);
             $USER->modattempts[$lesson->id] = $lastattempt->pageid;
-            echo "<div align=\"center\" style=\"padding: 5px;\" class=\"lessonbutton standardbutton\"><a href=\"view.php?id=$cm->id&amp;pageid=$pageid\">".get_string("reviewlesson", "lesson")."</a></div>\n"; 
+            echo "<div style=\"text-align:center; padding:5px;\" class=\"lessonbutton standardbutton\"><a href=\"view.php?id=$cm->id&amp;pageid=$pageid\">".get_string("reviewlesson", "lesson")."</a></div>\n"; 
         } elseif ($lesson->modattempts && has_capability('mod/lesson:manage', $context)) {
-            echo "<p align=\"center\">".get_string("modattemptsnoteacher", "lesson")."</p>";                
+            echo "<p style=\"text-align:center;\">".get_string("modattemptsnoteacher", "lesson")."</p>";                
         }
         
         if ($lesson->activitylink) {
             if ($module = get_record('course_modules', 'id', $lesson->activitylink)) {
                 if ($modname = get_field('modules', 'name', 'id', $module->module))
                     if ($instance = get_record($modname, 'id', $module->instance)) {
-                        echo "<div align=\"center\" style=\"padding: 5px;\" class=\"lessonbutton standardbutton\">".
+                        echo "<div style=\"text-align:center; padding:5px;\" class=\"lessonbutton standardbutton\">".
                                 "<a href=\"$CFG->wwwroot/mod/$modname/view.php?id=$lesson->activitylink\">".
                                 get_string('activitylinkname', 'lesson', $instance->name)."</a></div>\n";
                     }
             }
         }
 
-        echo "<div align=\"center\" style=\"padding: 5px;\" class=\"lessonbutton standardbutton\"><a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">".get_string('returnto', 'lesson', format_string($course->fullname, true))."</a></div>\n";
-        echo "<div align=\"center\" style=\"padding: 5px;\" class=\"lessonbutton standardbutton\"><a href=\"$CFG->wwwroot/grade/index.php?id=$course->id\">".get_string('viewgrades', 'lesson')."</a></div>\n";
+        echo "<div style=\"text-align:center; padding:5px;\" class=\"lessonbutton standardbutton\"><a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">".get_string('returnto', 'lesson', format_string($course->fullname, true))."</a></div>\n";
+        echo "<div style=\"text-align:center; padding:5px;\" class=\"lessonbutton standardbutton\"><a href=\"$CFG->wwwroot/grade/index.php?id=$course->id\">".get_string('viewgrades', 'lesson')."</a></div>\n";
     }
 
 /// Finish the page
diff --git a/mod/lesson/viewstart.html b/mod/lesson/viewstart.html
index 4c4f9797b9..255b4f1aca 100644
--- a/mod/lesson/viewstart.html
+++ b/mod/lesson/viewstart.html
@@ -15,7 +15,7 @@
             <?php print_menu_block($cm->id, $lesson); ?>
         </td>
         <!-- Start main column -->
-        <td width="100%" align="center">
+        <td style="width:100%;" align="center">
             
             <?php if ($lesson->displayleft) { ?>