moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-7861 xhtml transient fixes for not closed input fields - I hope all of them except imported libs are now fixed

Browse source
This commit is contained in:
skodak 2007-01-08 19:34:16 +00:00
parent c0fe837eeb
commit 60af27037b
44 changed files with 197 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mod/hotpot/config.html
View file

@ -12,9 +12,9 @@
?></td>
<td><?PHP print_string("configshowtimes", "hotpot") ?></td>
</tr>
<tr valign=top>
<tr valign="top">
<td align="right"><p>hotpot_excelencodings:</p></td>
<td><input name=hotpot_excelencodings type=text size=30 value="<?PHP p($CFG->hotpot_excelencodings) ?>" /></td>
<td><input name="hotpot_excelencodings" type="text" size="30" value="<?PHP p($CFG->hotpot_excelencodings) ?>" /></td>
<td><?PHP print_string("configexcelencodings", "hotpot") ?></td>
</tr>
<tr>

28
mod/hotpot/hotpot-full.js
View file

@ -518,11 +518,11 @@ function QuizLogin(LoginPrompt) {
if (Login[0]) { // user name
var v = getCookie(self, 'UserName');
html += '<tr>'
+ '<th align="right" nowrap scope="row">' + MSG[0] + ' :</th>'
+ '<th align="right" nowrap="nowrap" scope="row">' + MSG[0] + ' :</th>'
+ '<td>'
;
if (typeof(Login[0])=='boolean') { // text box
html += '<input type=text name=UserName value="' + v + '">';
html += '<input type="text" name="UserName" value="' + v + '" />';
} else { // drop down menu of names
// pattern to match commas and white space
var comma = (window.RegExp) ? new RegExp('\\s*,\\s*') : ',';
@ -530,7 +530,7 @@ function QuizLogin(LoginPrompt) {
if (typeof(Login[0])=='string') {
Login[0] = Login[0].split(comma);
}
html += '<select name=UserName size=1>'
html += '<select name="UserName" size="1">'
+ '<option value=""></option>'
;
for(var i=0; i<Login[0].length; i++) {
@ -548,20 +548,20 @@ function QuizLogin(LoginPrompt) {
}
if (Login[1]) { // user ID
var v = getCookie(self, 'UserID');
html += '<tr><th align="right" nowrap scope="row">' + MSG[1] + ' :</th><td><input type=text name=UserID value="' + v + '"></td></tr>';
html += '<tr><th align="right" nowrap="nowrap" scope="row">' + MSG[1] + ' :</th><td><input type="text" name="UserID" value="' + v + '" /></td></tr>';
}
if (Login[2]) { // user email
var v = getCookie(self, 'UserEmail');
html += '<tr><th align="right" nowrap scope="row">' + MSG[2] +' :</th><td><input type=text name=UserEmail value="' + v + '"></td></tr>';
html += '<tr><th align="right" nowrap="nowrap" scope="row">' + MSG[2] +' :</th><td><input type="text" name="UserEmail" value="' + v + '" /></td></tr>';
}
if (Login[3]) { // quiz password
var v = getCookie(self, 'Password');
html += '<tr><th align="right" nowrap scope="row">' + MSG[3] + ' :</th><td><input type=password name=Password value="' + v + '"></td></tr>';
html += '<tr><th align="right" nowrap="nowrap" scope="row">' + MSG[3] + ' :</th><td><input type="password" name="Password" value="' + v + '" /></td></tr>';
}
if (Login[4]) { // cookie lifespan
var v = getCookie(self, 'CookieExpiry');
html += '<tr>'
+ '<th align="right" nowrap scope="row">' + MSG[4] + ' :</th>'
+ '<th align="right" nowrap="nowrap" scope="row">' + MSG[4] + ' :</th>'
+ '<td>'
+ '<select name="CookieExpiry" size=1>'
+ makeOption('session', v, MSG[7])
@ -576,8 +576,8 @@ function QuizLogin(LoginPrompt) {
html += '<tr>'
+ '<th scope="row">&nbsp;</th>'
+ '<td nowrap>'
+ '<input type=submit value="' + MSG[5] + '"> '
+ '<input type=button value="' + MSG[6] + '" onClick="opener.goBack();self.close();">'
+ '<input type="submit" value="' + MSG[5] + '" /> '
+ '<input type="button" value="' + MSG[6] + '" onClick="opener.goBack();self.close();" />'
+ '</td>'
+ '</tr>'
+ '</table></form></body></html>'
@ -856,7 +856,7 @@ function AddStudentDetailsToResultForm() {
sDetails += hpHiddenField('email', window.UserEmail);
}
if (sDetails && window.RegExp) {
// insert sDetails before '<input...Score...></input>'
// insert sDetails before '<input...Score... /></input>'
var r = new RegExp('<input[^>]*Score[^>]*><\\/input>', 'i');
var m = r.exec(ResultForm);
if (m) {
@ -1928,7 +1928,7 @@ function hpHiddenField(name, value, comma, forceHTML) {
}
field = '<field><fieldname>' + name + '</fieldname><fielddata>' + value + '</fielddata></field>';
} else {
field = '<input type=hidden name="' + name + '" value="' + value + '">';
field = '<input type=hidden name="' + name + '" value="' + value + '" />';
}
return field;
}
@ -2121,7 +2121,7 @@ function hpFeedback() {
html += '</td></tr>'
+ '<tr><th valign="top" align="right" scope="row">' + FEEDBACK[9] + ':</th>'
+ '<td><TEXTAREA name="message" rows="10" cols="40"></TEXTAREA></td></tr>'
+ '<tr><td>&nbsp;</td><td><input type="submit" value="' + FEEDBACK[6] + '">'
+ '<tr><td>&nbsp;</td><td><input type="submit" value="' + FEEDBACK[6] + '" />'
+ hpHiddenField('realname', FEEDBACK[2], ',', true)
+ hpHiddenField('email', FEEDBACK[3], ',', true)
+ hpHiddenField('subject', document.title, ',', true)
@ -2135,7 +2135,7 @@ function hpFeedback() {
var i_max = FEEDBACK[1].length;
if (i_max>1) { // several teachers
html += '<html><body>'
+ '<form action="' + FEEDBACK[0] + '" method="POST" onsubmit="this.action+=this.recipient.options[this.recipient.selectedIndex].value">'
+ '<form action="' + FEEDBACK[0] + '" method="post" onsubmit="this.action+=this.recipient.options[this.recipient.selectedIndex].value">'
+ '<table border="0">'
+ '<tr><th valign="top" align="right" scope="row">' + FEEDBACK[7] + ':</th><td>' + document.title + '</td></tr>'
+ '<tr><th valign="top" align="right" scope="row">' + FEEDBACK[8] + ': </th><td>'
@ -2146,7 +2146,7 @@ function hpFeedback() {
}
html += '</select>';
html += '</td></tr>'
+ '<tr><td>&nbsp;</td><td><input type="submit" value="' + FEEDBACK[6] + '">'
+ '<tr><td>&nbsp;</td><td><input type="submit" value="' + FEEDBACK[6] + '" />'
+ '</td></tr></table></form></body></html>'
;
} else if (i_max==1) { // one teacher

6
mod/hotpot/mod.html
View file

@ -71,7 +71,7 @@ $text_source_options = array(
"return hotpot_lockoptions('form', 'namesource', namelockitems, nameoffvalues)"
);
} else {
print '<input type="hidden" name="namesource" value="'.HOTPOT_TEXTSOURCE_SPECIFIC.'">';
print '<input type="hidden" name="namesource" value="'.HOTPOT_TEXTSOURCE_SPECIFIC.'" />';
}
print '<input type="text" name="name" size=40 value="'.$form->name.'">';
?></td>
@ -102,7 +102,7 @@ $text_source_options = array(
choose_from_menu($text_source_options, "summarysource", "$form->summarysource", "");
print '<br />';
} else {
print '<input type="hidden" name="summarysource" value="'.HOTPOT_TEXTSOURCE_SPECIFIC.'">';
print '<input type="hidden" name="summarysource" value="'.HOTPOT_TEXTSOURCE_SPECIFIC.'" />';
}
if (function_exists("print_textarea") && isset($usehtmleditor)) {
print_textarea($usehtmleditor, 10, 65, 680, 400, "summary", $form->summary);
@ -342,7 +342,7 @@ $text_source_options = array(
);
choose_from_menu($options, "displaynext", "$form->displaynext", "");
} else {
print '<input type="hidden" name="displaynext" value="'.HOTPOT_NO.'">'."\n";
print '<input type="hidden" name="displaynext" value="'.HOTPOT_NO.'" />'."\n";
}
?>
</table>

2
mod/hotpot/report.php
View file

@ -524,7 +524,7 @@ function hotpot_print_report_selector(&$course, &$hotpot, &$formdata) {
$value = $formdata[$name];
print choose_from_menu($options, $name, $value, "", "", 0, true);
};
print '<input type="submit" value="'.get_string('reportbutton', 'hotpot').'"></td></tr>';
print '<input type="submit" value="'.get_string('reportbutton', 'hotpot').'" /></td></tr>';
$menus = array();

8
mod/hotpot/report/overview/report.php
View file

@ -115,14 +115,14 @@ class hotpot_report extends hotpot_default_report {
$strdeletecheck = get_string('deleteattemptcheck','quiz');
$table->start = $this->deleteform_javascript();
$table->start .= '<form method="post" action="report.php" id="deleteform" onsubmit="'."return deletecheck('".$strdeletecheck."', 'selection')".'">'."\n";
$table->start .= '<input type="hidden" name="del" value="selection">'."\n";
$table->start .= '<input type="hidden" name="del" value="selection" />'."\n";
$table->start .= '<input type="hidden" name="id" value="'.$cm->id.'">'."\n";
$table->finish = '<center>'."\n";
$table->finish .= '<input type="submit" value="'.get_string("deleteselected").'">&nbsp;'."\n";
$table->finish .= '<input type="submit" value="'.get_string("deleteselected").'" />&nbsp;'."\n";
if ($abandoned) {
$table->finish .= '<input type=button value="'.get_string('deleteabandoned', 'hotpot').'" onClick="if(deletecheck('."'".addslashes(get_string('deleteabandonedcheck', 'hotpot', $abandoned))."', 'abandoned', true".')) getElementById(\'deleteform\').submit();">'."\n";
$table->finish .= '<input type=button value="'.get_string('deleteabandoned', 'hotpot').'" onClick="if(deletecheck('."'".addslashes(get_string('deleteabandonedcheck', 'hotpot', $abandoned))."', 'abandoned', true".')) getElementById(\'deleteform\').submit();" />'."\n";
}
$table->finish .= '<input type=button value="'.get_string("deleteall").'" onClick="if(deletecheck('."'".addslashes($strdeletecheck)."', 'all', true".'))getElementById(\'deleteform\').submit();">'."\n";
$table->finish .= '<input type=button value="'.get_string("deleteall").'" onClick="if(deletecheck('."'".addslashes($strdeletecheck)."', 'all', true".'))getElementById(\'deleteform\').submit();" />'."\n";
$table->finish .= '</center>'."\n";
$table->finish .= '</form>'."\n";
}

4
mod/hotpot/template/v6.php
View file

@ -904,7 +904,7 @@ class hotpot_xml_quiz_template extends hotpot_xml_template_default {
$a++;
}
$gap .= '<input type="text" id="Gap'.$q.'" onfocus="TrackFocus('.$q.')" onblur="LeaveGap()" class="GapBox" size="'.$gapsize.'"></input>';
$gap .= '<input type="text" id="Gap'.$q.'" onfocus="TrackFocus('.$q.')" onblur="LeaveGap()" class="GapBox" size="'.$gapsize.'" /></input>';
}
if ($includeclues) {
$clue = $this->parent->xml_value($question_record, $question."['clue'][0]['#']");
@ -1255,7 +1255,7 @@ class hotpot_xml_quiz_template extends hotpot_xml_template_default {
$question_type==HOTPOT_JQUIZ_HYBRID
) {
$str .= '<div class="ShortAnswer" id="Q_'.$q.'_SA"><form method="post" action="" onsubmit="return false;"><div>';
$str .= '<input type="text" id="Q_'.$q.'_Guess" onfocus="TrackFocus('."'".'Q_'.$q.'_Guess'."'".')" onblur="LeaveGap()" class="ShortAnswerBox" size="9"></input><br /><br />';
$str .= '<input type="text" id="Q_'.$q.'_Guess" onfocus="TrackFocus('."'".'Q_'.$q.'_Guess'."'".')" onblur="LeaveGap()" class="ShortAnswerBox" size="9" /></input><br /><br />';
$caption = $this->v6_expand_CheckCaption();
$str .= $this->v6_expand_jquiz_button($caption, "CheckShortAnswer($q)");

22
mod/hotpot/template/v6/hp6sendresults.js_
View file

@ -6,17 +6,17 @@ var UserName = '';
var StartTime = (new Date()).toLocaleString();
var ResultForm = '<html><body><form name="Results" action="[strFormMailURL]" method="post" enctype="x-www-form-encoded">';
ResultForm += '<input type="hidden" name="recipient" value="[strEMail]"></input>';
ResultForm += '<input type="hidden" name="subject" value="[strEscapedExerciseTitle]"></input>';
ResultForm += '<input type="hidden" name="Exercise" value="[strEscapedExerciseTitle]"></input>';
ResultForm += '<input type="hidden" name="realname" value=""></input>';
ResultForm += '<input type="hidden" name="Score" value=""></input>';
ResultForm += '<input type="hidden" name="Start_Time" value=""></input>';
ResultForm += '<input type="hidden" name="End_Time" value=""></input>';
ResultForm += '<input type="hidden" name="title" value="Thanks!"></input>';
[inclPageBGColor]ResultForm += '<input type="hidden" name="bgcolor" value="[strPageBGColor]"></input>';[/inclPageBGColor]
ResultForm += '<input type="hidden" name="text_color" value="[strTitleColor]"></input>';
ResultForm += '<input type="hidden" name="sort" value="order:realname,Exercise,Score,Start_Time,End_Time"></input>';
ResultForm += '<input type="hidden" name="recipient" value="[strEMail]" /></input>';
ResultForm += '<input type="hidden" name="subject" value="[strEscapedExerciseTitle]" /></input>';
ResultForm += '<input type="hidden" name="Exercise" value="[strEscapedExerciseTitle]" /></input>';
ResultForm += '<input type="hidden" name="realname" value="" /></input>';
ResultForm += '<input type="hidden" name="Score" value="" /></input>';
ResultForm += '<input type="hidden" name="Start_Time" value="" /></input>';
ResultForm += '<input type="hidden" name="End_Time" value="" /></input>';
ResultForm += '<input type="hidden" name="title" value="Thanks!" /></input>';
[inclPageBGColor]ResultForm += '<input type="hidden" name="bgcolor" value="[strPageBGColor]" /></input>';[/inclPageBGColor]
ResultForm += '<input type="hidden" name="text_color" value="[strTitleColor]" /></input>';
ResultForm += '<input type="hidden" name="sort" value="order:realname,Exercise,Score,Start_Time,End_Time" /></input>';
ResultForm += '</form></body></html>';
function GetUserName(){

2
mod/hotpot/template/v6/jcross6.js_
View file

@ -19,7 +19,7 @@ var Locked = false;
var TimeOver = false;
var InputStuff = '<form method="post" action="" onsubmit="return false;"><span class="ClueNum">[strClueNum]: </span>';
InputStuff += '[strClue] <input onfocus="CurrentBox=this;InTextBox=true;" onblur="InTextBox=false;" id="[strBoxId]" type="edit" size="[strEditSize]" maxlength="[strMaxLength]"></input>';
InputStuff += '[strClue] <input onfocus="CurrentBox=this;InTextBox=true;" onblur="InTextBox=false;" id="[strBoxId]" type="edit" size="[strEditSize]" maxlength="[strMaxLength]" /></input>';
InputStuff += '<button class="FuncButton" onfocus="FuncBtnOver(this)" onblur="FuncBtnOut(this)" onmouseover="FuncBtnOver(this)" onmouseout="FuncBtnOut(this)" onmousedown="FuncBtnDown(this)" onmouseup="FuncBtnOut(this)" onclick="EnterGuess([strParams])">[strEnterCaption]</button>';
InputStuff += '[inclHint]<button class="FuncButton" onfocus="FuncBtnOver(this)" onblur="FuncBtnOut(this)" onmouseover="FuncBtnOver(this)" onmouseout="FuncBtnOut(this)" onmousedown="FuncBtnDown(this)" onmouseup="FuncBtnOut(this)" onclick="ShowHint([strParams])">[strHintCaption]</button>[/inclHint]';
InputStuff += '</form>';

4
mod/hotpot/view.php
View file

@ -80,8 +80,8 @@
print '<div align="center">';
print get_string('requirepasswordmessage', 'quiz').'<br /><br />';
print '<b>'.get_string('password').':</b> ';
print '<input name="hppassword" type="password" value=""> ';
print '<input type="submit" value="'.get_string("ok").'"> ';
print '<input name="hppassword" type="password" value="" /> ';
print '<input type="submit" value="'.get_string("ok").'" /> ';
print "</div>\n";
print_simple_box_end();
print "</form>\n";