accessiblity, associating <th> with respective row or col

diff --git a/group/groupui/main-form.html b/group/groupui/main-form.html
index 32a32da534b788a452e8eee4f66a1b83cf17e1f9..5818ebfd9241ffef37d4ad12ff0c69e2526ad300 100644 (file)
--- a/group/groupui/main-form.html
+++ b/group/groupui/main-form.html
@@ -1,9 +1,9 @@
 <form name="groupeditform" id="groupeditform" action="">
     <table cellpadding="10" class="generaltable generalbox groupmanagementtable">
         <tr>
-            <th class="header groupmanagementtableheader"><?php print_string('groupings', 'group'); ?></th>
-            <th class="header groupmanagementtableheader"><?php print_string('groupsinselectedgrouping', 'group'); ?></th>
-            <th class="header groupmanagementtableheader"><?php print_string('membersofselectedgroup', 'group'); ?></th>
+            <th class="header groupmanagementtableheader" scope="col"><?php print_string('groupings', 'group'); ?></th>
+            <th class="header groupmanagementtableheader" scope="col"><?php print_string('groupsinselectedgrouping', 'group'); ?></th>
+            <th class="header groupmanagementtableheader" scope="col"><?php print_string('membersofselectedgroup', 'group'); ?></th>
         </tr>
         <tr>
             <td class="generalboxcontent">

diff --git a/lang/en_utf8/help/wiki/wikitype.html b/lang/en_utf8/help/wiki/wikitype.html
index 835d4e91ede65b17b014803bdd20964ba1d7dc2d..adb8f0f7552128e2bf624e5a1eaa0c81eb0cbbee 100644 (file)
--- a/lang/en_utf8/help/wiki/wikitype.html
+++ b/lang/en_utf8/help/wiki/wikitype.html
@@ -6,25 +6,25 @@ like any activity, the wiki has the Moodle group modes: "No Groups" &q
 This leads to the following matrix of nine possibilities:
 <table border="1" width="100%"><tbody>
   <tr>
-    <th valign="top" width="25%"></th>
-    <th valign="top" width="25%">No Groups</th>
-    <th valign="top" width="25%">Separate Groups</th>
-    <th valign="top" width="25%">Visible Groups</th>
+    <th valign="top" width="25%" scope="col"></th>
+    <th valign="top" width="25%" scope="col">No Groups</th>
+    <th valign="top" width="25%" scope="col">Separate Groups</th>
+    <th valign="top" width="25%" scope="col">Visible Groups</th>
   </tr>
   <tr>
-    <th valign="top" width="25%">Teacher</th>
+    <th valign="top" width="25%" scope="row">Teacher</th>
     <td valign="top" width="25%">There is only one wiki which only the teacher can edit. Students can view the contents.</td>
     <td valign="top" width="25%">There is one wiki for every group which just the teacher can edit. Students can view the wiki of their group only.</td>
     <td valign="top" width="25%">There is one wiki for every group which just the teacher can edit. Students can view the wikis for all groups.</td>
   </tr>
   <tr>
-    <th valign="top" width="25%">Groups</th>
+    <th valign="top" width="25%" scope="row">Groups</th>
     <td valign="top" width="25%">There is only one wiki. The teacher and all students can view and edit this wiki.</td>
     <td valign="top" width="25%">There is one wiki per group. Students can view and edit the wiki of their own group only.</td>
     <td valign="top" width="25%">There is one wiki per group. Students can change the wiki of their own group only. They can view the wikis for all groups.</td>
   </tr>
   <tr>
-    <th valign="top" width="25%">Student</th>
+    <th valign="top" width="25%" scope="row">Student</th>
     <td valign="top" width="25%">Every student has their own wiki which only they and their teacher can view and edit.</td>
     <td valign="top" width="25%">Every student has their own wiki, which only they and their teacher can edit. Students can view the wikis of other students in their group.</td>
     <td valign="top" width="25%">Every student has their own wiki, which only they and their teacher can edit. Students can view the wikis of all other students in the course.</td>

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 567446c3d64f120670ddd875633a3677fea5d75d..c91d066b0a89e4e5b946c877523f4c3b5119c128 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -6254,10 +6254,10 @@ function unzip_show_status ($list,$removepath) {
         $strmodified = get_string("modified");
         $strstatus = get_string("status");
         echo "<table cellpadding=\"4\" cellspacing=\"2\" border=\"0\" width=\"640\">";
-        echo "<tr><th class=\"header\" align=\"left\">$strname</th>";
-        echo "<th class=\"header\" align=\"right\">$strsize</th>";
-        echo "<th class=\"header\" align=\"right\">$strmodified</th>";
-        echo "<th class=\"header\" align=\"right\">$strstatus</th></tr>";
+        echo "<tr><th class=\"header\" align=\"left\" scope=\"col\">$strname</th>";
+        echo "<th class=\"header\" align=\"right\" scope=\"col\">$strsize</th>";
+        echo "<th class=\"header\" align=\"right\" scope=\"col\">$strmodified</th>";
+        echo "<th class=\"header\" align=\"right\" scope=\"col\">$strstatus</th></tr>";
         foreach ($list as $item) {
             echo "<tr>";
             $item['filename'] = str_replace(cleardoubleslashes($removepath).'/', "", $item['filename']);

diff --git a/login/index_form.html b/login/index_form.html
index 6d7f5dc345c92fb2114175805084d23bc92649a7..8696b391b2bd95089358d578b43ad2c22b52dc3d 100644 (file)
--- a/login/index_form.html
+++ b/login/index_form.html
@@ -1,10 +1,10 @@
 <table width="90%" border="0" cellpadding="5" align="center" class="loginbox">
 <?php if ($show_instructions) { ?>
   <tr>
-    <th width="50%" class="header left">
+    <th width="50%" class="header left" scope="col">
       <?php  print_string("returningtosite") ?>
     </th>
-    <th width="50%" class="header right">
+    <th width="50%" class="header right" scope="col">
       <?php  print_string("firsttime") ?>
     </th>
   </tr>

diff --git a/mod/choice/lib.php b/mod/choice/lib.php
index 5658d87a8cfc55453ad37324eb7c5e45a4a4d0d2..b74958b4cf65f0e1546524577bd3461abd7672e4 100644 (file)
--- a/mod/choice/lib.php
+++ b/mod/choice/lib.php
@@ -367,9 +367,9 @@ function choice_show_results($choice, $course, $cm, $forcepublish='') {
             $count = 0;
             foreach ($useranswer as $optionid => $userlist) {
                 if ($optionid) {
-                    echo "<th class=\"col$count header\" width=\"$tablewidth%\">";
+                    echo "<th class=\"col$count header\" width=\"$tablewidth%\" scope=\"col\">";
                 } else if ($choice->showunanswered) {
-                    echo "<th class=\"col$count header\" width=\"$tablewidth%\">";
+                    echo "<th class=\"col$count header\" width=\"$tablewidth%\" scope=\"col\">";
                 } else {
                     continue;
                 }
@@ -472,9 +472,9 @@ function choice_show_results($choice, $course, $cm, $forcepublish='') {
             $count = 0;
             foreach ($useranswer as $optionid => $userlist) {
                 if ($optionid) {
-                    echo "<th width=\"$tablewidth%\" class=\"col$count header\">";
+                    echo "<th width=\"$tablewidth%\" class=\"col$count header\" scope=\"col\">";
                 } else if ($choice->showunanswered) {
-                    echo "<th width=\"$tablewidth%\" class=\"col$count header\">";
+                    echo "<th width=\"$tablewidth%\" class=\"col$count header\" scope=\"col\">";
                 } else {
                     continue;
                 }

diff --git a/mod/data/report.php b/mod/data/report.php
index 197a399447ea7e3720d789fda0175c1c68818d5c..ebb7668b3bdd994dcb78265447be3dcadf0ce257 100755 (executable)
--- a/mod/data/report.php
+++ b/mod/data/report.php
@@ -49,9 +49,9 @@
     } else {
         echo "<table border=\"0\" cellpadding=\"3\" cellspacing=\"3\" class=\"generalbox\" width=\"100%\">";
         echo "<tr>";
-        echo "<th>&nbsp;</th>";
-        echo "<th><a href=\"report.php?id=$id&amp;sort=firstname\">$strname</a>";
-        echo "<th width=\"100%\"><a href=\"report.php?id=$id&amp;sort=rating\">$strrating</a>";
+        echo "<th scope=\"col\">&nbsp;</th>";
+        echo "<th scope=\"col\"><a href=\"report.php?id=$id&amp;sort=firstname\">$strname</a>";
+        echo "<th width=\"100%\" scope=\"col\"><a href=\"report.php?id=$id&amp;sort=rating\">$strrating</a>";
         foreach ($ratings as $rating) {
             if (has_capability('mod/data:manageentries', $context)) {
                 echo '<tr class="forumpostheadertopic">';

diff --git a/mod/forum/report.php b/mod/forum/report.php
index f889b553073c94922e730841f48565a8d31211e9..9efca06dce0993fa1efc3dc6817a6525af46d2f4 100644 (file)
--- a/mod/forum/report.php
+++ b/mod/forum/report.php
@@ -55,10 +55,10 @@
     } else {
         echo "<table border=\"0\" cellpadding=\"3\" cellspacing=\"3\" class=\"generalbox\" width=\"100%\">";
         echo "<tr>";
-        echo "<th>&nbsp;</th>";
-        echo "<th><a href=\"report.php?id=$post->id&amp;sort=u.firstname\">$strname</a>";
-        echo "<th width=\"100%\"><a href=\"report.php?id=$post->id&amp;sort=r.rating\">$strrating</a>";
-        echo "<th><a href=\"report.php?id=$post->id&amp;sort=r.time\">$strtime</a>";
+        echo "<th scope=\"col\">&nbsp;</th>";
+        echo "<th scope=\"col\"><a href=\"report.php?id=$post->id&amp;sort=u.firstname\">$strname</a>";
+        echo "<th width=\"100%\" scope=\"col\"><a href=\"report.php?id=$post->id&amp;sort=r.rating\">$strrating</a>";
+        echo "<th scope=\"col\"><a href=\"report.php?id=$post->id&amp;sort=r.time\">$strtime</a>";
         foreach ($ratings as $rating) {
             echo '<tr class="forumpostheader">';
             echo "<td>";

diff --git a/mod/glossary/report.php b/mod/glossary/report.php
index 0db6a29aad36a1d844459d724304bf44d0e59c55..c9b17fb0aad7a566d4d92a9734f9bbc9f1d7c89a 100644 (file)
--- a/mod/glossary/report.php
+++ b/mod/glossary/report.php
@@ -49,10 +49,10 @@
     } else {
         echo "<table border=\"0\" cellpadding=\"3\" cellspacing=\"3\" class=\"generalbox\" width=\"100%\">";
         echo "<tr>";
-        echo "<th class=\"header\">&nbsp;</th>";
-        echo "<th class=\"header\"><a href=\"report.php?id=$entry->id&amp;sort=firstname\">$strname</a></th>";
-        echo "<th width=\"100%\" class=\"header\"><a href=\"report.php?id=$entry->id&amp;sort=rating\">$strrating</a></th>";
-        echo "<th class=\"header\"><a href=\"report.php?id=$entry->id&amp;sort=time\">$strtime</a></th>";
+        echo "<th class=\"header\" scope=\"col\">&nbsp;</th>";
+        echo "<th class=\"header\" scope=\"col\"><a href=\"report.php?id=$entry->id&amp;sort=firstname\">$strname</a></th>";
+        echo "<th width=\"100%\" class=\"header\" scope=\"col\"><a href=\"report.php?id=$entry->id&amp;sort=rating\">$strrating</a></th>";
+        echo "<th class=\"header\" scope=\"col\"><a href=\"report.php?id=$entry->id&amp;sort=time\">$strtime</a></th>";
         foreach ($ratings as $rating) {
             if (has_capability('mod/glossary:manageentries', $context)) {
                 echo '<tr class="teacher">';

diff --git a/mod/lesson/action/continue.html b/mod/lesson/action/continue.html
index 309b86270c27044863b948a6df57cc2cb6f723ed..5506da9573f79fae5de29755f37f3e1d7ab4e7c5 100644 (file)
--- a/mod/lesson/action/continue.html
+++ b/mod/lesson/action/continue.html
@@ -118,7 +118,7 @@ if ($lesson->displayleft) {
         <td>
             <table align="right" width="150px" class="generaltable generalbox" cellspacing="0" cellpadding="5px" border="0" valign="top">
                 <tr>
-                    <th class="header"><?php print_string("timeremaining", "lesson") ?></th>
+                    <th class="header" scope="col"><?php print_string("timeremaining", "lesson") ?></th>
                 </tr>
                 <tr class="r0">
                     <td align="center" class="c0">

diff --git a/mod/lesson/edit.php b/mod/lesson/edit.php
index d5f96cfdfd15fa7797ebf8239ff5a870a6cecba5..a342a513f7ff8fbf7a56f553954275aac51acb6a 100644 (file)
--- a/mod/lesson/edit.php
+++ b/mod/lesson/edit.php
@@ -43,7 +43,7 @@
     if (empty($firstpage)) {
         // There are no pages; give teacher some options
         if (has_capability('mod/lesson:edit', $context)) {
-            print_simple_box( "<table cellpadding=\"5\" border=\"0\">\n<tr><th>".get_string("whatdofirst", "lesson")."</th></tr><tr><td>".
+            print_simple_box( "<table cellpadding=\"5\" border=\"0\">\n<tr><th scope=\"col\">".get_string("whatdofirst", "lesson")."</th></tr><tr><td>".
                 "<a href=\"import.php?id=$cm->id&amp;pageid=0\">".
                 get_string("importquestions", "lesson")."</a></td></tr><tr><td>".
                 "<a href=\"importppt.php?id=$cm->id&amp;pageid=0\">".
@@ -113,7 +113,7 @@
                     $page = $pages[$pageid];
 
                     echo "<tr><td>\n";
-                    echo "<table width=\"100%\" border=\"1\" class=\"generalbox\"><tr><th colspan=\"2\">".format_string($page->title)."&nbsp;&nbsp;\n";
+                    echo "<table 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";

diff --git a/mod/lesson/viewend.html b/mod/lesson/viewend.html
index 1363ab8faf6c6048a7e99cf6db49ea96010796da..3ba1e60119f483f9e9f73e631cf23ad3eb69a90c 100644 (file)
--- a/mod/lesson/viewend.html
+++ b/mod/lesson/viewend.html
@@ -25,7 +25,7 @@
     
             <table align="right" width="150px" class="generaltable generalbox" cellspacing="0" cellpadding="5px" border="0" valign="top">
                 <tr>
-                    <th class="header"><?php print_string("timeremaining", "lesson") ?></th>
+                    <th class="header" scope="col"><?php print_string("timeremaining", "lesson") ?></th>
                 </tr>
                 <tr class="r0">
                     <td align="center" class="c0">

diff --git a/mod/quiz/config.html b/mod/quiz/config.html
index 96b7fda3c6016674d11fdb89b8ed3e1210bfbc34..0204b148a74c2f07d753b579923a8bd1d24c027f 100644 (file)
--- a/mod/quiz/config.html
+++ b/mod/quiz/config.html
@@ -109,11 +109,11 @@
 <table cellpadding="9" cellspacing="0" align="center">
 
 <tr valign="top">
-  <th align="right">&nbsp;</th>
-  <th align="left">
+  <th align="right" scope="col">&nbsp;</th>
+  <th align="left" scope="col">
     <?php print_string('sitedefault'); ?>
   </th>
-  <th align="center">
+  <th align="center" scope="col">
     <?php print_string('advancedsettings'); helpbutton("advancedsettings"); ?>
   </th>
 </tr>

diff --git a/mod/quiz/jstimer.php b/mod/quiz/jstimer.php
index 1a0d7641a3956da044578a18227960c769383967..af93e3cd12ce590b3441c4b5cf352b862afb33a1 100644 (file)
--- 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%"><?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%">

diff --git a/mod/resource/type/directory/resource.class.php b/mod/resource/type/directory/resource.class.php
index a880f783b1e2c55a69026f883d695499195c38cd..1a0072f9f5b8fab0eee7f92c21f4acb6c9a018c3 100644 (file)
--- a/mod/resource/type/directory/resource.class.php
+++ b/mod/resource/type/directory/resource.class.php
@@ -99,9 +99,9 @@ function display() {
     $strfile = get_string("file");
 
     echo '<table cellpadding="4" cellspacing="1" class="files">';
-    echo "<tr><th class=\"header name\">$strname</th>".
-         "<th align=\"right\" colspan=\"2\" class=\"header size\">$strsize</th>".
-         "<th align=\"right\" class=\"header date\">$strmodified</th>".
+    echo "<tr><th class=\"header name\" scope=\"col\">$strname</th>".
+         "<th align=\"right\" colspan=\"2\" class=\"header size\" scope=\"col\">$strsize</th>".
+         "<th align=\"right\" class=\"header date\" scope=\"col\">$strmodified</th>".
          "</tr>";
     foreach ($files as $file) {
         if (is_dir("$CFG->dataroot/$relativepath/$file")) {          // Must be a directory

diff --git a/question/editlib.php b/question/editlib.php
index 543028cbb9b6594eac761545b1ebfaeadf1e2bb4..e885ca37b2cf0d371363e93b93328b309c40df68 100644 (file)
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -330,15 +330,15 @@ function question_list($course, $categoryid, $quizid=0,
     print_simple_box_start('center', '100%', '#ffffff', 0);
     echo '<table id="categoryquestions" cellspacing="0"><tr>';
     $actionwidth = $canedit ? 95 : 70;
-    echo "<th width=\"$actionwidth\" nowrap=\"nowrap\" class=\"header\">$straction</th>";
+    echo "<th width=\"$actionwidth\" nowrap=\"nowrap\" class=\"header\" scope=\"col\">$straction</th>";
     
     $sortoptions = array('name, qtype ASC' => get_string("sortalpha", "quiz"),
                          'qtype, name ASC' => get_string("sorttypealpha", "quiz"),
                          'id ASC' => get_string("sortage", "quiz"));
     $orderselect  = choose_from_menu ($sortoptions, 'sortorder', $sortorder, false, 'this.form.submit();', '0', true);
     $orderselect .= '<noscript><input type="submit" value="'.get_string("sortsubmit", "quiz").'" /></noscript>';
-    echo "<th width=\"100%\" align=\"left\" nowrap=\"nowrap\" class=\"header\">$strquestionname $orderselect</th>
-    <th nowrap=\"nowrap\" class=\"header\">$strtype</th>";
+    echo "<th width=\"100%\" align=\"left\" nowrap=\"nowrap\" class=\"header\" scope=\"col\">$strquestionname $orderselect</th>
+    <th nowrap=\"nowrap\" class=\"header\" scope=\"col\">$strtype</th>";
     echo "</tr>\n";
     foreach ($questions as $question) {
         echo "<tr>\n<td nowrap=\"nowrap\">\n";

diff --git a/question/type/questiontype.php b/question/type/questiontype.php
index b36fd2272ded69547af245bda1dd5518544989e1..13740d839c955fc56d085723b7757b62027cb9e1 100644 (file)
--- a/question/type/questiontype.php
+++ b/question/type/questiontype.php
@@ -1046,9 +1046,9 @@ class default_questiontype {
             echo "<td align=\"left\">\n";
             echo "<table cellpadding=\"5\" align=\"left\" class=\"generalbox\" width=\"100%\">\n";
             echo "<tr>\n";
-            echo "<th align=\"left\" valign=\"top\" nowrap=\"nowrap\" class=\"generaltableheader c0\">$strquizname</th>\n";
-            echo "<th align=\"center\" valign=\"top\" nowrap=\"nowrap\" class=\"generaltableheader c0\">$strdoreplace</th>\n";
-            echo "<th align=\"left\" valign=\"top\" nowrap=\"nowrap\" class=\"generaltableheader c0\">$straffectedstudents</th>\n";
+            echo "<th align=\"left\" valign=\"top\" nowrap=\"nowrap\" class=\"generaltableheader c0\" scope=\"col\">$strquizname</th>\n";
+            echo "<th align=\"center\" valign=\"top\" nowrap=\"nowrap\" class=\"generaltableheader c0\" scope=\"col\">$strdoreplace</th>\n";
+            echo "<th align=\"left\" valign=\"top\" nowrap=\"nowrap\" class=\"generaltableheader c0\" scope=\"col\">$straffectedstudents</th>\n";
             echo "</tr>\n";
             foreach($quizzes as $quiz) {
                 // work out whethere it should be checked by default

diff --git a/theme/index.php b/theme/index.php
index df5a70f6edf0abef39e322d11bed189c31bf6513..ff0cb698f6804981020a30386c0f9c58a21e2b4c 100644 (file)
--- a/theme/index.php
+++ b/theme/index.php
@@ -59,7 +59,7 @@
     $sesskey = !empty($USER->id) ? $USER->sesskey : '';
 
     echo "<table align=\"center\" cellpadding=\"7\" cellspacing=\"5\">";
-    echo "<tr class=\"generaltableheader\"><th>$strtheme</th><th>$strinfo</th></tr>";
+    echo "<tr class=\"generaltableheader\"><th scope=\"col\">$strtheme</th><th scope=\"col\">$strinfo</th></tr>";
     foreach ($themes as $theme) {
 
         unset($THEME);