From: moodler Date: Fri, 26 Nov 2004 09:33:02 +0000 (+0000) Subject: Changes for XHTML and accessibility compatibility X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b64dab0e5df99c7364244705f4c6efeba2f782e3;p=moodle.git Changes for XHTML and accessibility compatibility --- diff --git a/mod/wiki/ewiki/ewiki.php b/mod/wiki/ewiki/ewiki.php index 1c8f83d50f..d13cf7bc06 100644 --- a/mod/wiki/ewiki/ewiki.php +++ b/mod/wiki/ewiki/ewiki.php @@ -1086,7 +1086,7 @@ function ewiki_page_search($id, &$data, $action) { if (! ($q = @$_REQUEST["q"])) { - $o .= '
'; + $o .= ''; $o .= '

'; $o .= ''; $o .= '
'; @@ -1523,7 +1523,7 @@ function ewiki_page_edit_form(&$id, &$data, &$hidden_postdata) { #-- edit textarea/form $o .= ewiki_t("EDIT_FORM_1") - . '
' . "\n"; @@ -1590,10 +1590,10 @@ function ewiki_page_edit_form_final_imgupload(&$o, &$id, &$data, &$action) { $o .= "\n
\n". '
' . '' + . ' method="post" enctype="multipart/form-data" target="_upload">' . '' . '' : "") + . (defined("EWIKI_IMAGE_ACCEPT") ? ' accept="'.EWIKI_IMAGE_ACCEPT.'" />' : " />") . '' . '   ' . '' @@ -1634,7 +1634,7 @@ function ewiki_control_links($id, &$data, $action) { if (@$data["forced_version"]) { - $o .= '' . + $o .= '' . '' . '' . ' '; diff --git a/mod/wiki/mod.html b/mod/wiki/mod.html index 120f04fe2e..17a98a2e43 100644 --- a/mod/wiki/mod.html +++ b/mod/wiki/mod.html @@ -65,27 +65,27 @@ } ?> -
-
- - - - - - - -

:

 - -

:

 + +
+ + + + + + + + - + + - - + - + + - - - + + - - - + + + - + - - - + + + - + - + + @@ -145,15 +145,15 @@ - - + - + - + + - -
: + +
: summary); ?> -

+

- :

 + : wtype]; @@ -94,46 +94,46 @@ choose_from_menu($WIKI_TYPES, 'wtype', $form->wtype, ""); } ?> -

:

 +
: -

+

- :

 + : get_string("nohtml","wiki") , "1" => get_string("safehtml","wiki"), "2" => get_string("htmlonly","wiki")); choose_from_menu($htmlmodes, "htmlmode", $form->htmlmode, ""); ?> -

+

- :

 + : -
: - disablecamelcase?"CHECKED":""; ?> /> + disablecamelcase?"CHECKED":""; ?> alt="" />
- setpageflags?"CHECKED":""; ?> /> + setpageflags?"CHECKED":""; ?> alt="" />
- strippages?"CHECKED":""; ?> /> + strippages?"CHECKED":""; ?> alt="" />
- removepages?"CHECKED":""; ?> /> + removepages?"CHECKED":""; ?> alt="" />
- revertchanges?"CHECKED":""; ?> /> + revertchanges?"CHECKED":""; ?> alt="" />
@@ -165,29 +165,29 @@

+

- :

 + : pagename; } else { ?> - + -
+ - :

+ : 		initialcontent\" /> "; - button_to_popup_window ("/files/index.php?choose=form.initialcontent&id=$course->id", + echo "initialcontent\" alt=\"".get_string("initialcontent", "wiki")."\" /> "; + button_to_popup_window ("/files/index.php?choose=form.initialcontent&id=$course->id", "wikifiles", $strchooseafile, 500, 750, $strchooseafile); } ?>
+
- - - - - - - - - -
-
+ + + + + + + + + + + diff --git a/mod/wiki/view.php b/mod/wiki/view.php index e276d669e9..a0c99a6483 100644 --- a/mod/wiki/view.php +++ b/mod/wiki/view.php @@ -226,7 +226,7 @@ $strwiki = get_string("modulename", "wiki"); print_header_simple(($ewiki_title?$ewiki_title:$wiki->name), "", - "id\">$strwikis -> $wiki->name".($ewiki_title?" -> $ewiki_title":""), + "id\">$strwikis -> $wiki->name".($ewiki_title?" -> $ewiki_title":""), "", "", true, update_module_button($cm->id, $course->id, $strwiki), navmenu($course, $cm)); @@ -339,7 +339,7 @@ } print $content2; print_simple_box_end(); - echo "
"; + echo "
"; /// Finish the page print_footer($course); diff --git a/mod/workshop/assessments.php b/mod/workshop/assessments.php index e5cb0fb3f4..2f6391a22d 100644 --- a/mod/workshop/assessments.php +++ b/mod/workshop/assessments.php @@ -82,9 +82,9 @@ } ?>
- - - + + +
\n"; - echo " \n"; + echo " \n"; echo "

". get_string("comment", "workshop").":

". get_string("comment", "workshop").":\n"; - echo " \n"; echo "
\n"; echo "\n"; echo "
\n"; - echo "

".get_string("assessment", "workshop"). "
\n"; + echo "
".get_string("assessment", "workshop"). "
\n"; workshop_print_assessment($workshop, $assessment); } @@ -240,7 +240,7 @@ } elseif ($grade > 100) { $grade = 100; } - echo "

".get_string("weightederrorcount", "workshop", intval($error + 0.5))."\n"; + echo "".get_string("weightederrorcount", "workshop", intval($error + 0.5))."\n"; break; case 3: // criteria grading @@ -493,18 +493,18 @@ } ?>

- - - + + +
\n"; - echo " \n"; + echo " \n"; echo " \n"; + echo "\n"; echo "\n"; echo " \n"; @@ -574,17 +574,17 @@ for ($i=0; $i<$workshop->nelements; $i++) { $iplus1 = $i+1; echo "\n"; - echo " \n"; - echo "\n"; + echo "\n"; echo "\n"; - echo " \n"; + echo " \n"; echo "\n"; + echo "\n"; echo "\n"; @@ -599,8 +599,8 @@ for ($i=0; $i<$workshop->nelements; $i++) { $iplus1 = $i+1; echo "\n"; - echo " \n"; - echo "\n"; + echo "\n"; if ($elements[$i]->weight == '') { // not set $elements[$i]->weight = 11; // unity @@ -615,7 +615,7 @@ echo "\n"; } echo "

". get_string("comment", "workshop").":

". get_string("comment", "workshop").":\n"; - echo " \n"; + echo " ". get_string("element","workshop")." $iplus1:\n"; echo "
cellheading2\"> 

". get_string("element","workshop")." $iplus1:

\n"; + echo " ". get_string("element","workshop")." $iplus1:\n"; echo "

". get_string("typeofscale", "workshop"). ":

". get_string("typeofscale", "workshop"). ":\n"; choose_from_menu($SCALES, "scale[]", $elements[$i]->scale, ""); if ($elements[$i]->weight == '') { // not set $elements[$i]->weight = 11; // unity } - echo "
".get_string("elementweight", "workshop").":\n"; workshop_choose_from_menu($WORKSHOP_EWEIGHTS, "weight[]", $elements[$i]->weight, ""); echo "

". get_string("element","workshop")." $iplus1:

\n"; + echo " ". get_string("element","workshop")." $iplus1:\n"; echo "

\n"; - echo "

".get_string("gradetable","workshop")."
\n"; + echo "
".get_string("gradetable","workshop")."
\n"; echo "
\n"; @@ -641,8 +641,8 @@ for ($i=0; $i<$workshop->nelements; $i++) { $iplus1 = $i+1; echo "\n"; - echo " \n"; - echo "\n"; + echo "\n"; echo "\n"; - echo " \n"; - echo "\n"; + echo "\n"; echo "\n"; - echo " \n"; - echo "\n"; + echo "\n"; } echo "\n"; @@ -737,29 +737,29 @@ } // get the teacher's assessment first if ($teachersassessment = workshop_get_submission_assessment($submission, $USER)) { - echo "

".get_string("teacherassessments", "workshop", $course->teacher)."
\n"; + echo "
".get_string("teacherassessments", "workshop", $course->teacher)."
\n"; workshop_print_assessment($workshop, $teachersassessment); } // now the student's assessment (don't allow changes) $user = get_record("user", "id", $assessment->userid); - echo "

".get_string("assessmentby", "workshop", $user->firstname." ".$user->lastname)."
\n"; + echo "
".get_string("assessmentby", "workshop", $user->firstname." ".$user->lastname)."
\n"; workshop_print_assessment($workshop, $assessment); ?> - - - - + + + +
". get_string("numberofnegativeresponses", "workshop"); echo "". get_string("suggestedgrade", "workshop")."

". get_string("criterion","workshop")." $iplus1:

\n"; + echo " ". get_string("criterion","workshop")." $iplus1:\n"; echo "
". get_string("suggestedgrade", "workshop").":\n"; choose_from_menu($numbers, "maxscore[$i]", $elements[$i]->maxscore, ""); @@ -665,8 +665,8 @@ for ($i=0; $i<$workshop->nelements; $i++) { $iplus1 = $i+1; echo "

". get_string("element","workshop")." $iplus1:

\n"; + echo " ". get_string("element","workshop")." $iplus1:\n"; echo "
".get_string("elementweight", "workshop").":\n"; workshop_choose_from_menu($WORKSHOP_EWEIGHTS, "weight[]", $elements[$i]->weight, ""); @@ -679,8 +679,8 @@ $rubrics[$i][$j] = ""; } echo "

". get_string("grade","workshop")." $j:

\n"; + echo " ". get_string("grade","workshop")." $j:\n"; echo "
\n"; - echo " \n"; + echo " \n"; echo "

". get_string("teacherscomment", "workshop").":

". get_string("teacherscomment", "workshop").":\n"; - echo "