Changes for XHTML and accessibility compatibility

diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index d90ebe30436cf2816ffeb66761e40945359871f2..47e507337de65801e9b22fb6e6417db78511191e 100644 (file)
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -1043,7 +1043,7 @@ function quiz_print_quiz_questions($quiz, $questions,
     // $readonly determines if it is an attempt or an review,
     // The condition used here is unfortunatelly somewhat confusing...
     $readonly = !empty($results) && !isset($results->attemptbuildsonthelast)
-            ? ' readonly="readonly" ' : '';
+            ? ' disabled="disabled" ' : '';
 
     foreach ($questions as $question) {
 

diff --git a/mod/quiz/questiontypes/multianswer/questiontype.php b/mod/quiz/questiontypes/multianswer/questiontype.php
index fb89a42ff520f034f140592b79efe4c43cc13f40..fb5a2650a2352806be6bc3db72f64f7c796e153f 100644 (file)
--- a/mod/quiz/questiontypes/multianswer/questiontype.php
+++ b/mod/quiz/questiontypes/multianswer/questiontype.php
@@ -271,7 +271,7 @@ class quiz_embedded_cloze_qtype extends quiz_default_questiontype {
                                 ? ' selected="selected" ' : '';
                         $outputoptions .= "<option value=\"$mcanswer->id\" $selected>$mcanswer->answer</option>";
                     }
-                   echo "<select $popup $style name=\"$inputname\" $readonly>";
+                   echo "<select $popup $style name=\"$inputname\">";
                    echo $outputoptions;
                    echo '</select>';
                    break;

diff --git a/mod/quiz/questiontypes/multichoice/questiontype.php b/mod/quiz/questiontypes/multichoice/questiontype.php
index a1c3ba99e8c3a8b2b43d4cc204bf4ef6c04939a9..8a3ea96ddbef8217fbf9cf19895ea835d634b184 100644 (file)
--- a/mod/quiz/questiontypes/multichoice/questiontype.php
+++ b/mod/quiz/questiontypes/multichoice/questiontype.php
@@ -204,10 +204,7 @@ class quiz_multichoice_qtype extends quiz_default_questiontype {
                 $checked = !empty($question->response[$nameprefix.$aid])
                         ? ' checked="checked" ' : '';
             }
-            if ($readonly) {
-                $readonly = ' readonly="readonly" disabled="disabled" ';
-            }
-            echo "<input $readonly $name $checked $type  value=\"$answer->id\" />";
+            echo "<input $readonly $name $checked $type  value=\"$answer->id\" alt=\"".s($answer->answer)."\" />";
            
             echo "</td>";
             

diff --git a/mod/quiz/questiontypes/shortanswer/questiontype.php b/mod/quiz/questiontypes/shortanswer/questiontype.php
index f314d5349401c373d28ae8a8eb12ecfc0c62a2d2..663d0de147df017e5dd6e938ec731f9c410dffa1 100644 (file)
--- a/mod/quiz/questiontypes/shortanswer/questiontype.php
+++ b/mod/quiz/questiontypes/shortanswer/questiontype.php
@@ -124,7 +124,7 @@ class quiz_shortanswer_qtype extends quiz_default_questiontype {
 \r
         if ($quiz->feedback && isset($answers[$nameprefix])\r
                 && $feedback = $answers[$nameprefix]->feedback) {\r
-           quiz_print_comment("<p align=\"right\">$feedback</p>");\r
+           quiz_print_comment($feedback);\r
         }\r
         if ($readonly && $quiz->correctanswers) {\r
             $delimiter = '';\r

diff --git a/mod/quiz/questiontypes/truefalse/questiontype.php b/mod/quiz/questiontypes/truefalse/questiontype.php
index a53abb9adbfa49c4542b21831ee9cb10a985e071..df7692aba8b67d7d934df5e84669e4ab814c91f4 100644 (file)
--- a/mod/quiz/questiontypes/truefalse/questiontype.php
+++ b/mod/quiz/questiontypes/truefalse/questiontype.php
@@ -122,9 +122,6 @@ class quiz_truefalse_qtype extends quiz_default_questiontype {
         } else if ($false->id == $question->response[$nameprefix]) {
            $falsechecked = 'checked="checked"';
         }
-        if ($readonly) {
-            $readonly = ' readonly="readonly" disabled="disabled" ';
-        }
 
         $truecorrect = "";
         $falsecorrect = "";
@@ -137,16 +134,16 @@ class quiz_truefalse_qtype extends quiz_default_questiontype {
            }
         }
         $inputname = ' name="'.$nameprefix.'" ';
-        echo "<table align=\"right\" cellpadding=\"5\"><tr><td align=\"right\">$stranswer:&nbsp;&nbsp;";
+        echo "<table align=\"right\" cellpadding=\"5\"><tr><td align=\"right\">$stranswer:&nbsp;&nbsp;</td>";
         echo "<td $truecorrect>";
-        echo "<input $truechecked type=\"radio\" $readonly $inputname value=\"$true->id\" />$true->answer";
+        echo "<input $truechecked type=\"radio\" $readonly $inputname value=\"$true->id\" alt=\"".s($true->answer)."\" />$true->answer";
         echo "</td><td $falsecorrect>";
-        echo "<input $falsechecked type=\"radio\"  $readonly $inputname value=\"$false->id\" />$false->answer";
+        echo "<input $falsechecked type=\"radio\"  $readonly $inputname value=\"$false->id\" alt=\"".s($false->answer)."\" />$false->answer";
         echo "</td></tr></table><br clear=\"all\" />";// changed from clear=ALL jm
         if ($quiz->feedback && isset($answers[$nameprefix])
                 && $feedback = $answers[$nameprefix]->feedback) {
            quiz_print_comment(
-                    "<p align=\"right\">$feedback</p>");
+                    "$feedback");
         }
     }