Changes for XHTML and accessibility compatibility

diff --git a/mod/workshop/assess.php b/mod/workshop/assess.php
index 81ac08d797585a8585497cd6c6e9ac819139205a..5686881d5b902a6e5809da5f6ec94ffb4a3dc189 100644 (file)
--- a/mod/workshop/assess.php
+++ b/mod/workshop/assess.php
@@ -49,7 +49,7 @@
         print_header_simple("$workshop->name", "",
                      "<a href=\"index.php?id=$course->id\">$strworkshops</a> -> 
                       <a href=\"view.php?id=$cm->id\">$workshop->name</a> -> $strassess", 
-                      "", '<base target="_parent">', true);
+                      "", '<base target="_parent" />', true);
     
         // there can be an assessment record (for teacher submissions), if there isn't...
         if (!$assessment = get_record("workshop_assessments", "submissionid", $submission->id, "userid", 
@@ -116,7 +116,7 @@
     
     /// print bottom frame with the submission
     
-    print_header();
+    print_header('', '', '', '', '<base target="_parent" />');
     $title = '"'.$submission->title.'" ';
     if (isteacher($course->id)) {
         $title .= ' '.get_string('by', 'workshop').' '.workshop_fullname($submission->userid, $course->id);
@@ -131,7 +131,7 @@
     }
             
     
-    print_footer();
+    print_footer('none');
  
 ?>
 

diff --git a/mod/workshop/locallib.php b/mod/workshop/locallib.php
index 900c8ba47629c91408902517cf63496d73eb47fa..1293b4cd9049eda891e2e468f3956f9d42479a65 100644 (file)
--- a/mod/workshop/locallib.php
+++ b/mod/workshop/locallib.php
@@ -1862,7 +1862,7 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
         }
         
         print_heading(get_string('assessmentof', 'workshop', 
-            "<a href=\"submissions.php?id=$cm->id&action=showsubmission&sid=$submission->id\" target=\"submission\">".
+            "<a href=\"submissions.php?id=$cm->id&amp;action=showsubmission&amp;sid=$submission->id\" target=\"submission\">".
             $submission->title.'</a>'));
     }
     
@@ -1920,7 +1920,7 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
                     $firstcomment = FALSE;
                     if (isteacher($workshop->course, $USER->id) and ($comment->userid != $USER->id)) {
                         echo "<p align=\"right\"><a href=\"assessments.php?action=addcomment&amp;id=$cm->id&amp;aid=$assessment->id\">".
-                            get_string("reply", "workshop")."</a>\n";
+                            get_string("reply", "workshop")."</a></p>\n";
                     }
                     elseif (($comment->userid ==$USER->id) and (($timenow - $comment->timecreated) < $CFG->maxeditingtime)) {
                         echo "<p align=\"right\"><a href=\"assessments.php?action=editcomment&amp;id=$cm->id&amp;cid=$comment->id\">".
@@ -1929,6 +1929,7 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
                             echo " | <a href=\"assessments.php?action=agreeassessment&amp;id=$cm->id&amp;aid=$assessment->id\">".
                                 get_string("agreetothisassessment", "workshop")."</a>\n";
                         }
+                        echo '</p>';
                     }
                     elseif (($comment->userid != $USER->id) and (($USER->id == $assessment->userid) or 
                         ($USER->id == $submission->userid))) {
@@ -1938,12 +1939,14 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
                             echo " | <a href=\"assessments.php?action=agreeassessment&amp;id=$cm->id&amp;aid=$assessment->id\">".
                                 get_string("agreetothisassessment", "workshop")."</a>\n";
                         }
+                        echo '</p>';
                     }
                 }
-                echo "</td></tr>\n";
+                echo '</td></tr>';
             }
-            echo "</table>\n";
+            echo '</table>';
         }
+        echo '</center>';
     }
         
     // now print the grading form with the grading grade if any
@@ -2023,7 +2026,7 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
                 echo "  <td align=\"right\"><p><b>". get_string("feedback").":</b></p></td>\n";
                 echo "  <td>\n";
                 if ($allowchanges) {
-                    echo "      <textarea name=\"feedback_$i\" rows=\"3\" cols=\"75\" wrap=\"virtual\">\n";
+                    echo "      <textarea name=\"feedback_$i\" rows=\"3\" cols=\"75\" >\n";
                     if (isset($grades[$i]->feedback)) {
                         echo $grades[$i]->feedback;
                         }
@@ -2071,7 +2074,7 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
                 echo "  <td align=\"right\"><p><b>". get_string("element","workshop")." $iplus1:</b></p></td>\n";
                 echo "  <td>".format_text($elements[$i]->description);
                 echo "<p align=\"right\"><font size=\"1\">".get_string("weight", "workshop").": ".
-                    number_format($WORKSHOP_EWEIGHTS[$elements[$i]->weight], 2)."</font>\n";
+                    number_format($WORKSHOP_EWEIGHTS[$elements[$i]->weight], 2)."</font></p>\n";
                 echo "</td></tr>\n";
                 if ($showgrades) {
                     echo "<tr valign=\"top\">\n";
@@ -2098,10 +2101,10 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
                                             }
                                         }
                                     if ($checked) {
-                                        echo " <input type=\"RADIO\" name=\"grade[$i]\" value=\"$j\" checked=\"checked\" /> &nbsp;&nbsp;&nbsp;\n";
+                                        echo " <input type=\"radio\" name=\"grade[$i]\" value=\"$j\" checked=\"checked\" alt=\"$j\" /> &nbsp;&nbsp;&nbsp;\n";
                                         }
                                     else {
-                                        echo " <input type=\"RADIO\" name=\"grade[$i]\" value=\"$j\" /> &nbsp;&nbsp;&nbsp;\n";
+                                        echo " <input type=\"radio\" name=\"grade[$i]\" value=\"$j\" alt=\"$j\" /> &nbsp;&nbsp;&nbsp;\n";
                                         }
                                     }
                                 echo "&nbsp;&nbsp;&nbsp;<b>$SCALE->end</b></center>\n";
@@ -2127,7 +2130,7 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
                 echo "  <td align=\"right\"><p><b>". get_string("feedback").":</b></p></td>\n";
                 echo "  <td>\n";
                 if ($allowchanges) {
-                    echo "      <textarea name=\"feedback_$i\" rows=\"3\" cols=\"75\" wrap=\"virtual\">\n";
+                    echo "      <textarea name=\"feedback_$i\" rows=\"3\" cols=\"75\" >\n";
                     if (isset($grades[$i]->feedback)) {
                         echo $grades[$i]->feedback;
                         }
@@ -2202,10 +2205,10 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
                                         }
                                     }
                                 if ($checked) {
-                                    echo " <input type=\"RADIO\" name=\"grade[$i]\" value=\"$j\" checked=\"checked\" /> &nbsp;&nbsp;&nbsp;\n";
+                                    echo " <input type=\"radio\" name=\"grade[$i]\" value=\"$j\" checked=\"checked\" alt=\"$j\" /> &nbsp;&nbsp;&nbsp;\n";
                                     }
                                 else {
-                                    echo " <input type=\"RADIO\" name=\"grade[$i]\" value=\"$j\" /> &nbsp;&nbsp;&nbsp;\n";
+                                    echo " <input type=\"radio\" name=\"grade[$i]\" value=\"$j\" alt=\"$j\" /> &nbsp;&nbsp;&nbsp;\n";
                                     }
                                 }
                             echo "&nbsp;&nbsp;&nbsp;<b>$SCALE->end</b></center>\n";
@@ -2230,7 +2233,7 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
                 echo "  <td align=\"right\"><p><b>". get_string("feedback").":</b></p></td>\n";
                 echo "  <td>\n";
                 if ($allowchanges) {
-                    echo "      <textarea name=\"feedback_$i\" rows=\"3\" cols=\"75\" wrap=\"virtual\">\n";
+                    echo "      <textarea name=\"feedback_$i\" rows=\"3\" cols=\"75\" >\n";
                     if (isset($grades[$i]->feedback)) {
                         echo $grades[$i]->feedback;
                         }
@@ -2329,10 +2332,10 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
                 echo "<tr valign=\"top\">\n";
                 echo "  <td>$iplus1</td><td>".format_text($elements[$i]->description)."</td>\n";
                 if ($selection == $i) {
-                    echo "  <td align=\"center\"><input type=\"RADIO\" name=\"grade[0]\" value=\"$i\" checked=\"checked\" /></td>\n";
+                    echo "  <td align=\"center\"><input type=\"radio\" name=\"grade[0]\" value=\"$i\" checked=\"checked\" alt=\"$i\" /></td>\n";
                     }
                 else {
-                    echo "  <td align=\"center\"><input type=\"RADIO\" name=\"grade[0]\" value=\"$i\" /></td>\n";
+                    echo "  <td align=\"center\"><input type=\"radio\" name=\"grade[0]\" value=\"$i\" alt=\"$i\" /></td>\n";
                     }
                 echo "<td align=\"center\">{$elements[$i]->maxscore}</td></tr>\n";
                 }
@@ -2384,11 +2387,11 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
                         }
                         echo "<tr valign=\"top\">\n";
                         if ($selection == $j) {
-                            echo "  <td align=\"center\"><input type=\"RADIO\" name=\"grade[$i]\" value=\"$j\" 
-                                checked=\"checked\" /></td>\n";
+                            echo "  <td align=\"center\"><input type=\"radio\" name=\"grade[$i]\" value=\"$j\" 
+                                checked=\"checked\" alt=\"$j\" /></td>\n";
                         } else {
-                            echo "  <td align=\"center\"><input type=\"RADIO\" name=\"grade[$i]\" value=\"$j\" 
-                                /></td>\n";
+                            echo "  <td align=\"center\"><input type=\"radio\" name=\"grade[$i]\" value=\"$j\" 
+                                alt=\"$j\" /></td>\n";
                         }
                         echo "<td>".format_text($rubrics[$j]->description)."</td>\n";
                     }
@@ -2396,7 +2399,7 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
                     echo "  <td align=\"right\"><p><b>". get_string("feedback").":</b></p></td>\n";
                     echo "  <td>\n";
                     if ($allowchanges) {
-                        echo "      <textarea name=\"feedback_$i\" rows=\"3\" cols=\"75\" wrap=\"virtual\">\n";
+                        echo "      <textarea name=\"feedback_$i\" rows=\"3\" cols=\"75\" >\n";
                         if (isset($grades[$i]->feedback)) {
                             echo $grades[$i]->feedback;
                         }
@@ -2452,7 +2455,7 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
         }
         echo "  <td>\n";
         if ($allowchanges) {
-            echo "      <textarea name=\"generalcomment\" rows=\"5\" cols=\"75\" wrap=\"virtual\">\n";
+            echo "      <textarea name=\"generalcomment\" rows=\"5\" cols=\"75\" >\n";
             if (isset($assessment->generalcomment)) {
                 echo $assessment->generalcomment;
             }
@@ -2623,9 +2626,9 @@ function workshop_print_assignment_info($workshop) {
         get_string("specimenassessmentform", "workshop")."</a>";
     // print edit icon
     if (isteacheredit($course->id) and $workshop->nelements) {
-        echo " <a href=\"assessments.php?id=$cm->id&action=editelements\">".
+        echo " <a href=\"assessments.php?id=$cm->id&amp;action=editelements\">".
              "<img src=\"$CFG->pixpath/t/edit.gif\" ".
-             'height="11" width="11" border="0" alt="'.get_string('amendassessmentelements', 'workshop').'"></a>';
+             'height="11" width="11" border="0" alt="'.get_string('amendassessmentelements', 'workshop').'" /></a>';
     }
     echo ")<br />";
     print_simple_box_end();
@@ -2839,10 +2842,10 @@ function workshop_print_submission_assessments($workshop, $submission, $type) {
                         if (isteacher($workshop->course, $USER->id)) {
                             $str .= ' <a title="'.get_string('reassess', 'workshop').
                                 "\" href=\"assess.php?sid=$submission->id\"><img src=\"$CFG->pixpath/t/edit.gif\" ".
-                                ' height="11" width="11" border="0" alt="'.get_string('reassess', 'workshop').'"></a>';
+                                ' height="11" width="11" border="0" alt="'.get_string('reassess', 'workshop').'" /></a>';
                             $str .= ' <a title="'.get_string('delete', 'workshop').
                                 "\" href=\"assessments.php?action=confirmdelete&amp;wid=$workshop->id&amp;aid=$assessment->id\"><img src=\"$CFG->pixpath/t/delete.gif\" ".
-                                ' height="11" width="11" border="0" alt="'.get_string('delete', 'workshop').'"></a><br />';
+                                ' height="11" width="11" border="0" alt="'.get_string('delete', 'workshop').'" /></a><br />';
                        }
                     }
                 }
@@ -2900,7 +2903,7 @@ function workshop_print_submission_title($workshop, $submission) {
     if (!$submission->timecreated) { // a "no submission"
         return $submission->title;
     }
-    return "<a name=\"sid=$submission->id\" href=\"submissions.php?id=$cm->id&action=showsubmission&sid=$submission->id\">$submission->title</a>";
+    return "<a name=\"sid_$submission->id\" href=\"submissions.php?id=$cm->id&amp;action=showsubmission&amp;sid=$submission->id\">$submission->title</a>";
 }
 
 

diff --git a/mod/workshop/submissions.php b/mod/workshop/submissions.php
index b754f381e096bc368dba887494fcb95712a952ac..c760dbd3c42e9b974e565f8ea25688f5153f9ff0 100644 (file)
--- a/mod/workshop/submissions.php
+++ b/mod/workshop/submissions.php
@@ -73,7 +73,7 @@
         <input type="hidden" name="id" value="<?php echo $cm->id ?>" />
         <input type="hidden" name="sid" value="<?php echo $_REQUEST['sid'] ?>" />
         <center>
-        <table celpadding="5" border="1">
+        <table cellpadding="5" border="1">
         <?php
 
         // now get the comment
@@ -256,7 +256,7 @@
         <input type="hidden" name="id" value="<?php echo $cm->id ?>" />
         <input type="hidden" name="sid" value="<?php echo $_GET['sid'] ?>" />
         <center>
-        <table celpadding="5" border="1">
+        <table cellpadding="5" border="1">
         <?php
         echo "<tr valign=\"top\"><td><b>". get_string("title", "workshop").":</b>\n";
         echo "<input type=\"text\" name=\"title\" size=\"60\" maxlength=\"100\" value=\"$submission->title\" />\n";
@@ -474,4 +474,4 @@
 
     print_footer($course);
  
-?> 
\ No newline at end of file
+?> 

diff --git a/mod/workshop/view.php b/mod/workshop/view.php
index b46d6e37332dff19d1e2d103e69455147f284d93..ffe58be9d45d9a2b8b814c3eea4896d6561717bf 100644 (file)
--- a/mod/workshop/view.php
+++ b/mod/workshop/view.php
@@ -328,7 +328,9 @@
         
         echo '</td></tr>';
         
+        echo '<tr><td>';
         workshop_print_assignment_info($workshop);
+        echo '</td></tr>';
         
         /// Print grade tables /////////////////////////////////////////////////
         
@@ -344,15 +346,15 @@
                     // If not yet assessed, show assess link
                     if ($teacherassessments == '&nbsp;') {
                         $teacherassessments = '<a href="assess.php?id='.
-                            $cm->id.'&sid='.$submission->id.'">'.get_string('assess', 'workshop').'</a>';
+                            $cm->id.'&amp;sid='.$submission->id.'">'.get_string('assess', 'workshop').'</a>';
                     }
                     $title = workshop_print_submission_title($workshop, $submission).
                         " <a href=\"submissions.php?action=editsubmission&amp;id=$cm->id&amp;sid=$submission->id\">".
                         "<img src=\"$CFG->pixpath/t/edit.gif\" ".
-                        'height="11" width="11" border="0" alt="'.get_string('edit').'"></a>'.
+                        'height="11" width="11" border="0" alt="'.get_string('edit').'" /></a>'.
                         " <a href=\"submissions.php?action=confirmdelete&amp;id=$cm->id&amp;sid=$submission->id\">".
                         "<img src=\"$CFG->pixpath/t/delete.gif\" ".
-                        'height="11" width="11" border="0" alt="'.get_string('delete', 'workshop').'"></a>';
+                        'height="11" width="11" border="0" alt="'.get_string('delete', 'workshop').'" /></a>';
                     $table->data[] = array($title, $teacherassessments,
                         workshop_print_submission_assessments($workshop, $submission, "student"));
                 }
@@ -362,7 +364,6 @@
                 get_string("submitexampleassignment", "workshop")."</a></b>".
                 helpbutton("submissionofexamples", get_string("submitexampleassignment", "workshop"), "workshop", true, false, '', true), 
                 '&nbsp;', '&nbsp;');
-            
             print_table($table);
             workshop_print_key($workshop);
         }
@@ -404,10 +405,10 @@
                     $data[] = workshop_print_submission_title($workshop, $submission).
                         " <a href=\"submissions.php?action=adminamendtitle&amp;id=$cm->id&amp;sid=$submission->id\">".
                         "<img src=\"$CFG->pixpath/t/edit.gif\" ".
-                        'height="11" width="11" border="0" alt="'.get_string('amendtitle', 'workshop').'"></a>'.
+                        'height="11" width="11" border="0" alt="'.get_string('amendtitle', 'workshop').'" /></a>'.
                         " <a href=\"submissions.php?action=confirmdelete&amp;id=$cm->id&amp;sid=$submission->id\">".
                         "<img src=\"$CFG->pixpath/t/delete.gif\" ".
-                        'height="11" width="11" border="0" alt="'.get_string('delete', 'workshop').'"></a>';
+                        'height="11" width="11" border="0" alt="'.get_string('delete', 'workshop').'" /></a>';
                     $sortdata['title'] = $submission->title;
                     
                     $data[] = userdate($submission->timecreated, get_string('datestr', 'workshop'));
@@ -415,7 +416,7 @@
                     
                     if (($tmp = workshop_print_submission_assessments($workshop, $submission, "teacher")) == '&nbsp;') {
                         $data[] = '<a href="assess.php?id='.
-                            $cm->id.'&sid='.$submission->id.'">'.get_string('assess', 'workshop').'</a>';
+                            $cm->id.'&amp;sid='.$submission->id.'">'.get_string('assess', 'workshop').'</a>';
                         $sortdata['tassmnt'] = -1;
                     } else {
                         $data[] = $tmp;
@@ -476,7 +477,7 @@
                 } else {
                     $columnicon = $dir == 'ASC' ? 'down':'up';
                 }
-                $columnicon = " <img src=\"$CFG->pixpath/t/$columnicon.gif\" />";
+                $columnicon = " <img src=\"$CFG->pixpath/t/$columnicon.gif\" alt=\"$columnicon\" />";
     
             }
             $$column = "<a href=\"view.php?id=$id&amp;sort=$column&amp;dir=$columndir\">".$string[$column]."</a>$columnicon";
@@ -489,8 +490,12 @@
             $table->head = array ("$firstname / $lastname", $title, $date, $tassmnt, $ograde);
         }
         
+        echo '<tr><td>';
         print_table($table);
+        echo '</td></tr>';
+        echo '<tr><td>';
         workshop_print_key($workshop);
+        echo '</td></tr>';
         
         // grading grade analysis
         unset($table);
@@ -517,8 +522,10 @@
                 number_format($stats->stddev * $workshop->gradinggrade /100, 1), 
                 number_format($stats->max * $workshop->gradinggrade / 100, 1), 
                 number_format($stats->min* $workshop->gradinggrade / 100, 1));
+        echo '<tr><td>';
         print_heading(get_string("gradinggrade", "workshop")." ".get_string("analysis", "workshop"));
         print_table($table);
+        echo '</td></tr>';
         
         if ($workshop->showleaguetable and time() > $workshop->assessmentend) {
             workshop_print_league_table($workshop);
@@ -526,6 +533,7 @@
                 echo "<p>".get_string("namesnotshowntostudents", "workshop", $course->students)."</p>\n";
             }
         } 
+        echo '</table>';
     }
 
 
@@ -533,7 +541,7 @@
     elseif ($action == 'showdescription') {
 
         workshop_print_assignment_info($workshop);
-        print_simple_box(format_text($workshop->description, $workshop->format));
+        print_simple_box(format_text($workshop->description, $workshop->format), 'center');
         print_continue($_SERVER["HTTP_REFERER"]);
     }
 
@@ -556,6 +564,7 @@
         error("Fatal Error: Unknown Action: ".$action."\n");
     }
 
+
     print_footer($course);
     
 ?>

diff --git a/mod/workshop/viewassessment.php b/mod/workshop/viewassessment.php
index 1a756bcac1c9639a47510cacaf158cee17ad5176..0b49762f3fc0e7879db0705614e3e261be015d80 100644 (file)
--- a/mod/workshop/viewassessment.php
+++ b/mod/workshop/viewassessment.php
@@ -52,7 +52,7 @@
         print_header_simple("$workshop->name", "",
                      "<a href=\"index.php?id=$course->id\">$strworkshops</a> -> 
                       <a href=\"view.php?id=$cm->id\">$workshop->name</a> -> $strassess", 
-                      "", '<base target="_parent">', true);
+                      "", '<base target="_parent" />', true);
     
         // show assessment but don't allow changes
         workshop_print_assessment($workshop, $assessment, false, $allowcomments);
@@ -68,14 +68,14 @@
     
     /// print bottom frame with the submission
     
-    print_header();
+    print_header('', '', '', '', '<base target="_parent" />');
     $title = '"'.$submission->title.'" ';
     if (isteacher($course->id)) {
         $title .= ' '.get_string('by', 'workshop').' '.workshop_fullname($submission->userid, $course->id);
     }
     print_heading($title);
     workshop_print_submission($workshop, $submission);
-    print_footer();
+    print_footer('none');
  
 ?>