L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-7861, fixing various xhtml strict issues and formatting

Browse Source
This commit is contained in:
toyomoyo
2007-01-03 07:29:51 +00:00
parent 3632d05e6d
commit e8e76f5a16
3 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/lesson/action/addpage.php
+2 -2
View File
@@ -138,7 +138,7 @@
echo "</td></tr>\n";
}
if ($i == 2) {
echo "<tr><td><B>".get_string("correctanswerjump", "lesson").":</b> \n";
echo "<tr><td><b>".get_string("correctanswerjump", "lesson").":</b> \n";
choose_from_menu($jump, "jumpto[$i]", LESSON_NEXTPAGE, "");
helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
if($lesson->custom) {
@@ -146,7 +146,7 @@
}
echo "</td></tr>\n";
} elseif ($i == 3) {
echo "<tr><td><B>".get_string("wronganswerjump", "lesson").":</b> \n";
echo "<tr><td><b>".get_string("wronganswerjump", "lesson").":</b> \n";
choose_from_menu($jump, "jumpto[$i]", 0, "");
helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
if($lesson->custom) {
mod/lesson/action/editpage.php
+12 -7
View File
@@ -231,7 +231,7 @@
print_textarea(false, 6, 70, 630, 300, "response[$n]", $answer->response);
}
}
echo "</td></tr>\n";
echo "wtf</td></tr>\n";
break;
case LESSON_TRUEFALSE:
case LESSON_MULTICHOICE:
@@ -302,15 +302,17 @@
helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
if($lesson->custom)
echo get_string("correctanswerscore", "lesson").": <input type=\"text\" name=\"score[$n]\" value=\"$answer->score\" size=\"5\" />";
}
echo "</td></tr>\n";
}
if ($n == 3) {
echo "<tr><td><b>".get_string("wronganswerjump", "lesson").":</b> \n";
choose_from_menu($jump, "jumpto[$n]", $answer->jumpto, "");
helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
if($lesson->custom)
echo get_string("wronganswerscore", "lesson").": <input type=\"text\" name=\"score[$n]\" value=\"$answer->score\" size=\"5\" />";
}
echo "</td></tr>\n";
echo "</td></tr>\n";
}
//echo "</td></tr>\n";
break;
case LESSON_ESSAY :
echo "<tr><td><b>".get_string("jump", "lesson").":</b> \n";
@@ -430,18 +432,21 @@
echo "<tr><td><b>".get_string("correctanswerjump", "lesson").":</b> \n";
choose_from_menu($jump, "jumpto[$i]", $answer->jumpto, "");
helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
if($lesson->custom)
if ($lesson->custom) {
echo get_string("correctanswerscore", "lesson").": <input type=\"text\" name=\"score[$i]\" value=\"$answer->score\" size=\"5\" />";
}
echo "</td></tr>\n";
}
if ($i == 3) {
echo "<tr><td><b>".get_string("wronganswerjump", "lesson").":</b> \n";
choose_from_menu($jump, "jumpto[$i]", $answer->jumpto, "");
helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
if($lesson->custom)
if ($lesson->custom) {
echo get_string("wronganswerscore", "lesson").": <input type=\"text\" name=\"score[$i]\" value=\"$answer->score\" size=\"5\" />";
}
echo "</td></tr>\n";
}
echo "</td></tr>\n";
break;
case LESSON_TRUEFALSE:
case LESSON_MULTICHOICE:
mod/lesson/view.php
+15 -11
View File
@@ -323,7 +323,6 @@
}
}
}
if ($pageid != LESSON_EOL) {
/// This is the code updates the lessontime for a timed test
if ($startlastseen = optional_param('startlastseen', '', PARAM_ALPHA)) { /// this deletes old records not totally sure if this is necessary anymore
@@ -539,6 +538,7 @@
$options = new stdClass;
$options->para = false; // no <p></p>
$options->noclean = true;
// echo "qtype is $page->qtype"; // debug
switch ($page->qtype) {
case LESSON_SHORTANSWER :
case LESSON_NUMERICAL :
@@ -549,7 +549,7 @@
}
echo '<tr><td align="center"><label for="answer">'.get_string('youranswer', 'lesson').'</label>'.
": <input type=\"text\" id=\"answer\" name=\"answer\" size=\"50\" maxlength=\"200\" $value />\n";
echo '</table>';
echo '</td></tr></table>';
print_simple_box_end();
lesson_print_submit_link(get_string('pleaseenteryouranswerinthebox', 'lesson'), 'answerform');
break;
@@ -630,14 +630,15 @@
$responses[] = trim($answer->response);
}
}
shuffle($responses);
$responses = array_unique($responses);
$responseoptions = array();
foreach ($responses as $response) {
$responseoptions[htmlspecialchars(trim($response))] = $response;
if (!empty($responses)) {
shuffle($responses);
$responses = array_unique($responses);
foreach ($responses as $response) {
$responseoptions[htmlspecialchars(trim($response))] = $response;
}
}
if (isset($USER->modattempts[$lesson->id])) {
$useranswers = explode(',', $attempt->useranswer);
$t = 0;
@@ -662,12 +663,11 @@
}
}
}
echo '</table></table>';
echo '</table></td></tr></table>';
print_simple_box_end();
lesson_print_submit_link(get_string('pleasematchtheabovepairs', 'lesson'), 'answerform');
break;
case LESSON_BRANCHTABLE :
echo '</form>';
case LESSON_BRANCHTABLE :
$options = new stdClass;
$options->para = false;
$buttons = array('next' => array(), 'prev' => array(), 'other' => array());
@@ -733,12 +733,16 @@
} else {
$value = "";
}
echo '<tr><td align="center" valign="top" nowrap><label for="answer">'.get_string("youranswer", "lesson").'</label>:</td><td>'.
echo '<tr><td align="center" valign="top" nowrap="nowrap"><label for="answer">'.get_string("youranswer", "lesson").'</label>:</td><td>'.
'<textarea id="answer" name="answer" rows="15" cols="60">'.$value."</textarea>\n";
echo '</td></tr></table>';
print_simple_box_end();
lesson_print_submit_link(get_string('pleaseenteryouranswerinthebox', 'lesson'), 'answerform');
break;
default: // close the tags MDL-7861
echo ('</table>');
print_simple_box_end();
break;
}
echo "</form>\n";
} else {