From 3f5abcb20aec9b77303ea0ca2bd9bf56adf05bec Mon Sep 17 00:00:00 2001
From: toyomoyo <toyomoyo>
Date: Thu, 14 Dec 2006 07:48:40 +0000
Subject: [PATCH] accessibility fixes

---
 enrol/database/config.html          | 16 ++++++++--------
 enrol/imsenterprise/config.html     | 10 +++++-----
 lang/en_utf8/auth.php               |  2 +-
 lang/en_utf8/help/text.html         |  2 +-
 lib/editor/htmlarea/coursefiles.php |  2 +-
 mod/forum/lib.php                   | 12 ++++++------
 mod/hotpot/hotpot-full.js           | 22 +++++++++++-----------
 mod/hotpot/report.php               |  4 ++--
 mod/hotpot/report/default.php       |  4 ++--
 mod/hotpot/review.php               |  6 +++---
 mod/quiz/editlib.php                |  2 +-
 mod/quiz/jstimer.php                |  2 +-
 12 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/enrol/database/config.html b/enrol/database/config.html
index 90a8971d03..870359df3a 100644
--- a/enrol/database/config.html
+++ b/enrol/database/config.html
@@ -1,8 +1,8 @@
 <table cellspacing="0" cellpadding="5" border="0" align="center">
 <tr>
-<th colspan="2">
+<th colspan="2" scope="col">
     <?php print_string("server_settings", "enrol_database") ?>
-</td>
+</th>
 </tr>
 <tr valign="top">
     <td align="right">enrol_dbtype:</td>
@@ -78,9 +78,9 @@
     <?php  print_string("dbtable","enrol_database") ?>
     </td>
 </tr>
-<th colspan="2">
+<th colspan="2" scope="col">
     <?php print_string("field_mapping", "enrol_database") ?>
-</td>
+</th>
 <tr valign="top">
     <td align="right">enrol_localcoursefield:</td>
     <td>
@@ -142,7 +142,7 @@
 </tr>
 
 <tr>
-   <th colspan="2">
+   <th colspan="2" scope="col">
         <?php print_string('roles', 'role') ?>
    </th>
 </tr>
@@ -164,9 +164,9 @@
 </tr>
 
 <tr>
-   <th colspan="2">
+   <th colspan="2" scope="col">
         <?php print_string("enrol_database_autocreation_settings", "enrol_database") ?>
-   </td>
+   </th>
 </tr>
 <tr valign="top">
     <td align="right">enrol_db_autocreate:</td>
@@ -206,7 +206,7 @@
     </td>
 </tr>
 
-<th colspan="2">
+<td colspan="2">
     <?php print_string("general_options", "enrol_database") ?>
 </td>
 
diff --git a/enrol/imsenterprise/config.html b/enrol/imsenterprise/config.html
index 58086a483e..7f2a8e40ff 100644
--- a/enrol/imsenterprise/config.html
+++ b/enrol/imsenterprise/config.html
@@ -1,7 +1,7 @@
 <table cellspacing="0" cellpadding="5" border="0" align="center">
 
 <tr>
-<th colspan="3"><?php  print_string("basicsettings", "enrol_imsenterprise") ?></th>
+<th colspan="3" scope="col"><?php  print_string("basicsettings", "enrol_imsenterprise") ?></th>
 </tr>
 
 
@@ -31,7 +31,7 @@
 </tr>
 
 <tr>
-<th colspan="3"><?php  print_string("usersettings", "enrol_imsenterprise") ?></th>
+<th colspan="3" scope="col"><?php  print_string("usersettings", "enrol_imsenterprise") ?></th>
 </tr>
 
 <tr valign="top">
@@ -99,7 +99,7 @@ Photo processing is deactivated until we hear from Moodle dev forum about modifi
 </tr>
 -->
 <tr>
-<th colspan="3"><?php  print_string('roles') ?></th>
+<td colspan="3" ><?php  print_string('roles') ?></td>
 </tr>
 
 <tr>
@@ -137,7 +137,7 @@ foreach($this->imsroles as $imsrolenum=>$imsrolename){
 
 
 <tr>
-<th colspan="3"><?php  print_string("coursesettings", "enrol_imsenterprise") ?></th>
+<th colspan="3" scope="col"><?php  print_string("coursesettings", "enrol_imsenterprise") ?></th>
 </tr>
 
 <tr valign="top">
@@ -183,7 +183,7 @@ foreach($this->imsroles as $imsrolenum=>$imsrolename){
 
 
 <tr>
-<th colspan="3"><?php  print_string("miscsettings", "enrol_imsenterprise") ?></th>
+<th colspan="3" scope="col"><?php  print_string("miscsettings", "enrol_imsenterprise") ?></th>
 </tr>
 
 <tr valign="top">
diff --git a/lang/en_utf8/auth.php b/lang/en_utf8/auth.php
index d54a7fcbc3..f01f94b08e 100644
--- a/lang/en_utf8/auth.php
+++ b/lang/en_utf8/auth.php
@@ -47,7 +47,7 @@ $string['auth_fcuserid'] = 'Userid for FirstClass account with privilege \'Subad
 $string['auth_fieldlock'] = 'Lock value';
 $string['auth_fieldlock_expl'] = '<p><b>Lock value:</b> If enabled, will prevent Moodle users and admins from editing the field directly. Use this option if you are maintaining this data in the external auth system. </p>';
 $string['auth_fieldlocks'] = 'Lock user fields';
-$string['auth_fieldlocks_help'] = '<p>You can lock user data fields. This is useful for sites where the user data is maintained by the administrators manually by editing user records or uploading using the \'Upload users\' facility. If you are locking fields that are required by Moodle, make sure that you provide that data when creating user accounts &emdash; or the accounts will be unusable.</p><p>Consider setting the lock mode to \'Unlocked if empty\' to avoid this problem.</p>';
+$string['auth_fieldlocks_help'] = '<p>You can lock user data fields. This is useful for sites where the user data is maintained by the administrators manually by editing user records or uploading using the \'Upload users\' facility. If you are locking fields that are required by Moodle, make sure that you provide that data when creating user accounts or the accounts will be unusable.</p><p>Consider setting the lock mode to \'Unlocked if empty\' to avoid this problem.</p>';
 $string['auth_imapdescription'] = 'This method uses an IMAP server to check whether a given username and password is valid.';
 $string['auth_imaphost'] = 'The IMAP server address. Use the IP number, not DNS name.';
 $string['auth_imapport'] = 'IMAP server port number. Usually this is 143 or 993.';
diff --git a/lang/en_utf8/help/text.html b/lang/en_utf8/help/text.html
index 732b3e6359..c57d8a4804 100644
--- a/lang/en_utf8/help/text.html
+++ b/lang/en_utf8/help/text.html
@@ -129,7 +129,7 @@ Writing text in Moodle works pretty much the way you would expect, but you also
 <ul>
 <p>You can use a limited subset of HTML tags to add emphasis to your texts.</p>
 <table border="0" cellpadding="5" cellspacing="5">
-<tr><th>HTML tags</th><th>Produces</th></tr>
+<tr><th scope="col">HTML tags</th><th scope="col">Produces</th></tr>
 <tr><td>&lt;b&gt; bold &lt;/b&gt; </td><td> <b>bold text</b> </td></tr>
 <tr><td>&lt;i&gt; italic &lt;/i&gt; </td><td> <i>italic text</i> </td></tr>
 <tr><td>&lt;u&gt; underline &lt;/u&gt; </td><td> <u>underlined text</u> </td></tr>
diff --git a/lib/editor/htmlarea/coursefiles.php b/lib/editor/htmlarea/coursefiles.php
index e85ecd3c9a..099409322c 100644
--- a/lib/editor/htmlarea/coursefiles.php
+++ b/lib/editor/htmlarea/coursefiles.php
@@ -533,7 +533,7 @@
 
                 } else {
                     echo "<table cellpadding=\"4\" cellspacing=\"2\" border=\"0\">\n";
-                    echo "<tr>\n<th align=\"left\">$strname</th><th align=\"right\">$strsize</th><th align=\"right\">$strmodified</th></tr>";
+                    echo "<tr>\n<th align=\"left\" scope=\"col\">$strname</th><th align=\"right\" scope=\"col\">$strsize</th><th align=\"right\" scope=\"col\">$strmodified</th></tr>";
                     foreach ($list as $item) {
                         echo "<tr>";
                         print_cell("left", $item['filename']);
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index e37a9ccb45..6ad9b0a64e 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -3216,16 +3216,16 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions=5, $dis
         echo '<table cellspacing="0" class="forumheaderlist">';
         echo '<thead>';
         echo '<tr>';
-        echo '<th class="header topic">'.get_string('discussion', 'forum').'</th>';
-        echo '<th class="header author" colspan="2">'.get_string('startedby', 'forum').'</th>';
+        echo '<th class="header topic" scope="col">'.get_string('discussion', 'forum').'</th>';
+        echo '<th class="header author" colspan="2" scope="col">'.get_string('startedby', 'forum').'</th>';
         if ($groupmode > 0) {
-            echo '<th class="header group">'.get_string('group').'</th>';
+            echo '<th class="header group" scope="col">'.get_string('group').'</th>';
         }
         if (has_capability('mod/forum:viewdiscussion', $context)) {
-            echo '<th class="header replies">'.get_string('replies', 'forum').'</th>';
+            echo '<th class="header replies" scope="col">'.get_string('replies', 'forum').'</th>';
             /// If the forum can be tracked, display the unread column.
             if ($cantrack) {
-                echo '<th class="header replies">'.get_string('unread', 'forum');
+                echo '<th class="header replies" scope="col">'.get_string('unread', 'forum');
                 if ($forumtracked) {
                     echo '&nbsp;<a title="'.get_string('markallread', 'forum').
                          '" href="'.$CFG->wwwroot.'/mod/forum/markposts.php?f='.
@@ -3235,7 +3235,7 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions=5, $dis
                 echo '</th>';
             }
         }
-        echo '<th class="header lastpost">'.get_string('lastpost', 'forum').'</th>';
+        echo '<th class="header lastpost" scope="col">'.get_string('lastpost', 'forum').'</th>';
         echo '</tr>';
         echo '</thead>';
         echo '<tbody>';
diff --git a/mod/hotpot/hotpot-full.js b/mod/hotpot/hotpot-full.js
index 89c92639b1..0ea1fa3161 100644
--- a/mod/hotpot/hotpot-full.js
+++ b/mod/hotpot/hotpot-full.js
@@ -518,7 +518,7 @@ function QuizLogin(LoginPrompt) {
 		if (Login[0]) { // user name
 			var v = getCookie(self, 'UserName');
 			html += '<tr>'
-				+	'<th align=right nowrap>' + MSG[0] + ' :</th>'
+				+	'<th align="right" nowrap scope="row">' + MSG[0] + ' :</th>'
 				+	'<td>'
 			;
 			if (typeof(Login[0])=='boolean') { // text box
@@ -548,20 +548,20 @@ function QuizLogin(LoginPrompt) {
 		}
 		if (Login[1]) { // user ID
 			var v = getCookie(self, 'UserID');
-			html += '<tr><th align=right nowrap>' + MSG[1] + ' :</th><td><input type=text name=UserID value="' + v + '"></td></tr>';
+			html += '<tr><th align="right" nowrap scope="row">' + MSG[1] + ' :</th><td><input type=text name=UserID value="' + v + '"></td></tr>';
 		}
 		if (Login[2]) { // user email
 			var v = getCookie(self, 'UserEmail');
-			html += '<tr><th align=right nowrap>' + MSG[2] +' :</th><td><input type=text name=UserEmail value="' + v + '"></td></tr>';
+			html += '<tr><th align="right" nowrap scope="row">' + MSG[2] +' :</th><td><input type=text name=UserEmail value="' + v + '"></td></tr>';
 		}
 		if (Login[3]) { // quiz password
 			var v = getCookie(self, 'Password');
-			html += '<tr><th align=right nowrap>' + MSG[3] + ' :</th><td><input type=password name=Password value="' + v + '"></td></tr>';
+			html += '<tr><th align="right" nowrap scope="row">' + MSG[3] + ' :</th><td><input type=password name=Password value="' + v + '"></td></tr>';
 		}
 		if (Login[4]) { // cookie lifespan
 			var v = getCookie(self, 'CookieExpiry');
 			html += '<tr>'
-				+ 	'<th align=right nowrap>' + MSG[4] + ' :</th>'
+				+ 	'<th align="right" nowrap scope="row">' + MSG[4] + ' :</th>'
 				+ 	'<td>'
 				+		'<select name="CookieExpiry" size=1>'
 				+ 			makeOption('session', v, MSG[7])
@@ -574,7 +574,7 @@ function QuizLogin(LoginPrompt) {
 			;
 		}
 		html += 	'<tr>'
-			+		'<th>&nbsp;</th>'
+			+		'<th scope="row">&nbsp;</th>'
 			+		'<td nowrap>'
 			+			'<input type=submit value="' + MSG[5] + '"> '
 			+ 			'<input type=button value="' + MSG[6] + '" onClick="opener.goBack();self.close();">'
@@ -2101,8 +2101,8 @@ function hpFeedback() {
 			html += '<html><body>'
 				+ '<form action="' + FEEDBACK[0] + '" method="POST">'
 				+ '<table border="0">'
-				+ '<tr><th valign="top" align="right">' + FEEDBACK[7] + ':</th><td>' + document.title + '</td></tr>'
-				+ '<tr><th valign="top" align="right">' + FEEDBACK[8] + ': </th><td>'
+				+ '<tr><th valign="top" align="right" scope="row">' + FEEDBACK[7] + ':</th><td>' + document.title + '</td></tr>'
+				+ '<tr><th valign="top" align="right" scope="row">' + FEEDBACK[8] + ': </th><td>'
 			;
 			if (typeof(FEEDBACK[1])=='string') {
 				html += FEEDBACK[1] + hpHiddenField('recipient', FEEDBACK[1], ',', true);
@@ -2119,7 +2119,7 @@ function hpFeedback() {
 				}
 			}
 			html += '</td></tr>'
-				+	'<tr><th valign="top" align="right">' + FEEDBACK[9] + ':</th>'
+				+	'<tr><th valign="top" align="right" scope="row">' + FEEDBACK[9] + ':</th>'
 				+	'<td><TEXTAREA name="message" rows="10" cols="40"></TEXTAREA></td></tr>'
 				+	'<tr><td>&nbsp;</td><td><input type="submit" value="' + FEEDBACK[6] + '">'
 				+ 	hpHiddenField('realname', FEEDBACK[2], ',', true)
@@ -2137,8 +2137,8 @@ function hpFeedback() {
 					html += '<html><body>'
 						+ '<form action="' + FEEDBACK[0] + '" method="POST" onsubmit="this.action+=this.recipient.options[this.recipient.selectedIndex].value">'
 						+ '<table border="0">'
-						+ '<tr><th valign="top" align="right">' + FEEDBACK[7] + ':</th><td>' + document.title + '</td></tr>'
-						+ '<tr><th valign="top" align="right">' + FEEDBACK[8] + ': </th><td>'
+						+ '<tr><th valign="top" align="right" scope="row">' + FEEDBACK[7] + ':</th><td>' + document.title + '</td></tr>'
+						+ '<tr><th valign="top" align="right" scope="row">' + FEEDBACK[8] + ': </th><td>'
 					;
 					html += '<select name="recipient">';
 					for (var i=0; i<i_max; i++) {
diff --git a/mod/hotpot/report.php b/mod/hotpot/report.php
index 615db96dde..d0a335a64a 100644
--- a/mod/hotpot/report.php
+++ b/mod/hotpot/report.php
@@ -519,7 +519,7 @@ function hotpot_print_report_selector(&$course, &$hotpot, &$formdata) {
 
     print '<tr><td>';
     helpbutton('reportcontent', get_string('reportcontent', 'hotpot'), 'hotpot');
-    print '</td><th align="right">'.get_string('reportcontent', 'hotpot').':</th><td colspan="7">';
+    print '</td><th align="right" scope="col">'.get_string('reportcontent', 'hotpot').':</th><td colspan="7">';
     foreach ($menus as $name => $options) {
         $value = $formdata[$name];
         print choose_from_menu($options, $name, $value, "", "", 0, true);
@@ -561,7 +561,7 @@ function hotpot_print_report_selector(&$course, &$hotpot, &$formdata) {
     print '</td>';
     foreach ($menus as $name => $options) {
         $value = $formdata[$name];
-        print '<th align="right">'.get_string($name, 'hotpot').':</th><td>'.choose_from_menu($options, $name, $value, "", "", 0, true).'</td>';
+        print '<th align="right" scope="col">'.get_string($name, 'hotpot').':</th><td>'.choose_from_menu($options, $name, $value, "", "", 0, true).'</td>';
     }
     print '</tr>';
 
diff --git a/mod/hotpot/report/default.php b/mod/hotpot/report/default.php
index a7e4ae27f2..254e5b22a4 100644
--- a/mod/hotpot/report/default.php
+++ b/mod/hotpot/report/default.php
@@ -366,7 +366,7 @@ class hotpot_default_report {
         $d = $table->tableclass.'cell';
         $h = $table->tableclass.'header';
 
-        $table->th_side = '<th valign="top" align="right" class="'.$h.'">';
+        $table->th_side = '<th valign="top" align="right" class="'.$h.'" scope="col">';
 
         $table->td = array();
         $table->th_top = array();
@@ -392,7 +392,7 @@ class hotpot_default_report {
             $size  = empty($table->size[$i])  ? '' : ' width="'.$table->size[$i].'"';
             $wrap  = empty($table->wrap[$i])  ? '' : ' nowrap="nowrap"';
 
-            $table->th_top[$i] = '<th align="center"'.$size.' class="'.$h.'" nowrap="nowrap">';
+            $table->th_top[$i] = '<th align="center"'.$size.' class="'.$h.'" nowrap="nowrap" scope="col">';
 
             $table->td[$i] = '<td valign="top"'.$align.$class.$wrap.'>';
 
diff --git a/mod/hotpot/review.php b/mod/hotpot/review.php
index 7e114feac7..0f9357e216 100644
--- a/mod/hotpot/review.php
+++ b/mod/hotpot/review.php
@@ -123,7 +123,7 @@ function hotpot_print_attempt_summary(&$hotpot, &$attempt) {
                 default:
                     $name = get_string($field, 'quiz');
             }
-            print '<tr><th align="right" width="100" class="generaltableheader">'.$name.':</th><td class="generaltablecell">'.$value.'</td></tr>';
+            print '<tr><th align="right" width="100" class="generaltableheader" scope="row">'.$name.':</th><td class="generaltablecell">'.$value.'</td></tr>';
         }
     }
     // finish table
@@ -216,7 +216,7 @@ function hotpot_print_attempt_details(&$hotpot, &$attempt) {
                             $printedquestion = true;
                         }
                         // print response
-                        print '<tr><th align="right" width="100" class="generaltableheader">'.$f[$field]['name'].':</th><td colspan="'.($colspan-1).'" class="generaltablecell">'.$text.'</td></tr>'."\n";
+                        print '<tr><th align="right" width="100" class="generaltableheader" scope="row">'.$f[$field]['name'].':</th><td colspan="'.($colspan-1).'" class="generaltablecell">'.$text.'</td></tr>'."\n";
                     }
                 }
             }
@@ -231,7 +231,7 @@ function hotpot_print_attempt_details(&$hotpot, &$attempt) {
                     }
                     // print numeric response
                     $value = isset($question[$field]) ? $question[$field] : '-';
-                    print '<th align="right" width="100" class="generaltableheader">'.$f[$field]['name'].':</th><td class="generaltablecell">'.$value.'</td>';
+                    print '<th align="right" width="100" class="generaltableheader" scope="row">'.$f[$field]['name'].':</th><td class="generaltablecell">'.$value.'</td>';
                 }
             }
             print "</tr>\n";
diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php
index d999676110..05fe89a778 100644
--- a/mod/quiz/editlib.php
+++ b/mod/quiz/editlib.php
@@ -180,7 +180,7 @@ function quiz_print_question_list($quiz, $allowdelete=true, $showbreaks=true, $r
 
     print_simple_box_start('center', '100%', '#ffffff', 0);
     echo "<table border=\"0\" cellpadding=\"2\" cellspacing=\"0\" width=\"100%\">\n";
-    echo "<tr><th colspan=\"3\" nowrap=\"nowrap\" class=\"header\">$strorder</th><th class=\"header\">#</th><th align=\"left\" width=\"100%\" nowrap=\"nowrap\" class=\"header\">$strquestionname</th><th nowrap=\"nowrap\" class=\"header\">$strtype</th><th nowrap=\"nowrap\" class=\"header\">$strgrade</th><th align=\"center\" width=\"60\" nowrap=\"nowrap\" class=\"header\">$straction</th></tr>\n";
+    echo "<tr><th colspan=\"3\" nowrap=\"nowrap\" class=\"header\" scope=\"col\">$strorder</th><th class=\"header\" scope=\"col\">#</th><th align=\"left\" width=\"100%\" nowrap=\"nowrap\" class=\"header\" scope=\"col\">$strquestionname</th><th nowrap=\"nowrap\" class=\"header\" scope=\"col\">$strtype</th><th nowrap=\"nowrap\" class=\"header\" scope=\"col\">$strgrade</th><th align=\"center\" width=\"60\" nowrap=\"nowrap\" class=\"header\" scope=\"col\">$straction</th></tr>\n";
     foreach ($order as $i => $qnum) {
 
         if ($qnum and empty($questions[$qnum])) {
diff --git a/mod/quiz/jstimer.php b/mod/quiz/jstimer.php
index af93e3cd12..bb5acc1e5b 100644
--- a/mod/quiz/jstimer.php
+++ b/mod/quiz/jstimer.php
@@ -28,7 +28,7 @@ var ec_quiz_finish = ec_page_start + <?php echo ($timerstartvalue * 1000); ?>;
     <td class="generalboxcontent" bgcolor="#ffffff" width="100%">
     <table class="generaltable" border="0" width="150" cellspacing="0" cellpadding="0">
     <tr>
-        <th class="generaltableheader" width="100%" scope=\"col\"><?php print_string("timeleft","quiz");?></th>
+        <th class="generaltableheader" width="100%" scope="col"><?php print_string("timeleft","quiz");?></th>
     </tr>
     <tr>
         <td id="QuizTimer" class="generaltablecell" align="center" width="100%">
-- 
2.39.5