From 2a488ba5537442d7a569e4d241f270f5deb201c6 Mon Sep 17 00:00:00 2001 From: moodler Date: Thu, 4 Nov 2004 09:24:51 +0000 Subject: [PATCH] Some XHTML compatibility changes --- mod/lesson/locallib.php | 6 +- mod/lesson/mod.html | 120 ++++++++++++------------- mod/lesson/view.php | 191 ++++++++++++++++++++-------------------- 3 files changed, 160 insertions(+), 157 deletions(-) diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php index 948f3b16ef..c216efd66f 100644 --- a/mod/lesson/locallib.php +++ b/mod/lesson/locallib.php @@ -914,14 +914,14 @@ function lesson_print_tree_link_menu($page, $id, $showpages=false) { $output = ""; $close = false; $title=$page->title; //CDC Chris Berri took out parsing of title in left menu on 6/11 - $link="id=$id&action=navigation&pageid=".$page->id; + $link="id=$id&action=navigation&pageid=".$page->id; if($page->id == $_REQUEST['pageid']) { $close=true; $output.=""; } - $output .= "
  • id\">".$title."
    • \n"; + $output .= "
  • id\">".$title."
    • \n"; if($close) { $output.="    "; @@ -1131,4 +1131,4 @@ function lesson_check_nickname($name) { } /// CDC-FLAG /// -?> \ No newline at end of file +?> diff --git a/mod/lesson/mod.html b/mod/lesson/mod.html index d8e405f7e0..9564959353 100644 --- a/mod/lesson/mod.html +++ b/mod/lesson/mod.html @@ -1,7 +1,7 @@ dirroot/mod/lesson/locallib.php"); // for parameter array if ($form->mode == "add") { if ($defaults = get_record("lesson_default", "course", $form->course)) { @@ -110,17 +110,17 @@ if ($form->mode == "add") {
    - - - +

    :

    + + - + - + - + - + - - + + - + - + - - + + - - + + - + - + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - + - + mode == "add") {
    : - +

    :

    		: mode == "add") {

    :

    		: mode == "add") {

    :

    		: mode == "add") {

    :

    		: - +

    :

    : =0; $i--) { @@ -176,7 +176,7 @@ if ($form->mode == "add") {

    :

    		: mode == "add") {

    :

    		: - ongoing, ""); helpbutton("ongoing", get_string("ongoing", "lesson"), "lesson"); @@ -198,8 +198,8 @@ if ($form->mode == "add") {

    :

    : 1; $i--) { @@ -211,8 +211,8 @@ if ($form->mode == "add") {

    :

    : mode == "add") {

    :

    		: - review, ""); helpbutton("review", get_string("displayreview", "lesson"), "lesson"); @@ -239,17 +239,17 @@ if ($form->mode == "add") {

    :

    		: - nextpagedefault, ""); helpbutton("nextpageaction", get_string("actionaftercorrectanswer", "lesson"), "lesson"); ?>

    :

    : mode == "add") {

    :

    : mode == "add") {

    :

    		: mode == "add") {

    :

    		: - +

    student) ?>:

    		student) ?>: mode == "add") {

    :

    		: mode == "add") {

    :

    		: mode == "add") {

    :

    		: mode == "add") {

    :

    		: - px + px

    :

    		: - px + px

    :

    		: - +

    :

    		: mode == "add") {

    :

    		: mode == "add") {

    :

    		: - +

    :

    : available); echo " - "; @@ -407,8 +407,8 @@ if ($form->mode == "add") { ?>

    :

    : deadline); echo " - "; @@ -417,7 +417,7 @@ if ($form->mode == "add") {

    :

    		: mode == "add") { if ($form->mode != "add") { ?>

    :

    		: - + - +
    - - - - - - - -"> + + + + + + + +" />
    diff --git a/mod/lesson/view.php b/mod/lesson/view.php index c250552d1c..ed3b74ecdc 100644 --- a/mod/lesson/view.php +++ b/mod/lesson/view.php @@ -5,7 +5,6 @@ require_once('../../config.php'); require_once('locallib.php'); - require_once('styles.php'); require_once('lib.php'); require_variable($id); // Course Module ID @@ -41,8 +40,9 @@ $action = 'teacherview'; } elseif (time() < $lesson->available) { print_header($course->shortname .': '. $lesson->name, $course->fullname, - $navigation .'id .'>'. $strlessons .' -> '. $lesson->name .'', - '', '', true, '', navmenu($course, $cm)); + $navigation .''. $strlessons .' -> '. $lesson->name .'', '', + "", true, + '', navmenu($course, $cm)); print_simple_box_start('center'); echo '
    '; echo get_string('lessonopen', 'lesson', userdate($lesson->available)).'
    '; @@ -53,8 +53,9 @@ exit(); } elseif (time() > $lesson->deadline) { print_header($course->shortname .': '. $lesson->name, $course->fullname, - "$navigation id>$strlessons -> id\">$lesson->name", - '', '', true, '', navmenu($course, $cm)); + "$navigation id\">$strlessons -> id\">$lesson->name", '', + "", true, + '', navmenu($course, $cm)); print_simple_box_start('center'); echo '
    '; echo get_string('lessonclosed', 'lesson', userdate($lesson->deadline)) .'
    '; @@ -91,8 +92,9 @@ } print_header($course->shortname .': '. $lesson->name, $course->fullname, - "$navigation id>$strlessons -> id\">$lesson->name", - '', '', true, $button, // took out update_module_button($cm->id, $course->id, $strlesson) and replaced it with $button + "$navigation id\">$strlessons -> id\">$lesson->name", '', + "", true, + $button, // took out update_module_button($cm->id, $course->id, $strlesson) and replaced it with $button navmenu($course, $cm)); // set up some general variables @@ -103,7 +105,7 @@ } else { $pixpath = $path .'/../theme/'. $CFG->theme .'/pix'; } - + /************** navigation **************************************/ if ($action == 'navigation') { //CDC Chris Berri added this echo call for left menu. must match that in lesson.php for styles @@ -112,9 +114,9 @@ if($page = get_record_select('lesson_pages', 'lessonid = '. $lesson->id .' AND prevpageid = 0')) { // print the pages echo '
    '; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; echo "
    cellheading\">"; echo "
    '; echo "
    ".get_string('lessonmenu', 'lesson') .'
    "; @@ -145,18 +147,18 @@ if (!$correctpass) { print_simple_box_start('center'); echo '' . "\n"; - echo '' . "\n"; - echo '' . "\n"; + echo '' . "\n"; + echo '' . "\n"; echo ''; if (isset($_POST['userpassword'])) { echo "'; } echo ''; - echo ''; + echo ''; echo '
    ".get_string('loginfail', 'lesson') .'
    '. get_string('passwordprotectedlesson', 'lesson', $lesson->name) .'
    '. get_string('enterpassword', 'lesson').'
    '. get_string('enterpassword', 'lesson').'
    '; - echo ' '; - echo ''; + echo ' '; + echo ''; echo '
    '; print_simple_box_end(); exit(); @@ -246,13 +248,13 @@ if ($lesson->timed) { if ($lesson->retake) { echo '' . "\n"; - echo '' . "\n"; - echo '' . "\n"; - echo '' . "\n"; - echo '' . "\n"; /// CDC-FLAG added this line + echo '' . "\n"; + echo '' . "\n"; + echo '' . "\n"; + echo '' . "\n"; /// CDC-FLAG added this line print_simple_box('

    '. get_string('leftduringtimed', 'lesson') .'

    ', 'center'); echo '

    \n"; /// CDC-FLAG added document.queryform.startlastseen.value='yes' + "\" onclick=\"document.queryform.pageid.value='$firstpageid';document.queryform.startlastseen.value='no';document.queryform.submit();\" />

    \n"; /// CDC-FLAG added document.queryform.startlastseen.value='yes' echo '' . "\n"; echo '';///CDC Chris Berri added close div tag } else { @@ -263,17 +265,18 @@ echo ''; print_simple_box_end(); } + } else { echo "
    \n"; - echo "id\">\n"; - echo "\n"; - echo "\n"; - echo "\n"; /// CDC-FLAG added this line + echo "id\" />\n"; + echo "\n"; + echo "\n"; + echo "\n"; /// CDC-FLAG added this line print_simple_box("

    ".get_string('youhaveseen','lesson').'

    ', "center"); echo "

       

    \n"; /// CDC-FLAG added document.queryform.startlastseen.value='yes' + "\" onclick=\"document.queryform.pageid.value='$lastpageseen';document.queryform.startlastseen.value='yes';document.queryform.submit();\" />   

    \n"; /// CDC-FLAG added document.queryform.startlastseen.value='yes' echo "
    \n"; echo "";///CDC Chris Berri added close div tag } print_footer($course); @@ -404,7 +407,7 @@ print_simple_box_end(); echo "



    "; } else { - redirect("view.php?id=$cm->id&action=navigation&pageid=".LESSON_EOL."&outoftime=normal", get_string("outoftime", "lesson")); + redirect("view.php?id=$cm->id&action=navigation&pageid=".LESSON_EOL."&outoftime=normal", get_string("outoftime", "lesson")); } // update clock when viewing a new page... no special treatment if ((($timer->starttime + $lesson->maxtime * 60) - time()) < 60) { @@ -458,7 +461,7 @@ } else { $nextpageid = $page->nextpageid; } - redirect("view.php?id=$cm->id&action=navigation&pageid=$nextpageid", get_string('endofclustertitle', 'lesson')); + redirect("view.php?id=$cm->id&action=navigation&pageid=$nextpageid", get_string('endofclustertitle', 'lesson')); } /// CDC-FLAG /// @@ -582,9 +585,9 @@ // get the answers in a set order, the id order if ($answers = get_records("lesson_answers", "pageid", $page->id, "id")) { echo "
    "; - echo "id\">"; - echo ""; - echo ""; + echo "id\" />"; + echo ""; + echo ""; /// CDC-FLAG /// if (!$lesson->slideshow || $page->qtype != 20) { print_simple_box_start("center"); @@ -600,12 +603,12 @@ $value = ""; } echo "
    ".get_string("youranswer", "lesson"). - ": \n"; //CDC hidden label added. + ": \n"; //CDC hidden label added. echo '
    '; print_simple_box_end(); if (!$lesson->slideshow) { echo "

    \n"; + get_string("pleaseenteryouranswerinthebox", "lesson")."\" />

    \n"; } break; case LESSON_TRUEFALSE : @@ -617,7 +620,7 @@ } else { $checked = ""; } - echo "id}\" $checked>"; //CDC hidden label added. + echo "id}\" $checked />"; //CDC hidden label added. echo ""; $options->para = false; // no

    echo format_text(trim($answer->answer), FORMAT_MOODLE, $options); @@ -630,7 +633,7 @@ print_simple_box_end(); if (!$lesson->slideshow) { echo "

    \n"; + get_string("pleasecheckoneanswer", "lesson")."\" />

    \n"; } break; case LESSON_MULTICHOICE : @@ -649,7 +652,7 @@ } } // more than one answer allowed - echo "id}\" $checked>"; //CDC hidden label added. + echo "id}\" $checked />"; //CDC hidden label added. } else { if (isset($USER->modattempts[$lesson->id]) && $answer->id == $attempt->answerid) { $checked = "CHECKED"; @@ -657,7 +660,7 @@ $checked = ""; } // only one answer allowed - echo "id}\" $checked>"; //CDC hidden label added. + echo "id}\" $checked />"; //CDC hidden label added. } echo ""; $options->para = false; // no

    @@ -674,10 +677,10 @@ if (!$lesson->slideshow) { if ($page->qoption) { echo "

    \n"; + get_string("pleasecheckoneormoreanswers", "lesson")."\" />

    \n"; } else { echo "

    \n"; + get_string("pleasecheckoneanswer", "lesson")."\" />

    \n"; } } /// CDC-FLAG /// @@ -731,21 +734,21 @@ print_simple_box_end(); if (!$lesson->slideshow) { echo "

    \n"; + get_string("pleasematchtheabovepairs", "lesson")."\" />

    \n"; } break; /// CDC-FLAG /// case LESSON_BRANCHTABLE : echo ""; - echo ""; + echo ""; // don't suffle answers /// CDC-FLAG /// if(!$lesson->slideshow) { foreach ($answers as $answer) { echo ""; } } @@ -767,7 +770,7 @@ print_simple_box_end(); if (!$lesson->slideshow) { echo "

    \n"; + get_string("pleaseenteryouranswerinthebox", "lesson")."\" />

    \n"; } break; } @@ -779,8 +782,8 @@ } else { // a page without answers - find the next (logical) page echo "\n"; - echo "id\">\n"; - echo "\n"; + echo "id\" />\n"; + echo "\n"; if ($lesson->nextpagedefault) { // in Flash Card mode... // ...first get number of retakes @@ -825,9 +828,9 @@ $newpageid = LESSON_EOL; } } - echo "\n"; + echo "\n"; echo "

    \n"; + get_string("continue", "lesson")."\" />

    \n"; echo "\n"; } echo "
    "; echo "answer\""; - echo "onclick=\"document.answerform.jumpto.value=$answer->jumpto;document.answerform.submit();\">"; + echo "onclick=\"document.answerform.jumpto.value=$answer->jumpto;document.answerform.submit();\" />"; echo "
    \n"; @@ -1020,11 +1023,11 @@ echo "

    "; if (!$grades = get_records_select("lesson_grades", "lessonid = $lesson->id", "completed")) { echo get_string("youmadehighscore", "lesson", $lesson->maxhighscores)."
    "; - echo "id&action=nameforhighscores\">".get_string("clicktopost", "lesson")."
    "; + echo "id&action=nameforhighscores\">".get_string("clicktopost", "lesson")."
    "; } else { if (!$highscores = get_records_select("lesson_high_scores", "lessonid = $lesson->id")) { echo get_string("youmadehighscore", "lesson", $lesson->maxhighsores)."
    "; - echo "id&action=nameforhighscores\">".get_string("clicktopost", "lesson")."
    "; + echo "id&action=nameforhighscores\">".get_string("clicktopost", "lesson")."
    "; } else { // get all the high scores into an array foreach ($highscores as $highscore) { @@ -1037,13 +1040,13 @@ if ($thegrade >= $lowscore || count($topscores) <= $lesson->maxhighscores) { echo get_string("youmadehighscore", "lesson", $lesson->maxhighscores)."
    "; - echo "id&action=nameforhighscores\">".get_string("clicktopost", "lesson")."
    "; + echo "id&action=nameforhighscores\">".get_string("clicktopost", "lesson")."
    "; } else { echo get_string("nothighscore", "lesson", $lesson->maxhighscores)."
    "; } } } - echo "
    id&action=highscores&link=1\">".get_string("viewhighscores", "lesson").""; + echo "
    id&action=highscores&link=1\">".get_string("viewhighscores", "lesson").""; echo "
    "; } /// CDC-FLAG /// @@ -1060,7 +1063,7 @@ $lastattempt = end($attempts); $USER->modattempts[$lesson->id] = $lastattempt->pageid; echo "
    id\">"; - echo ""; + echo ""; echo "
    "; echo "

    ".get_string("reviewlesson", "lesson")."

    \n"; } elseif ($lesson->modattempts && isteacher($course->id)) { @@ -1084,28 +1087,28 @@ case LESSON_SHORTANSWER : case LESSON_NUMERICAL : echo "

    \n"; + get_string("pleaseenteryouranswerinthebox", "lesson")."\" />

    \n"; break; case LESSON_TRUEFALSE : echo "

    \n"; + get_string("pleasecheckoneanswer", "lesson")."\" />

    \n"; break; case LESSON_MULTICHOICE : if ($page->qoption) { echo "

    \n"; + get_string("pleasecheckoneormoreanswers", "lesson")."\" />

    \n"; } else { echo "

    \n"; + get_string("pleasecheckoneanswer", "lesson")."\" />

    \n"; } break; case LESSON_MATCHING : echo "

    \n"; + get_string("pleasematchtheabovepairs", "lesson")."\" />

    \n"; break; case LESSON_ESSAY : echo "

    \n"; + get_string("pleaseenteryouranswerinthebox", "lesson")."\" />

    \n"; break; case LESSON_BRANCHTABLE : if (!empty($answers)) { @@ -1125,19 +1128,19 @@ foreach ($nextprevious as $jump) { if ($jump->jumpto == LESSON_PREVIOUSPAGE) { echo "jumpto;document.answerform.submit();\"". - "value = \"$jump->answer\">"; + "value = \"$jump->answer\" />"; } } echo ""; foreach ($otherjumps as $otherjump) { echo ""; + "value = \"$otherjump->answer\" />"; } echo "
    jumpto;document.answerform.submit();\"". - "value = \"$otherjump->answer\">
    "; foreach ($nextprevious as $jump) { if ($jump->jumpto == LESSON_NEXTPAGE) { echo "jumpto;document.answerform.submit();\"". - "value = \"$jump->answer\">"; + "value = \"$jump->answer\" />"; } } echo ""; @@ -1146,17 +1149,17 @@ foreach ($nextprevious as $jump) { if ($jump->jumpto == LESSON_NEXTPAGE) { echo "jumpto;document.answerform.submit();\"". - "value = \"$jump->answer\">"; + "value = \"$jump->answer\" />"; } } foreach ($otherjumps as $otherjump) { echo "jumpto;document.answerform.submit();\"". - "value = \"$otherjump->answer\">"; + "value = \"$otherjump->answer\" />"; } foreach ($nextprevious as $jump) { if ($jump->jumpto == LESSON_PREVIOUSPAGE) { echo "jumpto;document.answerform.submit();\"". - "value = \"$jump->answer\">"; + "value = \"$jump->answer\" />"; } } } @@ -1225,7 +1228,7 @@ // get only the attempts that are in response to essay questions $essaypageids = implode(",", array_keys($essaypages)); // all the pageids in comma seperated list if ($essayattempts = get_records_select("lesson_attempts", "lessonid = $lesson->id AND pageid IN($essaypageids)")) { - echo "
    "; + echo "
    "; } } /// CDC-FLAG /// tree code - in final release, will use lang file for all text output. @@ -1291,7 +1294,7 @@ get_string("importquestions", "lesson")." | ". "id&action=addcluster&pageid=0\">". get_string("addcluster", "lesson")." | ". - "id&action=addbranchtable&pageid=0\">". + "id&action=addbranchtable&pageid=0\">". get_string("addabranchtable", "lesson")." | ". "id&action=addpage&pageid=0\">". get_string("addaquestionpage", "lesson")." ".get_string("here","lesson"). @@ -1312,8 +1315,8 @@ "\"edit\"\n". "id&action=confirmdelete&pageid=$page->id\">\n". "\"delete\"\n"; - } - echo "\n"; + } + echo "\n"; echo "\n"; print_simple_box(format_text($page->contents), "center"); echo "\n"; @@ -1351,7 +1354,7 @@ echo get_string("endofbranch", "lesson"); break; } - echo "\n"; + echo "\n"; $i = 1; $n = 0; foreach ($answers as $answer) { @@ -1497,11 +1500,11 @@ echo get_string("checkquestion", "lesson"); } echo "\" onclick=\"document.lessonpages.pageid.value=$page->id;". - "document.lessonpages.submit();\">"; + "document.lessonpages.submit();\" />"; } echo " \n"; } - echo "\n"; + echo "\n"; if (isteacheredit($course->id)) { /// CDC-FLAG /// 6/16/04 echo "id&pageid=$page->id\">". @@ -1526,7 +1529,7 @@ get_string("addaquestionpage", "lesson")." ".get_string("here","lesson"). "\n"; } - echo "\n"; +// echo "\n"; // check the prev links - fix (silently) if necessary - there was a bug in // versions 1 and 2 when add new pages. Not serious then as the backwards // links were not used in those versions @@ -1557,7 +1560,7 @@ } } /// CDC-FLAG /// end of else from above tree code!!! - echo "\n"; + echo "\n"; /// CDC-FLAG /// // NoticeFix both viewAll's if(isset($_GET['display']) && !isset($_GET['viewAll'])) { @@ -1638,16 +1641,16 @@ $style = "style='color:#999999;'"; } // link for each essay - $essaylinks[] = "id&action=essaygrade&attemptid=$essay->id\">".$pages[$essay->pageid]->title.""; + $essaylinks[] = "id&action=essaygrade&attemptid=$essay->id\">".$pages[$essay->pageid]->title.""; } } // email link for this user - $emaillink = "id&action=emailessay&userid=".$id."\">".get_string("emailgradedessays", "lesson").""; + $emaillink = "id&action=emailessay&userid=".$id."\">".get_string("emailgradedessays", "lesson").""; $table->data[] = array($studentname, implode(", ", $essaylinks), $emaillink); } // email link for all users - $emailalllink = "id&action=emailessay\">".get_string("emailallgradedessays", "lesson").""; + $emailalllink = "id&action=emailessay\">".get_string("emailallgradedessays", "lesson").""; $table->data[] = array(" ", " ", $emailalllink); @@ -1675,9 +1678,9 @@ echo "
    \n"; - echo "id\">\n"; - echo "\n"; - echo "\n"; + echo "id\" />\n"; + echo "\n"; + echo "\n"; // all tables will have these $table->align = array("left"); @@ -1719,10 +1722,10 @@ echo "
    "; echo "
    "; echo ""; + "document.essaygrade.submit();\" />"; echo ""; echo ""; + "document.essaygrade.submit();\" />"; echo "
    "; echo "
    "; @@ -1765,10 +1768,10 @@ $essay->useranswer = serialize($essayinfo); if(update_record("lesson_attempts", $essay) && update_record("lesson_grades", $updategrade)) { - redirect("view.php?id=$cm->id&action=essayview", get_string("updatesuccess", "lesson")); + redirect("view.php?id=$cm->id&action=essayview", get_string("updatesuccess", "lesson")); } else { echo get_string("updatefailed", "lesson")."!
    "; - echo "id&action=essayview\">".get_string("continue", "lesson").""; + echo "id&action=essayview\">".get_string("continue", "lesson").""; exit(); } } @@ -1840,13 +1843,13 @@ update_record("lesson_attempts", $essay); } else { echo "Email Failed!
    "; - echo "id&action=essayview\">".get_string("continue", "lesson").""; + echo "id&action=essayview\">".get_string("continue", "lesson").""; echo "
    "; exit(); } } } - redirect("view.php?id=$cm->id&action=essayview", get_string("emailsuccess", "lesson")); + redirect("view.php?id=$cm->id&action=essayview", get_string("emailsuccess", "lesson")); } /*******************high scores **************************************/ @@ -1893,7 +1896,7 @@ if (isset($_GET['link'])) { echo "
    id\">".get_string("returntocourse", "lesson").""; } else { - echo "
    id\">".get_string("cancel", "lesson")." | id&action=navigation\">".get_string("startlesson", "lesson").""; + echo "
    id\">".get_string("cancel", "lesson")." | id&action=navigation\">".get_string("startlesson", "lesson").""; } echo "
    "; @@ -1920,7 +1923,7 @@ if ($pasthighscore = get_record_select("lesson_high_scores", "lessonid = $lesson->id and userid = $USER->id")) { $pastgrade = $grades[$pasthighscore->gradeid]->grade; if ($pastgrade >= $newgrade->grade) { - redirect("view.php?id=$cm->id&action=highscores&link=1", "Update Successful"); + redirect("view.php?id=$cm->id&action=highscores&link=1", "Update Successful"); } else { // delete old and find out where new one goes if (!delete_records("lesson_high_scores", "id", $pasthighscore->id)) { @@ -1971,7 +1974,7 @@ error("Insert of new high score Failed!"); } - redirect("view.php?id=$cm->id&action=highscores&link=1", get_string("postsuccess", "lesson")); + redirect("view.php?id=$cm->id&action=highscores&link=1", get_string("postsuccess", "lesson")); echo "
    "; } /*******************name for highscores **************************************/ @@ -1980,18 +1983,18 @@ echo "
    "; if (isset($_POST['name'])) { if (lesson_check_nickname(trim($_POST['name']))) { - redirect("view.php?id=$cm->id&action=updatehighscores&name=".trim($_POST['name']), get_string("nameapproved", "lesson")); + redirect("view.php?id=$cm->id&action=updatehighscores&name=".trim($_POST['name']), get_string("nameapproved", "lesson")); } else { echo get_string("namereject", "lesson")."

    "; } } echo "
    "; - echo "id\">"; - echo ""; + echo "id\" />"; + echo ""; - echo get_string("entername", "lesson").":
    "; - echo ""; + echo get_string("entername", "lesson").":
    "; + echo ""; echo "
    "; echo "
    "; } -- 2.39.5