MDL-7861, xhtml strict issues

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 33c7563f0330ef708d7a1356a0b32bb2d63e2469..2cb1c7a457a69ee38e45eb89282722d221f6bb43 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -875,7 +875,7 @@ class assignment_base {
         ///Start of teacher info row
 
         echo '<tr>';
-        echo '<td width="35" valign="top" class="picture teacher">';
+        echo '<td class="picture teacher">';
         if ($submission->teacher) {
             $teacher = get_record('user', 'id', $submission->teacher);
         } else {
@@ -887,7 +887,7 @@ class assignment_base {
         echo '<td class="content">';
         echo '<form id="submitform" action="submissions.php" method="post">';
         echo '<fieldset class="invisiblefieldset">';
-        echo '<input type="hidden" name="offset" value="'.++$offset.'">';
+        echo '<input type="hidden" name="offset" value="'.++$offset.'" />';
         echo '<input type="hidden" name="userid" value="'.$userid.'" />';
         echo '<input type="hidden" name="id" value="'.$this->cm->id.'" />';
         echo '<input type="hidden" name="mode" value="grade" />';
@@ -921,7 +921,7 @@ class assignment_base {
         }
 
         ///Print Buttons in Single View
-        echo '<div class="buttons" align="center">';
+        echo '<div class="buttons">';
         echo '<input type="submit" name="submit" value="'.get_string('savechanges').'" onclick = "getElementById(\'submitform\').menuindex.value = getElementById(\'submitform\').grade.selectedIndex" />';
         echo '<input type="submit" name="cancel" value="'.get_string('cancel').'" />';
         //if there are more to be graded.
@@ -942,7 +942,7 @@ class assignment_base {
         
         ///End of teacher info row, Start of student info row
         echo '<tr>';
-        echo '<td width="35" valign="top" class="picture user">';
+        echo '<td class="picture user">';
         print_user_picture($user->id, $this->course->id, $user->picture);
         echo '</td>';
         echo '<td class="topic">';
@@ -2102,7 +2102,7 @@ function assignment_print_recent_mod_activity($activity, $course, $detail=false)
 
     echo '<table border="0" cellpadding="3" cellspacing="0">';
 
-    echo "<tr><td class=\"userpicture\" width=\"35\" valign=\"top\">";
+    echo "<tr><td class=\"userpicture\" valign=\"top\">";
     print_user_picture($activity->user->userid, $course, $activity->user->picture);
     echo "</td><td width=\"100%\"><font size=2>";
 

diff --git a/mod/assignment/type/common.html b/mod/assignment/type/common.html
index 5ef072f7d4cb6d164d096ed9f011f5cc7ca8b5de..e5dc1c8349697bb9bee22bb8c6fa9752401d3cc4 100644 (file)
--- a/mod/assignment/type/common.html
+++ b/mod/assignment/type/common.html
@@ -1,5 +1,5 @@
 <form id="form" method="post" action="<?php p($action) ?>">
-
+<fieldset class="invisiblefieldset">
 <?php
    $form->sesskey = sesskey();
 

diff --git a/mod/assignment/type/common_end.html b/mod/assignment/type/common_end.html
index 55823541d1eeb36a07da90bab0efb9030acd1e69..61578b42bc621cec15a14ff38fa55065b827d5de 100644 (file)
--- a/mod/assignment/type/common_end.html
+++ b/mod/assignment/type/common_end.html
@@ -1 +1,2 @@
+</fieldset>
 </form>

diff --git a/mod/assignment/type/offline/mod.html b/mod/assignment/type/offline/mod.html
index 7f98198e7c2a25c9a8a522cad5b7d61966c529d3..375ca2f66828bf7499f4db7eba9347e270304696 100644 (file)
--- a/mod/assignment/type/offline/mod.html
+++ b/mod/assignment/type/offline/mod.html
@@ -1,3 +1,3 @@
-<center>
-<input type="submit" value="<?php print_string("continue") ?>">
-</center>
+<div class="modform">
+<input type="submit" value="<?php print_string("continue") ?>" />
+</div>

diff --git a/mod/assignment/type/online/mod.html b/mod/assignment/type/online/mod.html
index 1f04ddaa2fad48f5dd3c9c5555f01e0bd9e9ae32..1f7a0d1508fec0334faa31ac6998d5b1d4f51b07 100644 (file)
--- a/mod/assignment/type/online/mod.html
+++ b/mod/assignment/type/online/mod.html
@@ -10,7 +10,7 @@
     }
 ?>
 
-<table align="center" cellpadding="5" cellspacing="0">
+<table class="modform" cellpadding="5" cellspacing="0">
 
 <tr>
     <td align="right"><b><?php print_string("allowresubmit", "assignment") ?>:</b></td>
@@ -48,7 +48,7 @@
 
 </table>
 
-<center>
+<div class="modform">
 <br />
 <input type="submit" value="<?php print_string("continue") ?>" />
-</center>
+</div>

diff --git a/mod/assignment/type/upload/mod.html b/mod/assignment/type/upload/mod.html
index 9823f6d928c1c5883d3c2542222351da21478211..daeafacb936a9951f622ed412fc7573c143942ee 100644 (file)
--- a/mod/assignment/type/upload/mod.html
+++ b/mod/assignment/type/upload/mod.html
@@ -19,7 +19,7 @@
     }
 ?>
 
-<table align="center" cellpadding="5" cellspacing="0">
+<table class="modform" cellpadding="5" cellspacing="0">
 
 <tr valign="top">
     <td align="right"><b><?php print_string("maximumsize", "assignment") ?>:</b></td>
@@ -91,7 +91,7 @@
 
 </table>
 
-<center>
+<div class="modform">
 <br />
 <input type="submit" value="<?php print_string("continue") ?>" />
-</center>
+</div>

diff --git a/mod/assignment/type/uploadsingle/mod.html b/mod/assignment/type/uploadsingle/mod.html
index 6e583603d852129827202ec12935705e2577753a..eb0aa095778e7239600088ca88a82b6f49cba37c 100644 (file)
--- a/mod/assignment/type/uploadsingle/mod.html
+++ b/mod/assignment/type/uploadsingle/mod.html
@@ -10,7 +10,7 @@
     }
 ?>
 
-<table align="center" cellpadding="5" cellspacing="0">
+<table class="modform" cellpadding="5" cellspacing="0">
 
 <tr valign="top">
     <td align="right"><b><?php print_string("maximumsize", "assignment") ?>:</b></td>
@@ -46,7 +46,7 @@
 
 </table>
 
-<center>
+<div class="modform">
 <br />
 <input type="submit" value="<?php print_string("continue") ?>" />
-</center>
+</div>

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 2a2c43633091ac13f22574a270ab0fab481e6fd9..ef29c2385ef820a6dfb73608ebf3914e9202b6f7 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -1968,6 +1968,16 @@ body#user-index .rolesform {
  *** Modules: Assignment
  ***/
 
+.userpicture,
+.picture user,
+.picture teacher {
+  width:35;
+  vertical-align:top;
+}
+.modform {
+  text-align:center;  
+}
+
 /***
  *** Modules: Chat
  ***/

diff --git a/user/index.php b/user/index.php
index 268a27896dd789660153c7fc94ec283eb5228f37..bd12557e7d2d9212efef0e0356c25933329030f1 100644 (file)
--- a/user/index.php
+++ b/user/index.php
@@ -460,7 +460,8 @@
             ';
         echo '<form action="action_redir.php" method="post" id="participantsform" onsubmit="return checksubmit(this);">';
         echo '<div>';
-        echo '<input type="hidden" name="returnto" value="'.$_SERVER['REQUEST_URI'].'" />';
+        // added url encode for xhtml strict MDL-7861
+        echo '<input type="hidden" name="returnto" value="'.urlencode($_SERVER['REQUEST_URI']).'" />';
         echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
     }