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

Changes for XHTML and accessibility compatibility

Browse Source
This commit is contained in:
moodler
2004-11-26 09:33:02 +00:00
parent caf261b0c3
commit b64dab0e5d
7 changed files with 163 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/wiki/ewiki/ewiki.php
+5 -5
View File
@@ -1086,7 +1086,7 @@ function ewiki_page_search($id, &$data, $action) {
if (! ($q = @$_REQUEST["q"])) {
$o .= '<form action="' . ewiki_script("", $id) . '" method="POST">';
$o .= '<form action="' . ewiki_script("", $id) . '" method="post">';
$o .= '<input name="q" size="30" /><br /><br />';
$o .= '<input type="submit" value="'.$id.'" />';
$o .= '</form>';
@@ -1523,7 +1523,7 @@ function ewiki_page_edit_form(&$id, &$data, &$hidden_postdata) {
#-- edit textarea/form
$o .= ewiki_t("EDIT_FORM_1")
. '<form method="POST" enctype="multipart/form-data" action="'
. '<form method="post" enctype="multipart/form-data" action="'
. ewiki_script("edit", $id) . '" name="ewiki"'
. ' accept-charset="'.EWIKI_CHARSET.'">' . "\n";
@@ -1590,10 +1590,10 @@ function ewiki_page_edit_form_final_imgupload(&$o, &$id, &$data, &$action) {
$o .= "\n<br />\n". '<div class="image-upload">'
. '<form action='
. '"'. ewiki_script_binary("", EWIKI_IDF_INTERNAL, "", "_UPLOAD=1") .'"'
. ' method="POST" enctype="multipart/form-data" target="_upload">'
. ' method="post" enctype="multipart/form-data" target="_upload">'
. '<input type="hidden" name="MAX_FILE_SIZE" value="'.EWIKI_IMAGE_MAXSIZE.'" />'
. '<input type="file" name="'.EWIKI_UP_UPLOAD.'"'
. (defined("EWIKI_IMAGE_ACCEPT") ? ' accept="'.EWIKI_IMAGE_ACCEPT.'" />' : "")
. (defined("EWIKI_IMAGE_ACCEPT") ? ' accept="'.EWIKI_IMAGE_ACCEPT.'" />' : " />")
. '<input type="hidden" name="'.EWIKI_UP_BINARY.'" value="'.EWIKI_IDF_INTERNAL.'" />'
. '&nbsp;&nbsp;&nbsp;'
. '<input type="submit" value="'.ewiki_t("UPLOAD_PICTURE_BUTTON").'" />'
@@ -1634,7 +1634,7 @@ function ewiki_control_links($id, &$data, $action) {
if (@$data["forced_version"]) {
$o .= '<form action="' . ewiki_script("edit", $id) . '" method="POST">' .
$o .= '<form action="' . ewiki_script("edit", $id) . '" method="post">' .
'<input type="hidden" name="edit" value="old" />' .
'<input type="hidden" name="version" value="'.$data["forced_version"].'" />' .
'<input type="submit" value="' . ewiki_t("OLDVERCOMEBACK") . '" /></form> ';
mod/wiki/mod.html
+68 -68
View File
@@ -65,27 +65,27 @@
}
?>
<FORM name="form" method="post" action="<?php echo $ME ?>">
<CENTER>
<TABLE cellpadding=5>
<TR valign=top>
<TD align=right><P><B><?php print_string('name') ?>:</B></P></TD>
<TD>
<INPUT type="text" name="name" size=30 value="<?php p($form->name) ?>" />
</TD>
</TR>
<TR valign=top>
<TD align=right><P><B><?php print_string('summary') ?>:</B></P></TD>
<TD>
<form name="form" method="post" action="<?php echo $ME ?>">
<center>
<table cellpadding="5">
<tr valign="top">
<td align="right"><b><?php print_string('name') ?>:</b></td>
<td>
<input type="text" name="name" size="30" value="<?php p($form->name) ?>" alt="<?php print_string('name') ?>" />
</td>
</tr>
<tr valign="top">
<td align="right"><b><?php print_string('summary') ?>:</b></td>
<td>
<?php print_textarea($usehtmleditor, 5, 60, 680, 400, "summary", $form->summary); ?>
</TD>
</TR>
</td>
</tr>
<tr valign=top>
<TD align=right><P>
<tr valign="top">
<td align="right">
<?php helpbutton('wikitype', get_string('wikitype', 'wiki'), 'wiki'); ?>
<B><?php print_string('wikitype', "wiki") ?>:</B></P></TD>
<TD>
<b><?php print_string('wikitype', "wiki") ?>:</b></td>
<td>
<?php
if ($wikihasentries) {
echo $WIKI_TYPES[$form->wtype];
@@ -94,46 +94,46 @@
choose_from_menu($WIKI_TYPES, 'wtype', $form->wtype, "");
}
?>
</TD>
</td>
</tr>
<TR valign=top>
<TD align=right><P><B><?php print_string('ewikiprinttitle', 'wiki') ?>:</B></P></TD>
<TD>
<tr valign="top">
<td align="right"><b><?php print_string('ewikiprinttitle', 'wiki') ?>:</b></td>
<td>
<select size="1" name="ewikiprinttitle">
<option value="1" <?php if ( $form->ewikiprinttitle) { echo 'selected'; }?>><?php print_string('yes') ?></option>
<option value="0" <?php if ( !$form->ewikiprinttitle) { echo 'selected'; }?>><?php print_string('no') ?></option>
<option value="1" <?php if ( $form->ewikiprinttitle) { echo 'selected="selected"'; }?>><?php print_string('yes') ?></option>
<option value="0" <?php if ( !$form->ewikiprinttitle) { echo 'selected="selected"'; }?>><?php print_string('no') ?></option>
</select>
</TD>
</TR>
<TR valign=top>
<TD align=right><P>
</td>
</tr>
<tr valign="top">
<td align="right">
<?php helpbutton('htmlmode', get_string('htmlmode', 'wiki'), 'wiki'); ?>
<B><?php print_string('htmlmode', 'wiki') ?>:</B></P></TD>
<TD>
<b><?php print_string('htmlmode', 'wiki') ?>:</b></td>
<td>
<?php
$htmlmodes=array( "0" => get_string("nohtml","wiki") , "1" => get_string("safehtml","wiki"), "2" => get_string("htmlonly","wiki"));
choose_from_menu($htmlmodes, "htmlmode", $form->htmlmode, "");
?>
</TD>
</TR>
<TR valign=top>
<TD align=right><P>
</td>
</tr>
<tr valign="top">
<td align="right">
<?php helpbutton('ewikiacceptbinary', get_string('ewikiacceptbinary', 'wiki'), 'wiki') ?>
<B><?php print_string('ewikiacceptbinary', 'wiki') ?>:</B></P></TD>
<TD>
<b><?php print_string('ewikiacceptbinary', 'wiki') ?>:</b></td>
<td>
<select size="1" name="ewikiacceptbinary">
<option value="1" <?php if ( $form->ewikiacceptbinary) { echo 'selected'; }?>><?php print_string('yes') ?></option>
<option value="0" <?php if ( !$form->ewikiacceptbinary) { echo 'selected'; }?>><?php print_string('no') ?></option>
<option value="1" <?php if ( $form->ewikiacceptbinary) { echo 'selected="selected"'; }?>><?php print_string('yes') ?></option>
<option value="0" <?php if ( !$form->ewikiacceptbinary) { echo 'selected="selected"'; }?>><?php print_string('no') ?></option>
</select>
</TD>
</TR>
</td>
</tr>
<tr valign="top">
<td align="right">
<?php helpbutton('wikilinkoptions', get_string('wikilinkoptions', 'wiki'), 'wiki') ?>
<b> <?php print_string('wikilinkoptions', 'wiki') ?>:</b></td>
<td>
<input type="checkbox" name="disablecamelcase" value="1" <?php echo $form->disablecamelcase?"CHECKED":""; ?> />
<input type="checkbox" name="disablecamelcase" value="1" <?php echo $form->disablecamelcase?"CHECKED":""; ?> alt="<?php print_string('disablecamel', 'wiki') ?>" />
<?php print_string('disablecamel', 'wiki') ?><br />
</td>
</tr>
@@ -145,15 +145,15 @@
<td>
<table cellpadding="0" cellspacing="0" border="0" width="100%"><tr>
<td width="50%">
<input type="checkbox" name="setpageflags" value="1" <?php echo $form->setpageflags?"CHECKED":""; ?> />
<input type="checkbox" name="setpageflags" value="1" <?php echo $form->setpageflags?"CHECKED":""; ?> alt="<?php print_string('allowsetpage', 'wiki') ?>" />
<?php print_string('allowsetpage', 'wiki') ?><br />
<input type="checkbox" name="strippages" value="1" <?php echo $form->strippages?"CHECKED":""; ?> />
<input type="checkbox" name="strippages" value="1" <?php echo $form->strippages?"CHECKED":""; ?> alt="<?php print_string('allowstrippages', 'wiki') ?>" />
<?php print_string('allowstrippages', 'wiki') ?><br />
</td>
<td width="50%">
<input type="checkbox" name="removepages" value="1" <?php echo $form->removepages?"CHECKED":""; ?> />
<input type="checkbox" name="removepages" value="1" <?php echo $form->removepages?"CHECKED":""; ?> alt="<?php print_string('allowremovepages', 'wiki') ?>" />
<?php print_string('allowremovepages', 'wiki') ?><br />
<input type="checkbox" name="revertchanges" value="1" <?php echo $form->revertchanges?"CHECKED":""; ?> />
<input type="checkbox" name="revertchanges" value="1" <?php echo $form->revertchanges?"CHECKED":""; ?> alt="<?php print_string('allowrevertchanges', 'wiki') ?>" />
<?php print_string('allowrevertchanges', 'wiki') ?><br />
</td>
</tr></table>
@@ -165,29 +165,29 @@
<td></td>
</tr>
<TR valign=top>
<TD align=right><P>
<tr valign="top">
<td align="right">
<?php helpbutton('wikiname', get_string('wikiname', 'wiki'), 'wiki'); ?>
<B><?php print_string('wikiname', 'wiki') ?>:</B></P></TD>
<TD>
<b><?php print_string('wikiname', 'wiki') ?>:</b></td>
<td>
<?php
if ($wikihasentries) {
echo $form->pagename;
}
else {
?>
<INPUT type="text" name="pagename" size=30 value="<?php p($form->pagename) ?>" /><b>
<input type="text" name="pagename" size="30" value="<?php p($form->pagename) ?>" alt="<?php print_string('wikiname', 'wiki') ?>" /><b>
<?php print_string('pagenamechoice', 'wiki'); ?></b>
<?php
}
?>
</TD>
</TR>
</td>
</tr>
<tr valign="top">
<td align="right" nowrap>
<td align="right" nowrap="nowrap">
<?php helpbutton('initialcontent', get_string('initialcontent', 'wiki'), 'wiki'); ?>
<B><?php echo get_string("initialcontent", "wiki") ?>:</B></P>
<b><?php echo get_string("initialcontent", "wiki") ?>:</b>
</td>
<td>
<?php
@@ -196,24 +196,24 @@
}
else {
$strchooseafile = get_string("chooseafile", "wiki");
echo "<input name=\"initialcontent\" size=\"50\" value=\"$form->initialcontent\" />&nbsp;";
button_to_popup_window ("/files/index.php?choose=form.initialcontent&id=$course->id",
echo "<input type=\"text\" name=\"initialcontent\" size=\"50\" value=\"$form->initialcontent\" alt=\"".get_string("initialcontent", "wiki")."\" />&nbsp;";
button_to_popup_window ("/files/index.php?choose=form.initialcontent&amp;id=$course->id",
"wikifiles", $strchooseafile, 500, 750, $strchooseafile);
}
?>
</td>
</tr>
</TABLE>
</table>
<!-- These hidden variables are always the same -->
<INPUT type="hidden" name=course value="<?php p($form->course) ?>" />
<INPUT type="hidden" name=coursemodule value="<?php p($form->coursemodule) ?>" />
<INPUT type="hidden" name=section value="<?php p($form->section) ?>" />
<INPUT type="hidden" name=module value="<?php p($form->module) ?>" />
<INPUT type="hidden" name=modulename value="<?php p($form->modulename) ?>" />
<INPUT type="hidden" name=instance value="<?php p($form->instance) ?>" />
<INPUT type="hidden" name=id value="<?php p($form->instance) ?>" />
<INPUT type="hidden" name=mode value="<?php p($form->mode) ?>" />
<INPUT type="submit" value="<?php print_string('savechanges') ?>" />
</CENTER>
</FORM>
<input type="hidden" name="course" value="<?php p($form->course) ?>" />
<input type="hidden" name="coursemodule" value="<?php p($form->coursemodule) ?>" />
<input type="hidden" name="section" value="<?php p($form->section) ?>" />
<input type="hidden" name="module" value="<?php p($form->module) ?>" />
<input type="hidden" name="modulename" value="<?php p($form->modulename) ?>" />
<input type="hidden" name="instance" value="<?php p($form->instance) ?>" />
<input type="hidden" name="id" value="<?php p($form->instance) ?>" />
<input type="hidden" name="mode" value="<?php p($form->mode) ?>" />
<input type="submit" value="<?php print_string('savechanges') ?>" />
</center>
</form>
mod/wiki/view.php
+2 -2
View File
@@ -226,7 +226,7 @@
$strwiki = get_string("modulename", "wiki");
print_header_simple(($ewiki_title?$ewiki_title:$wiki->name), "",
"<A HREF=\"index.php?id=$course->id\">$strwikis</A> -> <A HREF=\"view.php?id=$moodleID\">$wiki->name</a>".($ewiki_title?" -> $ewiki_title":""),
"<a href=\"index.php?id=$course->id\">$strwikis</a> -> <a href=\"view.php?id=$moodleID\">$wiki->name</a>".($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 "<br clear=all />";
echo "<br clear=\"all\" />";
/// Finish the page
print_footer($course);
mod/workshop/assessments.php
+37 -37
View File
@@ -82,9 +82,9 @@
}
?>
<form name="commentform" action="assessments.php" method="post">
<input type="HIDDEN" name="action" value="insertcomment" />
<input type="HIDDEN" name="id" value="<?php echo $cm->id ?>" />
<input type="HIDDEN" name="aid" value="<?php echo $_REQUEST['aid'] ?>" />
<input type="hidden" name="action" value="insertcomment" />
<input type="hidden" name="id" value="<?php echo $cm->id ?>" />
<input type="hidden" name="aid" value="<?php echo $_REQUEST['aid'] ?>" />
<center>
<table cellpadding="5" border="1">
<?php
@@ -92,17 +92,17 @@
// now get the comment
echo "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("comment", "workshop").":</b></p></td>\n";
echo " <td align=\"right\"><b>". get_string("comment", "workshop").":</b></td>\n";
echo " <td>\n";
echo " <textarea name=\"comments\" rows=\"5\" cols=\"75\" wrap=\"virtual\">\n";
echo " <textarea name=\"comments\" rows=\"5\" cols=\"75\">\n";
echo "</textarea>\n";
echo " </td></tr></table>\n";
echo "<input type=\"submit\" value=\"".get_string("savemycomment", "workshop")."\" />\n";
echo "</center></form>\n";
echo "<p><center><b>".get_string("assessment", "workshop"). "</b></center>\n";
echo "<center><b>".get_string("assessment", "workshop"). "</b></center>\n";
workshop_print_assessment($workshop, $assessment);
}
@@ -240,7 +240,7 @@
} elseif ($grade > 100) {
$grade = 100;
}
echo "<p><b>".get_string("weightederrorcount", "workshop", intval($error + 0.5))."</b>\n";
echo "<b>".get_string("weightederrorcount", "workshop", intval($error + 0.5))."</b>\n";
break;
case 3: // criteria grading
@@ -493,18 +493,18 @@
}
?>
<form name="gradingform" action="assessments.php" method="post">
<input type="HIDDEN" name="action" value="updatecomment" />
<input type="HIDDEN" name="id" value="<?php echo $cm->id ?>" />
<input type="HIDDEN" name="cid" value="<?php echo $_GET['cid'] ?>" />
<input type="hidden" name="action" value="updatecomment" />
<input type="hidden" name="id" value="<?php echo $cm->id ?>" />
<input type="hidden" name="cid" value="<?php echo $_GET['cid'] ?>" />
<center>
<table cellpadding="5" border="1">
<?php
// now show the comment
echo "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("comment", "workshop").":</b></p></td>\n";
echo " <td align=\"right\"><b>". get_string("comment", "workshop").":</b></td>\n";
echo " <td>\n";
echo " <textarea name=\"comments\" rows=\"5\" cols=\"75\" wrap=\"virtual\">\n";
echo " <textarea name=\"comments\" rows=\"5\" cols=\"75\">\n";
if (isset($comment->comments)) {
echo $comment->comments;
}
@@ -557,8 +557,8 @@
for ($i=0; $i<$workshop->nelements; $i++) {
$iplus1 = $i+1;
echo "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("element","workshop")." $iplus1:</b></td>\n";
echo "<td><textarea name=\"description[]\" rows=\"3\" cols=\"75\" wrap=\"virtual\">".$elements[$i]->description."</textarea>\n";
echo " <td align=\"right\"><b>". get_string("element","workshop")." $iplus1:</b></td>\n";
echo "<td><textarea name=\"description[]\" rows=\"3\" cols=\"75\">".$elements[$i]->description."</textarea>\n";
echo " </td></tr>\n";
echo "<tr valign=\"top\">\n";
echo " <td colspan=\"2\" bgcolor=\"$THEME->cellheading2\">&nbsp;</td>\n";
@@ -574,17 +574,17 @@
for ($i=0; $i<$workshop->nelements; $i++) {
$iplus1 = $i+1;
echo "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("element","workshop")." $iplus1:</b></td>\n";
echo "<td><textarea name=\"description[]\" rows=\"3\" cols=\"75\" wrap=\"virtual\">".$elements[$i]->description."</textarea>\n";
echo " <td align=\"right\"><b>". get_string("element","workshop")." $iplus1:</b></td>\n";
echo "<td><textarea name=\"description[]\" rows=\"3\" cols=\"75\">".$elements[$i]->description."</textarea>\n";
echo " </td></tr>\n";
echo "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("typeofscale", "workshop"). ":</b></p></td>\n";
echo " <td align=\"right\"><b>". get_string("typeofscale", "workshop"). ":</b></td>\n";
echo "<td valign=\"top\">\n";
choose_from_menu($SCALES, "scale[]", $elements[$i]->scale, "");
if ($elements[$i]->weight == '') { // not set
$elements[$i]->weight = 11; // unity
}
echo "</tr>\n";
echo "</td></tr>\n";
echo "<tr valign=\"top\"><td align=\"right\"><b>".get_string("elementweight", "workshop").":</b></td><td>\n";
workshop_choose_from_menu($WORKSHOP_EWEIGHTS, "weight[]", $elements[$i]->weight, "");
echo " </td>\n";
@@ -599,8 +599,8 @@
for ($i=0; $i<$workshop->nelements; $i++) {
$iplus1 = $i+1;
echo "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("element","workshop")." $iplus1:</b></td>\n";
echo "<td><textarea name=\"description[$i]\" rows=\"3\" cols=\"75\" wrap=\"virtual\">".$elements[$i]->description."</textarea>\n";
echo " <td align=\"right\"><b>". get_string("element","workshop")." $iplus1:</b></td>\n";
echo "<td><textarea name=\"description[$i]\" rows=\"3\" cols=\"75\">".$elements[$i]->description."</textarea>\n";
echo " </td></tr>\n";
if ($elements[$i]->weight == '') { // not set
$elements[$i]->weight = 11; // unity
@@ -615,7 +615,7 @@
echo "</tr>\n";
}
echo "</center></table><br />\n";
echo "<p><center><b>".get_string("gradetable","workshop")."</b></center>\n";
echo "<center><b>".get_string("gradetable","workshop")."</b></center>\n";
echo "<center><table cellpadding=\"5\" border=\"1\"><tr><td align=\"CENTER\">".
get_string("numberofnegativeresponses", "workshop");
echo "</td><td>". get_string("suggestedgrade", "workshop")."</td></tr>\n";
@@ -641,8 +641,8 @@
for ($i=0; $i<$workshop->nelements; $i++) {
$iplus1 = $i+1;
echo "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("criterion","workshop")." $iplus1:</b></td>\n";
echo "<td><textarea name=\"description[$i]\" rows=\"3\" cols=\"75\" wrap=\"virtual\">".$elements[$i]->description."</textarea>\n";
echo " <td align=\"right\"><b>". get_string("criterion","workshop")." $iplus1:</b></td>\n";
echo "<td><textarea name=\"description[$i]\" rows=\"3\" cols=\"75\">".$elements[$i]->description."</textarea>\n";
echo " </td></tr>\n";
echo "<tr><td><b>". get_string("suggestedgrade", "workshop").":</b></td><td>\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 "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("element","workshop")." $iplus1:</b></td>\n";
echo "<td><textarea name=\"description[$i]\" rows=\"3\" cols=\"75\" wrap=\"virtual\">".$elements[$i]->description."</textarea>\n";
echo " <td align=\"right\"><b>". get_string("element","workshop")." $iplus1:</b></td>\n";
echo "<td><textarea name=\"description[$i]\" rows=\"3\" cols=\"75\">".$elements[$i]->description."</textarea>\n";
echo " </td></tr>\n";
echo "<tr valign=\"top\"><td align=\"right\"><b>".get_string("elementweight", "workshop").":</b></td><td>\n";
workshop_choose_from_menu($WORKSHOP_EWEIGHTS, "weight[]", $elements[$i]->weight, "");
@@ -679,8 +679,8 @@
$rubrics[$i][$j] = "";
}
echo "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("grade","workshop")." $j:</b></td>\n";
echo "<td><textarea name=\"rubric[$i][$j]\" rows=\"3\" cols=\"75\" wrap=\"virtual\">".$rubrics[$i][$j]."</textarea>\n";
echo " <td align=\"right\"><b>". get_string("grade","workshop")." $j:</b></td>\n";
echo "<td><textarea name=\"rubric[$i][$j]\" rows=\"3\" cols=\"75\">".$rubrics[$i][$j]."</textarea>\n";
echo " </td></tr>\n";
}
echo "<tr valign=\"top\">\n";
@@ -737,29 +737,29 @@
}
// get the teacher's assessment first
if ($teachersassessment = workshop_get_submission_assessment($submission, $USER)) {
echo "<p><center><b>".get_string("teacherassessments", "workshop", $course->teacher)."</b></center>\n";
echo "<center><b>".get_string("teacherassessments", "workshop", $course->teacher)."</b></center>\n";
workshop_print_assessment($workshop, $teachersassessment);
}
// now the student's assessment (don't allow changes)
$user = get_record("user", "id", $assessment->userid);
echo "<p><center><b>".get_string("assessmentby", "workshop", $user->firstname." ".$user->lastname)."</b></center>\n";
echo "<center><b>".get_string("assessmentby", "workshop", $user->firstname." ".$user->lastname)."</b></center>\n";
workshop_print_assessment($workshop, $assessment);
?>
<form name="gradingform" action="assessments.php" method="post">
<input type="HIDDEN" name="action" value="updategrading" />
<input type="HIDDEN" name="id" value="<?php echo $cm->id ?>" />
<input type="HIDDEN" name="stype" value="<?php echo $_GET['stype'] ?>" />
<input type="HIDDEN" name="aid" value="<?php echo $_GET['aid'] ?>" />
<input type="hidden" name="action" value="updategrading" />
<input type="hidden" name="id" value="<?php echo $cm->id ?>" />
<input type="hidden" name="stype" value="<?php echo $_GET['stype'] ?>" />
<input type="hidden" name="aid" value="<?php echo $_GET['aid'] ?>" />
<center>
<table cellpadding="5" border="1">
<?php
// now get the teacher's comment
echo "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("teacherscomment", "workshop").":</b></p></td>\n";
echo " <td align=\"right\"><b>". get_string("teacherscomment", "workshop").":</b></td>\n";
echo " <td>\n";
echo " <textarea name=\"teachercomment\" rows=\"5\" cols=\"75\" wrap=\"virtual\">\n";
echo " <textarea name=\"teachercomment\" rows=\"5\" cols=\"75\">\n";
if (isset($assessment->teachercomment)) {
echo $assessment->teachercomment;
}
@@ -1088,7 +1088,7 @@
} elseif ($grade > 100) {
$grade = 100;
}
echo "<p><b>".get_string("weightederrorcount", "workshop", intval($error + 0.5))."</b>\n";
echo "<b>".get_string("weightederrorcount", "workshop", intval($error + 0.5))."</b>\n";
break;
case 3: // criteria grading
@@ -1262,7 +1262,7 @@
} elseif ($grade > 100) {
$grade = 100;
}
echo "<p><b>".get_string("weightederrorcount", "workshop", intval($error + 0.5))."</b>\n";
echo "<b>".get_string("weightederrorcount", "workshop", intval($error + 0.5))."</b>\n";
break;
case 3: // criteria grading
mod/workshop/locallib.php
+14 -14
View File
@@ -104,7 +104,7 @@ function workshop_choose_from_menu ($options, $name, $selected="", $nothing="cho
$javascript = "";
}
$output = "<select name=$name $javascript>\n";
$output = "<select name=\"$name\" $javascript>\n";
if ($nothing) {
$output .= " <option value=\"$nothingvalue\"\n";
if ($nothingvalue == $selected) {
@@ -780,7 +780,7 @@ function workshop_list_all_submissions($workshop, $user) {
unset($table);
$table->head = array (get_string("title", "workshop"), get_string("action", "workshop"),
get_string("comment", "workshop"));
$table->align = array ("LEFT", "LEFT", "LEFT");
$table->align = array ("left", "left", "left");
$table->size = array ("*", "*", "*");
$table->cellpadding = 2;
$table->cellspacing = 0;
@@ -839,7 +839,7 @@ function workshop_list_all_ungraded_assessments($workshop) {
}
$table->head = array (get_string("title", "workshop"), get_string("timeassessed", "workshop"), get_string("action", "workshop"));
$table->align = array ("LEFT", "LEFT", "LEFT");
$table->align = array ("left", "left", "left");
$table->size = array ("*", "*", "*");
$table->cellpadding = 2;
$table->cellspacing = 0;
@@ -882,7 +882,7 @@ function workshop_list_assessed_submissions($workshop, $user) {
}
$table->head = array (get_string("title","workshop"), get_string("action","workshop"),
get_string("comment","workshop"));
$table->align = array ("LEFT", "LEFT", "LEFT");
$table->align = array ("left", "left", "left");
$table->size = array ("*", "*", "*");
$table->cellpadding = 2;
$table->cellspacing = 0;
@@ -971,7 +971,7 @@ function workshop_list_peer_assessments($workshop, $user) {
}
$table->head = array (get_string("title", "workshop"), get_string("action", "workshop"),
get_string("comment", "workshop"));
$table->align = array ("LEFT", "LEFT", "LEFT");
$table->align = array ("left", "left", "left");
$table->size = array ("*", "*", "*");
$table->cellpadding = 2;
$table->cellspacing = 0;
@@ -1047,7 +1047,7 @@ function workshop_list_self_assessments($workshop, $user) {
}
$table->head = array (get_string("title", "workshop"), get_string("action", "workshop"),
get_string("comment", "workshop"));
$table->align = array ("LEFT", "LEFT", "LEFT");
$table->align = array ("left", "left", "left");
$table->size = array ("*", "*", "*");
$table->cellpadding = 2;
$table->cellspacing = 0;
@@ -1103,7 +1103,7 @@ function workshop_list_student_submissions($workshop, $user) {
}
$table->head = array (get_string("title", "workshop"), get_string("action", "workshop"), get_string("comment", "workshop"));
$table->align = array ("LEFT", "LEFT", "LEFT");
$table->align = array ("left", "left", "left");
$table->size = array ("*", "*", "*");
$table->cellpadding = 2;
$table->cellspacing = 0;
@@ -1469,7 +1469,7 @@ function workshop_list_teacher_assessments_by_user($workshop, $user) {
}
$table->head = array (get_string("title", "workshop"), get_string("action", "workshop"), get_string("comment", "workshop"));
$table->align = array ("LEFT", "LEFT", "LEFT");
$table->align = array ("left", "left", "left");
$table->size = array ("*", "*", "*");
$table->cellpadding = 2;
$table->cellspacing = 0;
@@ -1520,7 +1520,7 @@ function workshop_list_teacher_submissions($workshop, $user) {
error("Course is misconfigured");
}
$table->head = array (get_string("title", "workshop"), get_string("action", "workshop"), get_string("comment", "workshop"));
$table->align = array ("LEFT", "LEFT", "LEFT");
$table->align = array ("left", "left", "left");
$table->size = array ("*", "*", "*");
$table->cellpadding = 2;
$table->cellspacing = 0;
@@ -1691,7 +1691,7 @@ function workshop_list_unassessed_teacher_submissions($workshop, $user) {
$table->head = array (get_string("title", "workshop"), get_string("action", "workshop"),
get_string("comment", "workshop"));
$table->align = array ("LEFT", "LEFT", "LEFT");
$table->align = array ("left", "left", "left");
$table->size = array ("*", "*", "*");
$table->cellpadding = 2;
$table->cellspacing = 0;
@@ -1734,7 +1734,7 @@ function workshop_list_ungraded_assessments($workshop, $stype) {
$table->head = array (get_string("title", "workshop"), get_string("submittedby", "workshop"),
get_string("assessor", "workshop"), get_string("timeassessed", "workshop"), get_string("action", "workshop"));
$table->align = array ("LEFT", "LEFT", "LEFT", "LEFT");
$table->align = array ("left", "left", "left", "left");
$table->size = array ("*", "*", "*", "*");
$table->cellpadding = 2;
$table->cellspacing = 0;
@@ -1784,7 +1784,7 @@ function workshop_list_user_submissions($workshop, $user) {
$timenow = time();
$table->head = array (get_string("title", "workshop"), get_string("action", "workshop"),
get_string("submitted", "assignment"), get_string("assessments", "workshop"));
$table->align = array ("LEFT", "LEFT", "LEFT", "LEFT");
$table->align = array ("left", "left", "left", "left");
$table->size = array ("*", "*", "*", "*");
$table->cellpadding = 2;
$table->cellspacing = 0;
@@ -2586,7 +2586,7 @@ function workshop_print_feedback($course, $submission) {
}
echo "\n<table border=\"0\" cellpadding=\"1\" cellspacing=\"1\" align=\"center\"><tr><td bgcolor=#888888>";
echo "\n<table border=\"0\" cellpadding=\"3\" cellspacing=\"0\" valign=\"top\">";
echo "\n<table border=\"0\" cellpadding=\"3\" cellspacing=\"0\">";
echo "\n<tr>";
echo "\n<td rowspan=\"3\" bgcolor=\"$THEME->body\" width=\"35\" valign=\"top\">";
@@ -2875,7 +2875,7 @@ function workshop_print_tabbed_heading($tabs) {
}
// print_simple_box_start("center", "$table->width", "#ffffff", 0);
echo "<table width=\"$tabs-width\" border=\"0\" valign=\"top\" align=\"center\" ";
echo "<table width=\"$tabs-width\" border=\"0\" align=\"center\" ";
echo " cellpadding=\"$tabs->cellpadding\" cellspacing=\"0\" class=\"generaltable\">\n";
if (!empty($tabs->names)) {
mod/workshop/mod.html
+27 -26
View File
@@ -72,13 +72,13 @@
<form name="form" method="post" action="mod.php">
<table cellpadding="5">
<tr valign="top">
<td align="right"><p><b><?php print_string("title", "workshop") ?>:</b></p></td>
<td align="right"><b><?php print_string("title", "workshop") ?>:</b></td>
<td>
<input type="text" name="name" size="60" value="<?php p($form->name) ?>" />
<input type="text" name="name" size="60" value="<?php p($form->name) ?>" alt="<?php print_string("title", "workshop") ?>" />
</td>
</tr>
<tr valign="top">
<td align="right"><p><b><?php print_string("description", "workshop") ?>:</b></p>
<td align="right"><b><?php print_string("description", "workshop") ?>:</b><br />
<font size="1">
<?php
helpbutton("writing", get_string("helpwriting"), "moodle", true, true);
@@ -94,6 +94,7 @@
?>
<br />
</font>
</td>
<td>
<?php
print_textarea($usehtmleditor, 20, 60, 595, 400, "description", $form->description);
@@ -116,7 +117,7 @@
</tr>
<tr valign="top">
<td align="right"><p><b><?php print_string("gradeforassessments", "workshop") ?>:</b></p></td>
<td align="right"><b><?php print_string("gradeforassessments", "workshop") ?>:</b></td>
<td>
<?php
for ($i=100; $i>=0; $i--) {
@@ -129,7 +130,7 @@
</tr>
<tr valign="top">
<td align="right"><p><b><?php print_string("gradeforsubmission", "workshop") ?>:</b></p></td>
<td align="right"><b><?php print_string("gradeforsubmission", "workshop") ?>:</b></td>
<td>
<?php
choose_from_menu($grades, "grade", "$form->grade", "");
@@ -139,7 +140,7 @@
</tr>
<tr valign="top">
<td align="right"><p><b><?php print_string("gradingstrategy", "workshop") ?>:</b></p></td>
<td align="right"><b><?php print_string("gradingstrategy", "workshop") ?>:</b></td>
<td>
<?php
choose_from_menu($WORKSHOP_TYPE, "gradingstrategy", $form->gradingstrategy, "");
@@ -149,7 +150,7 @@
</tr>
<tr valign="top">
<td align="right"><p><b><?php print_string("numberofassessmentelements", "workshop") ?>:</b></p></td>
<td align="right"><b><?php print_string("numberofassessmentelements", "workshop") ?>:</b></td>
<td valign="middle">
<?php
for ($i=20; $i>=0; $i--) {
@@ -162,7 +163,7 @@
</tr>
<tr valign="top">
<td align="right"><p><b><?php print_string("numberofattachments", "workshop") ?>:</b></p></td>
<td align="right"><b><?php print_string("numberofattachments", "workshop") ?>:</b></td>
<td valign="middle">
<?php
unset($numbers);
@@ -176,7 +177,7 @@
</tr>
<tr>
<td align="right"><p><b><?php print_string("allowresubmit", "workshop") ?>:</b></p></td>
<td align="right"><b><?php print_string("allowresubmit", "workshop") ?>:</b></td>
<td>
<?php
$options[0] = get_string("no"); $options[1] = get_string("yes");
@@ -187,7 +188,7 @@
</tr>
<tr valign="top">
<td align="right"><p><b><?php print_string("numberofassessmentsofteachersexamples", "workshop") ?>:</b></p></td>
<td align="right"><b><?php print_string("numberofassessmentsofteachersexamples", "workshop") ?>:</b></td>
<td>
<?php
unset($numbers);
@@ -201,7 +202,7 @@
</tr>
<tr>
<td align="right"><p><b><?php print_string("comparisonofassessments", "workshop") ?>:</b></p></td>
<td align="right"><b><?php print_string("comparisonofassessments", "workshop") ?>:</b></td>
<td>
<?php
// set up comparison names
@@ -215,7 +216,7 @@
</tr>
<tr valign="top">
<td align="right"><p><b><?php print_string("numberofassessmentsofstudentsubmissions", "workshop") ?>:</b></p></td>
<td align="right"><b><?php print_string("numberofassessmentsofstudentsubmissions", "workshop") ?>:</b></td>
<td>
<?php
unset($numbers);
@@ -229,7 +230,7 @@
</tr>
<tr valign="top">
<td align="right"><p><b><?php print_string("weightforteacherassessments", "workshop") ?>:</b></p></td>
<td align="right"><b><?php print_string("weightforteacherassessments", "workshop") ?>:</b></td>
<td>
<?php
unset($numbers);
@@ -243,7 +244,7 @@
</tr>
<tr valign="top">
<td align="right"><p><b><?php print_string("overallocation", "workshop") ?>:</b></p></td>
<td align="right"><b><?php print_string("overallocation", "workshop") ?>:</b></td>
<td>
<?php
unset($numbers);
@@ -257,7 +258,7 @@
</tr>
<tr>
<td align="right"><p><b><?php print_string("selfassessment", "workshop") ?>:</b></p></td>
<td align="right"><b><?php print_string("selfassessment", "workshop") ?>:</b></td>
<td>
<?php
$options[0] = get_string("no"); $options[1] = get_string("yes");
@@ -268,7 +269,7 @@
</tr>
<tr>
<td align="right"><p><b><?php print_string("assessmentsmustbeagreed", "workshop") ?>:</b></p></td>
<td align="right"><b><?php print_string("assessmentsmustbeagreed", "workshop") ?>:</b></td>
<td>
<?php
choose_from_menu($options, "agreeassessments", $form->agreeassessments, "");
@@ -278,7 +279,7 @@
</tr>
<tr>
<td align="right"><p><b><?php print_string("hidegradesbeforeagreement", "workshop") ?>:</b></p></td>
<td align="right"><b><?php print_string("hidegradesbeforeagreement", "workshop") ?>:</b></td>
<td>
<?php
choose_from_menu($options, "hidegrades", $form->hidegrades, "");
@@ -288,7 +289,7 @@
</tr>
<tr>
<td align="right"><p><b><?php print_string("leaguetable", "workshop"); ?>:</b></p></td>
<td align="right"><b><?php print_string("leaguetable", "workshop"); ?>:</b></td>
<td>
<?php
unset($numbers);
@@ -304,7 +305,7 @@
</tr>
<tr>
<td align="right"><p><b><?php print_string("hidenamesfromstudents", "workshop", $course->students) ?>:</b></p></td>
<td align="right"><b><?php print_string("hidenamesfromstudents", "workshop", $course->students) ?>:</b></td>
<td>
<?php
choose_from_menu($options, "anonymous", $form->anonymous, "");
@@ -314,7 +315,7 @@
</tr>
<tr>
<td align="right"><p><b><?php print_string("usepassword", "workshop"); ?>:</b></p></td>
<td align="right"><b><?php print_string("usepassword", "workshop"); ?>:</b></td>
<td>
<?php
$options[0] = get_string("no"); $options[1] = get_string("yes");
@@ -325,15 +326,15 @@
</tr>
<tr>
<td align="right"><p><b><?php print_string("password"); ?>:</b></p></td>
<td align="right"><b><?php print_string("password"); ?>:</b></td>
<td>
<input type="text" name="password" size="10" value="" /> <?php echo " (".get_string("leavetokeep").")"; ?>
<input type="text" name="password" size="10" value="" alt="<?php print_string("password"); ?>" /> <?php echo " (".get_string("leavetokeep").")"; ?>
<?php helpbutton("password", get_string("password"), "workshop"); ?>
</td>
</tr>
<tr valign="top">
<td align="right"><p><b><?php print_string("maximumsize", "workshop") ?>:</b></p></td>
<td align="right"><b><?php print_string("maximumsize", "workshop") ?>:</b></td>
<td>
<?php
$sizelist = array("10Kb", "50Kb", "100Kb", "500Kb", "1Mb", "2Mb", "5Mb", "10Mb", "20Mb", "50Mb");
@@ -359,7 +360,7 @@
</tr>
<tr valign="top">
<td align="right"><p><b><?php print_string("deadline", "workshop") ?>:</b></td>
<td align="right"><b><?php print_string("deadline", "workshop") ?>:</b></td>
<td><?php
print_date_selector("deadlineday", "deadlinemonth", "deadlineyear", $form->deadline);
echo "&nbsp;-&nbsp;";
@@ -368,7 +369,7 @@
</tr>
<tr valign="top">
<td align="right"><p><b><?php print_string("releaseteachergrades", "workshop") ?>:</b></td>
<td align="right"><b><?php print_string("releaseteachergrades", "workshop") ?>:</b></td>
<td><?php
print_date_selector("releaseday", "releasemonth", "releaseyear", $form->releasegrades);
echo "&nbsp;-&nbsp;";
@@ -389,7 +390,7 @@
<input type="hidden" name="mode" value="<?php p($form->mode) ?>" />
<input type="submit" value="<?php print_string("savechanges") ?>" />
<input type="submit" name="cancel" value="<?php print_string("cancel") ?>" />
<p>
</center>
</form>
mod/workshop/view.php
+10 -9
View File
@@ -425,17 +425,17 @@
case 0:
case 1: // set up assignment
if ($workshop->nelements) {
echo "<p><b><a href=\"assessments.php?id=$cm->id&amp;action=editelements\">".
echo "<br /><b><a href=\"assessments.php?id=$cm->id&amp;action=editelements\">".
get_string("amendassessmentelements", "workshop")."</a></b> \n";
helpbutton("elements", get_string("amendassessmentelements", "workshop"), "workshop");
}
if ($workshop->ntassessments) {
// if teacher examples show submission and assessment links
echo "<p><b><a href=\"view.php?id=$cm->id&amp;action=submitexample\">".
echo "<br /><b><a href=\"view.php?id=$cm->id&amp;action=submitexample\">".
get_string("submitexampleassignment", "workshop")."</a></b> \n";
helpbutton("submissionofexamples", get_string("submitexampleassignment", "workshop"),
"workshop");
echo "<p><b><a href=\"submissions.php?id=$cm->id&amp;action=listforassessmentteacher\">".
echo "<br /><b><a href=\"submissions.php?id=$cm->id&amp;action=listforassessmentteacher\">".
get_string("teachersubmissionsforassessment", "workshop",
workshop_count_teacher_submissions_for_assessment($workshop, $USER)).
"</a></b> \n";
@@ -449,7 +449,7 @@
case 4: // assessments
if ($workshop->ntassessments) { // if teacher examples show assessment link
if ($n = workshop_count_teacher_submissions_for_assessment($workshop, $USER)) {
echo "<p><b><a href=\"submissions.php?id=$cm->id&amp;action=listforassessmentteacher\">".
echo "<br /><b><a href=\"submissions.php?id=$cm->id&amp;action=listforassessmentteacher\">".
get_string("teachersubmissionsforassessment", "workshop", $n)."</a></b> \n";
helpbutton("assessmentofexamples", get_string("teachersubmissionsforassessment",
"workshop"), "workshop");
@@ -457,7 +457,7 @@
}
// only show grading assessments if there are grading grades involved
if ($workshop->wtype) {
echo "<p><b><a href=\"assessments.php?id=$cm->id&amp;action=gradeallassessments\">".
echo "<br /><b><a href=\"assessments.php?id=$cm->id&amp;action=gradeallassessments\">".
get_string("ungradedassessments", "workshop",
workshop_count_ungraded_assessments($workshop))."</a></b> \n";
helpbutton("ungradedassessments",
@@ -465,7 +465,7 @@
}
// don't show the assessment of student submissions in phase 2 if it's a 5 phase workshop
if (!(($workshop->phase == 2) and ($workshop->wtype > 1))) {
echo "<p><b><a href=\"submissions.php?id=$cm->id&amp;action=listforassessmentstudent\">".
echo "<br /><b><a href=\"submissions.php?id=$cm->id&amp;action=listforassessmentstudent\">".
get_string("studentsubmissionsforassessment", "workshop",
workshop_count_student_submissions_for_assessment($workshop, $USER))."</a></b> \n";
helpbutton("gradingsubmissions",
@@ -478,19 +478,19 @@
case 5: // Show "Final" Grades
if ($workshop->ntassessments) { // if teacher examples show assessment link
if ($n = workshop_count_teacher_submissions_for_assessment($workshop, $USER)) {
echo "<p><b><a href=\"submissions.php?id=$cm->id&amp;action=listforassessmentteacher\">".
echo "<br /><b><a href=\"submissions.php?id=$cm->id&amp;action=listforassessmentteacher\">".
get_string("teachersubmissionsforassessment", "workshop", $n)."</a></b> \n";
helpbutton("assessmentofexamples", get_string("teachersubmissionsforassessment",
"workshop"), "workshop");
}
}
if ($workshop->wtype) {
echo "<p><b><a href=\"assessments.php?id=$cm->id&amp;action=gradeallassessments\">".
echo "<br /><b><a href=\"assessments.php?id=$cm->id&amp;action=gradeallassessments\">".
get_string("ungradedassessments", "workshop",
workshop_count_ungraded_assessments($workshop))."</a></b> \n";
helpbutton("ungradedassessments", get_string("ungradedassessments", "workshop"), "workshop");
}
echo "<p><b><a href=\"submissions.php?id=$cm->id&amp;action=listforassessmentstudent\">".
echo "<br /><b><a href=\"submissions.php?id=$cm->id&amp;action=listforassessmentstudent\">".
get_string("studentsubmissionsforassessment", "workshop",
workshop_count_student_submissions_for_assessment($workshop, $USER))."</a></b> \n";
helpbutton("gradingsubmissions",
@@ -498,6 +498,7 @@
print_heading("<a href=\"submissions.php?id=$cm->id&amp;action=displayfinalgrades\">".
get_string("displayoffinalgrades", "workshop")."</a>");
}
echo '</center>';
print_heading("<a href=\"submissions.php?id=$cm->id&amp;action=adminlist\">".
get_string("administration")."</a>");
}