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

towards XHTML compliance

Browse Source
This commit is contained in:
gustav_delius
2004-09-14 20:39:28 +00:00
parent 7a57f367ce
commit e0b7b090d3
27 changed files with 397 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/exercise/lib.php
+2 -2
View File
@@ -90,7 +90,7 @@ function exercise_choose_from_menu ($options, $name, $selected="", $nothing="cho
if ($nothing) {
$output .= " <option value=\"$nothingvalue\"\n";
if ($nothingvalue == $selected) {
$output .= " SELECTED";
$output .= " selected=\"selected\"";
}
$output .= ">$nothing</option>\n";
}
@@ -98,7 +98,7 @@ function exercise_choose_from_menu ($options, $name, $selected="", $nothing="cho
foreach ($options as $value => $label) {
$output .= " <option value=\"$value\"";
if ($value == $selected) {
$output .= " SELECTED";
$output .= " selected=\"selected\"";
}
// stop zero label being replaced by array index value
// if ($label) {
mod/glossary/config.html
+16 -16
View File
@@ -25,9 +25,9 @@
$yselected = "";
$nselected = "";
if ($CFG->glossary_studentspost) {
$yselected = " SELECTED ";
$yselected = " selected=\"selected\" ";
} else {
$nselected = " SELECTED ";
$nselected = " selected=\"selected\" ";
}
?>
<option value=1 <?php p($yselected) ?>><?php p($yes)?></option>
@@ -46,9 +46,9 @@
$yselected = "";
$nselected = "";
if ($CFG->glossary_dupentries) {
$yselected = " SELECTED ";
$yselected = " selected=\"selected\" ";
} else {
$nselected = " SELECTED ";
$nselected = " selected=\"selected\" ";
}
?>
<option value=1 <?php p($yselected) ?>><?php p($yes)?></option>
@@ -67,9 +67,9 @@
$yselected = "";
$nselected = "";
if ($CFG->glossary_allowcomments) {
$yselected = " SELECTED ";
$yselected = " selected=\"selected\" ";
} else {
$nselected = " SELECTED ";
$nselected = " selected=\"selected\" ";
}
?>
<option value=1 <?php p($yselected) ?>><?php p($yes)?></option>
@@ -88,9 +88,9 @@
$yselected = "";
$nselected = "";
if ($CFG->glossary_linkbydefault) {
$yselected = " SELECTED ";
$yselected = " selected=\"selected\" ";
} else {
$nselected = " SELECTED ";
$nselected = " selected=\"selected\" ";
}
?>
<option value=1 <?php p($yselected) ?>><?php p($yes)?></option>
@@ -109,9 +109,9 @@
$yselected = "";
$nselected = "";
if ($CFG->glossary_defaultapproval) {
$yselected = " SELECTED ";
$yselected = " selected=\"selected\" ";
} else {
$nselected = " SELECTED ";
$nselected = " selected=\"selected\" ";
}
?>
<option value=1 <?php p($yselected) ?>><?php p($yes)?></option>
@@ -133,9 +133,9 @@
$yselected = "";
$nselected = "";
if ($CFG->glossary_linkentries) {
$yselected = " SELECTED ";
$yselected = " selected=\"selected\" ";
} else {
$nselected = " SELECTED ";
$nselected = " selected=\"selected\" ";
}
?>
<option value=1 <?php p($yselected) ?>><?php p($yes)?></option>
@@ -154,9 +154,9 @@
$yselected = "";
$nselected = "";
if ($CFG->glossary_casesensitive) {
$yselected = " SELECTED ";
$yselected = " selected=\"selected\" ";
} else {
$nselected = " SELECTED ";
$nselected = " selected=\"selected\" ";
}
?>
<option value=1 <?php p($yselected) ?>><?php p($yes)?></option>
@@ -175,9 +175,9 @@
$yselected = "";
$nselected = "";
if ($CFG->glossary_fullmatch) {
$yselected = " SELECTED ";
$yselected = " selected=\"selected\" ";
} else {
$nselected = " SELECTED ";
$nselected = " selected=\"selected\" ";
}
?>
<option value=1 <?php p($yselected) ?>><?php p($yes)?></option>
mod/glossary/edit.html
+2 -2
View File
@@ -32,7 +32,7 @@ if (isset($errors)) {
echo " <option ";
if (isset($newentry->id)) {
if ( record_exists("glossary_entries_categories","entryid",$newentry->id,"categoryid",$category->id) ) {
echo "selected " ;
echo "selected=\"selected\" " ;
}
}
echo "value=\"$category->id\">$category->name</option>\n";
@@ -67,7 +67,7 @@ if (isset($errors)) {
echo '<script>var items = [\'casesensitive\',\'fullmatch\'];</script>';
if (!empty($newentry->usedynalink)) {
$selected = "checked";
$selected = "checked=\"checked\"";
} else {
$selected = "";
}
mod/glossary/editcategories.html
+2 -2
View File
@@ -17,12 +17,12 @@
<select size="1" name="usedynalink">
<option value="1" <?php
if ( $usedynalink ) {
echo "selected";
echo "selected=\"selected\"";
}
?>><?php echo get_string("yes") ?></option>
<option value="0" <?php
if ( !$usedynalink ) {
echo "selected";
echo "selected=\"selected\"";
}
?>><?php echo get_string("no") ?>
</option>
mod/glossary/formats.php
+16 -16
View File
@@ -111,19 +111,19 @@
$sdate = '';
switch ( strtolower($displayformat->defaultmode) ) {
case 'letter':
$sletter = ' SELECTED ';
$sletter = ' selected="selected" ';
break;
case 'cat':
$scat = ' SELECTED ';
$scat = ' selected="selected" ';
break;
case 'date':
$sdate = ' SELECTED ';
$sdate = ' selected="selected" ';
break;
case 'author':
$sauthor = ' SELECTED ';
$sauthor = ' selected="selected" ';
break;
}
?>
@@ -148,19 +148,19 @@
$snocategorised = '';
switch ( strtolower($displayformat->defaulthook) ) {
case 'all':
$sall = ' SELECTED ';
$sall = ' selected="selected" ';
break;
case 'special':
$sspecial = ' SELECTED ';
$sspecial = ' selected="selected" ';
break;
case '0':
$sallcategories = ' SELECTED ';
$sallcategories = ' selected="selected" ';
break;
case '-1':
$snocategorised = ' SELECTED ';
$snocategorised = ' selected="selected" ';
break;
}
?>
@@ -185,19 +185,19 @@
$screation = '';
switch ( strtolower($displayformat->sortkey) ) {
case 'firstname':
$sfname = ' SELECTED ';
$sfname = ' selected="selected" ';
break;
case 'lastname':
$slname = ' SELECTED ';
$slname = ' selected="selected" ';
break;
case 'creation':
$screation = ' SELECTED ';
$screation = ' selected="selected" ';
break;
case 'update':
$supdate = ' SELECTED ';
$supdate = ' selected="selected" ';
break;
}
?>
@@ -220,11 +220,11 @@
$sdesc = '';
switch ( strtolower($displayformat->sortorder) ) {
case 'asc':
$sasc = ' SELECTED ';
$sasc = ' selected="selected" ';
break;
case 'desc':
$sdesc = ' SELECTED ';
$sdesc = ' selected="selected" ';
break;
}
?>
@@ -244,9 +244,9 @@
$yselected = "";
$nselected = "";
if ($displayformat->showgroup) {
$yselected = " SELECTED ";
$yselected = " selected=\"selected\" ";
} else {
$nselected = " SELECTED ";
$nselected = " selected=\"selected\" ";
}
?>
<option value="1" <?php p($yselected) ?>><?php p($yes)?></option>
mod/glossary/import.html
+1 -1
View File
@@ -18,7 +18,7 @@
<td width="25%">
<p align="right"><?php p(get_string("destination","glossary")) ?>:</td>
<td width="25%"><select size="1" name="dest">
<option selected value="current"><?php p(get_string("currentglossary","glossary")) ?></option>
<option selected="selected" value="current"><?php p(get_string("currentglossary","glossary")) ?></option>
<option value="new"><?php p(get_string("newglossary","glossary")) ?></option>
</select> <?php helpbutton("destination", get_string("destination", "glossary"), "glossary") ?></td>
<td width="25%">
mod/glossary/mod.html
+20 -20
View File
@@ -132,13 +132,13 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
<select size="1" name="mainglossary">
<option value="1" <?php
if ( $form->mainglossary ) {
echo "selected";
echo "selected=\"selected\"";
}
?>>
<?php echo get_string("mainglossary", "glossary") ?></option>
<option value="0" <?php
if ( !$form->mainglossary ) {
echo "selected";
echo "selected=\"selected\"";
}
?>><?php echo get_string("secondaryglossary", "glossary") ?>
</option>
@@ -157,12 +157,12 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
<select size="1" name="studentcanpost">
<option value="1" <?php
if ( $form->studentcanpost ) {
echo "selected";
echo "selected=\"selected\"";
}
?>><?php echo get_string("yes") ?></option>
<option value="0" <?php
if ( !$form->studentcanpost ) {
echo "selected";
echo "selected=\"selected\"";
}
?>><?php echo get_string("no") ?>
</option>
@@ -175,13 +175,13 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
<select size="1" name="allowduplicatedentries">
<option value="1" <?php
if ( $form->allowduplicatedentries ) {
echo "selected";
echo "selected=\"selected\"";
}
?>
><?php echo get_string("yes") ?></option>
<option value="0" <?php
if ( !$form->allowduplicatedentries ) {
echo "selected";
echo "selected=\"selected\"";
}
?>><?php echo get_string("no") ?>
</option>
@@ -194,13 +194,13 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
<select size="1" name="allowcomments">
<option value="1" <?php
if ( $form->allowcomments ) {
echo "selected";
echo "selected=\"selected\"";
}
?>
><?php echo get_string("yes") ?></option>
<option value="0" <?php
if ( !$form->allowcomments ) {
echo "selected";
echo "selected=\"selected\"";
}
?>><?php echo get_string("no") ?>
</option>
@@ -213,13 +213,13 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
<select size="1" name="usedynalink">
<option value="1" <?php
if ( $form->usedynalink ) {
echo "selected";
echo "selected=\"selected\"";
}
?>
><?php echo get_string("yes") ?></option>
<option value="0" <?php
if ( !$form->usedynalink ) {
echo "selected";
echo "selected=\"selected\"";
}
?>><?php echo get_string("no") ?>
</option>
@@ -232,13 +232,13 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
<select size="1" name="defaultapproval">
<option value="1" <?php
if ( $form->defaultapproval ) {
echo "selected";
echo "selected=\"selected\"";
}
?>
><?php echo get_string("yes") ?></option>
<option value="0" <?php
if ( !$form->defaultapproval ) {
echo "selected";
echo "selected=\"selected\"";
}
?>><?php echo get_string("no") ?>
</option>
@@ -282,13 +282,13 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
<select size="1" name="showspecial">
<option value="1" <?php
if ( $form->showspecial ) {
echo "selected";
echo "selected=\"selected\"";
}
?>
><?php echo get_string("yes") ?></option>
<option value="0" <?php
if ( !$form->showspecial ) {
echo "selected";
echo "selected=\"selected\"";
}
?>><?php echo get_string("no") ?>
</option>
@@ -301,13 +301,13 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
<select size="1" name="showalphabet">
<option value="1" <?php
if ( $form->showalphabet ) {
echo "selected";
echo "selected=\"selected\"";
}
?>
><?php echo get_string("yes") ?></option>
<option value="0" <?php
if ( !$form->showalphabet ) {
echo "selected";
echo "selected=\"selected\"";
}
?>><?php echo get_string("no") ?>
</option>
@@ -320,13 +320,13 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
<select size="1" name="showall">
<option value="1" <?php
if ( $form->showall ) {
echo "selected";
echo "selected=\"selected\"";
}
?>
><?php echo get_string("yes") ?></option>
<option value="0" <?php
if ( !$form->showall ) {
echo "selected";
echo "selected=\"selected\"";
}
?>><?php echo get_string("no") ?>
</option>
@@ -339,13 +339,13 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
<select size="1" name="editalways">
<option value="1" <?php
if ( $form->editalways ) {
echo "selected";
echo "selected=\"selected\"";
}
?>
><?php echo get_string("yes") ?></option>
<option value="0" <?php
if ( !$form->editalways ) {
echo "selected";
echo "selected=\"selected\"";
}
?>><?php echo get_string("no") ?>
</option>
mod/lesson/lib.php
+2 -2
View File
@@ -97,7 +97,7 @@ function lesson_choose_from_menu ($options, $name, $selected="", $nothing="choos
if ($nothing) {
$output .= " <option value=\"$nothingvalue\"\n";
if ($nothingvalue == $selected) {
$output .= " SELECTED";
$output .= " selected=\"selected\"";
}
$output .= ">$nothing</option>\n";
}
@@ -105,7 +105,7 @@ function lesson_choose_from_menu ($options, $name, $selected="", $nothing="choos
foreach ($options as $value => $label) {
$output .= " <option value=\"$value\"";
if ($value == $selected) {
$output .= " SELECTED";
$output .= " selected=\"selected\"";
}
// stop zero label being replaced by array index value
// if ($label) {
mod/resource/coursefiles.php
+6 -6
View File
@@ -636,7 +636,7 @@ function printfilelist($filelist) {
foreach ($filelist as $file) {
if (is_dir($basedir.$file)) {
echo "<img src=\"$CFG->pixpath/f/folder.gif\" height=\"16\" width=\"16\"> $file<br />";
echo "<img src=\"$CFG->pixpath/f/folder.gif\" height=\"16\" width=\"16\" /> $file<br />";
$subfilelist = array();
$currdir = opendir($basedir.$file);
while ($subfile = readdir($currdir)) {
@@ -648,7 +648,7 @@ function printfilelist($filelist) {
} else {
$icon = mimeinfo("icon", $file);
echo "<img src=\"$CFG->pixpath/f/$icon\" height=\"16\" width=\"16\"> $file<br />";
echo "<img src=\"$CFG->pixpath/f/$icon\" height=\"16\" width=\"16\" /> $file<br />";
}
}
}
@@ -733,7 +733,7 @@ function displaydir ($wdir) {
echo "<tr>";
print_cell("center", "<input type=\"checkbox\" name=\"file$count\" value=\"$fileurl\" />");
print_cell("left", "<a href=\"".basename($ME)."?id=$id&wdir=$fileurl\"><img src=\"$CFG->pixpath/f/folder.gif\" height=\"16\" width=\"16\" border=\"0\" alt=\"Folder\"></a> <a href=\"".basename($ME)."?id=$id&wdir=$fileurl\">".htmlspecialchars($dir)."</a>");
print_cell("left", "<a href=\"".basename($ME)."?id=$id&wdir=$fileurl\"><img src=\"$CFG->pixpath/f/folder.gif\" height=\"16\" width=\"16\" border=\"0\" alt=\"Folder\" /></a> <a href=\"".basename($ME)."?id=$id&wdir=$fileurl\">".htmlspecialchars($dir)."</a>");
print_cell("right", "-");
print_cell("right", $filedate);
print_cell("right", "<a href=\"".basename($ME)."?id=$id&wdir=$wdir&file=$filesafe&action=rename\">$strrename</a>");
@@ -773,7 +773,7 @@ function displaydir ($wdir) {
echo "<td align=\"left\" nowrap=\"nowrap\">";
link_to_popup_window ($ffurl, "display",
"<img src=\"$CFG->pixpath/f/$icon\" height=\"16\" width=\"16\" border=\"0\" alt=\"file\">",
"<img src=\"$CFG->pixpath/f/$icon\" height=\"16\" width=\"16\" border=\"0\" alt=\"file\" />",
480, 640);
echo "<font size=\"-1\" face=\"Arial, Helvetica\">";
link_to_popup_window ($ffurl, "display", htmlspecialchars($file), 480, 640);
@@ -798,7 +798,7 @@ function displaydir ($wdir) {
}
}
echo "</table>";
echo "<hr width=\"640\" align=\"center\" noshade size=\"1\" />";
echo "<hr width=\"640\" align=\"center\" selected=\"selected\" size=\"1\" />";
if (empty($wdir)) {
$wdir = "/";
@@ -844,7 +844,7 @@ function displaydir ($wdir) {
echo "</form>";
echo "</td></tr>";
echo "</table>";
echo "<hr width=\"640\" align=\"center\" NOSHADE size=\"1\">";
echo "<hr width=\"640\" align=\"center\" selected=\"selected\" size=\"1\" />";
}
mod/resource/type/directory/directory.html
+3 -2
View File
@@ -1,12 +1,13 @@
<tr valign="top">
<td align="right" nowrap="nowrap">
<p><b><?php print_string("resourcetypedirectory", "resource") ?>:</b></p>
<b><?php print_string("resourcetypedirectory", "resource") ?>:</b>
</td>
<td>
<?php choose_from_menu($dirs, "reference", $form->reference, get_string("maindirectory", "resource"), '', '') ?>
</td>
</tr>
<tr valign="top"> <td align="right" nowrap="nowrap">&nbsp;
<tr valign="top">
<td align="right" nowrap="nowrap">&nbsp;
</td>
<td>
<p><?php print_string("directoryinfo", "resource") ?></p>
mod/resource/type/directory/resource.class.php
+2 -2
View File
@@ -68,7 +68,7 @@ function display() {
navmenu($course, $this->cm));
if (isteacheredit($course->id)) {
echo "<div align=\"right\"><img src=\"$CFG->pixpath/i/files.gif\" height=\"16\" width=\"16\" alt=\"\">&nbsp".
echo "<div align=\"right\"><img src=\"$CFG->pixpath/i/files.gif\" height=\"16\" width=\"16\" alt=\"\" />&nbsp".
"<a href=\"$CFG->wwwroot/files/index.php?id={$course->id}&wdir=/{$resource->reference}$subdir\">".
get_string("editfiles")."...</a></div>";
}
@@ -119,7 +119,7 @@ function display() {
echo '<tr>';
echo '<td>';
echo "<img src=\"$CFG->pixpath/f/$icon\" width=\"16\" height=\"16\">";
echo "<img src=\"$CFG->pixpath/f/$icon\" width=\"16\" height=\"16\" />";
echo '</td>';
echo '<td nowrap="nowrap"><p>';
if ($icon == 'folder.gif') {
mod/resource/type/file/file.html
+6 -6
View File
@@ -68,13 +68,13 @@
var frameitem = [<?php echo $frameoption; ?>];
var allitems = [<?php echo $alloptions; ?>];
</script>
<input type="radio" name="windowpopup" value="0" <?php echo ($windowtype != "popup") ? "checked" : "" ?>
<input type="radio" name="windowpopup" value="0" <?php echo ($windowtype != "popup") ? "checked=\"checked\"" : "" ?>
onClick="lockoptions('form', 'windowpopup[0]', frameitem);
return lockoptions('form', 'windowpopup[1]', popupitems);" />
<b title="<?php print_string("pagedisplay", "resource") ?>"><?php print_string("pagewindow", "resource") ?></b>
<ul>
<input type="hidden" name="hframepage" value="0" />
<input type="checkbox" name="framepage" value="1" <?php echo ($form->options == "frame") ? "checked" : "" ?> />
<input type="checkbox" name="framepage" value="1" <?php echo ($form->options == "frame") ? "checked=\"checked\"" : "" ?> />
<?php print_string("frameifpossible", "resource") ?>
</ul>
</td>
@@ -83,7 +83,7 @@
<tr valign="top">
<td colspan="2">
<input name="windowpopup" type="radio" value="1" <?php echo ($windowtype == "popup") ? "checked" : "" ?>
<input name="windowpopup" type="radio" value="1" <?php echo ($windowtype == "popup") ? "checked=\"checked\"" : "" ?>
onclick="lockoptions('form', 'windowpopup[0]', frameitem);
return lockoptions('form', 'windowpopup[1]', popupitems);" />
<b title="<?php p($strnewwindowopen) ?>"><?php p($strnewwindow) ?></b>
@@ -93,8 +93,8 @@
if ($name == "height" or $name == "width") {
continue;
}
echo "<input name=\"h$name\" type="hidden" value="0" />";
echo "<input name=\"$name\" type="checkbox" value="1" ".$window->$name." />";
echo "<input name=\"h$name\" type=\"hidden\" value=\"0\" />";
echo "<input name=\"$name\" type=\"checkbox\" value=\"1\" ".$window->$name." />";
$stringname = "str$name";
echo $$stringname."<br />";
}
@@ -163,7 +163,7 @@ for ($i=0; $i < $this->maxparameters; $i++) {
} else {
echo "<option value=\"$field\"";
if ($alltextfield[$i]['parameter'] == $field) {
echo " selected";
echo " selected=\"selected\"";
}
echo ">{$fieldarr['langstr']}</option>\n";
}
mod/resource/type/file/resource.class.php
+1 -1
View File
@@ -357,7 +357,7 @@ function display() {
if ($resourcetype == "image") {
echo "<center><p>";
echo "<img title=\"{$resource->name}\" class=\"resourceimage\" src=\"$fullurl\">";
echo "<img title=\"{$resource->name}\" class=\"resourceimage\" src=\"$fullurl\" />";
echo "</p></center>";
} else if ($resourcetype == "mp3") {
mod/resource/type/html/html.html
+4 -4
View File
@@ -65,7 +65,7 @@
var popupitems = [<?php echo $popupoptions; ?>];
var allitems = [<?php echo $alloptions; ?>];
</script>
<input type="radio" name="windowpopup" value="0" <?php echo ($windowtype != "popup") ? "checked" : "" ?>
<input type="radio" name="windowpopup" value="0" <?php echo ($windowtype != "popup") ? "checked=\"checked\"" : "" ?>
onClick="return lockoptions('form', 'windowpopup[1]', popupitems);" />
<b title="<?php print_string("pagedisplay", "resource") ?>"><?php print_string("pagewindow", "resource") ?></b>
</td>
@@ -74,7 +74,7 @@
<tr valign="top">
<td colspan="2">
<input name="windowpopup" type="radio" value="1" <?php echo ($windowtype == "popup") ? "checked" : "" ?>
<input name="windowpopup" type="radio" value="1" <?php echo ($windowtype == "popup") ? "checked=\"checked\"" : "" ?>
onclick=" return lockoptions('form', 'windowpopup[1]', popupitems);" />
<b title="<?php p($strnewwindowopen) ?>"><?php p($strnewwindow) ?></b>
<ul>
@@ -83,8 +83,8 @@
if ($name == "height" or $name == "width") {
continue;
}
echo "<input name=\"h$name\" type="hidden" value="0" />";
echo "<input name=\"$name\" type="checkbox" value="1" ".$window->$name." />";
echo "<input name=\"h$name\" type=\"hidden\" value=\"0\" />";
echo "<input name=\"$name\" type=\"checkbox\" value=\"1\" ".$window->$name." />";
$stringname = "str$name";
echo $$stringname."<br />";
}
mod/resource/type/text/text.html
+4 -4
View File
@@ -77,7 +77,7 @@
var popupitems = [<?php echo $popupoptions; ?>];
var allitems = [<?php echo $alloptions; ?>];
</script>
<input type="radio" name="windowpopup" value="0" <?php echo ($windowtype != "popup") ? "checked" : "" ?>
<input type="radio" name="windowpopup" value="0" <?php echo ($windowtype != "popup") ? "checked=\"checked\"" : "" ?>
onClick="return lockoptions('form', 'windowpopup[1]', popupitems);" />
<b title="<?php print_string("pagedisplay", "resource") ?>"><?php print_string("pagewindow", "resource") ?></b>
<?php print_string("pagedisplay", "resource") ?>
@@ -87,7 +87,7 @@
<tr valign="top">
<td colspan="2">
<input name="windowpopup" type="radio" value="1" <?php echo ($windowtype == "popup") ? "checked" : "" ?>
<input name="windowpopup" type="radio" value="1" <?php echo ($windowtype == "popup") ? "checked=\"checked\"" : "" ?>
onclick=" return lockoptions('form', 'windowpopup[1]', popupitems);" />
<b title="<?php p($strnewwindowopen) ?>"><?php p($strnewwindow) ?></b>
<?php p($strnewwindowopen) ?>
@@ -97,8 +97,8 @@
if ($name == "height" or $name == "width") {
continue;
}
echo "<input name=\"h$name\" type="hidden" value="0" />";
echo "<input name=\"$name\" type="checkbox" value="1" ".$window->$name." />";
echo "<input name=\"h$name\" type=\"hidden\" value=\"0\" />";
echo "<input name=\"$name\" type=\"checkbox\" value=\"1\" ".$window->$name." />";
$stringname = "str$name";
echo $$stringname."<br />";
}
mod/scorm/coursefiles.php
+6 -6
View File
@@ -636,7 +636,7 @@ function printfilelist($filelist) {
foreach ($filelist as $file) {
if (is_dir($basedir.$file)) {
echo "<img src=\"$CFG->pixpath/f/folder.gif\" height=\"16\" width=\"16\"> $file<br />";
echo "<img src=\"$CFG->pixpath/f/folder.gif\" height=\"16\" width=\"16\" /> $file<br />";
$subfilelist = array();
$currdir = opendir($basedir.$file);
while ($subfile = readdir($currdir)) {
@@ -648,7 +648,7 @@ function printfilelist($filelist) {
} else {
$icon = mimeinfo("icon", $file);
echo "<img src=\"$CFG->pixpath/f/$icon\" height=\"16\" width=\"16\"> $file<br />";
echo "<img src=\"$CFG->pixpath/f/$icon\" height=\"16\" width=\"16\" /> $file<br />";
}
}
}
@@ -734,7 +734,7 @@ function displaydir ($wdir) {
echo "<tr>";
print_cell("center", "<input type=\"checkbox\" name=\"file$count\" value=\"$fileurl\" />");
print_cell("left", "<a href=\"".basename($ME)."?id=$id&wdir=$fileurl\"><img src=\"$CFG->pixpath/f/folder.gif\" height=\"16\" width=\"16\" border=\"0\" alt=\"Folder\"></a> <a href=\"".basename($ME)."?id=$id&wdir=$fileurl\">".htmlspecialchars($dir)."</a>");
print_cell("left", "<a href=\"".basename($ME)."?id=$id&wdir=$fileurl\"><img src=\"$CFG->pixpath/f/folder.gif\" height=\"16\" width=\"16\" border=\"0\" alt=\"Folder\" /></a> <a href=\"".basename($ME)."?id=$id&wdir=$fileurl\">".htmlspecialchars($dir)."</a>");
print_cell("right", "-");
print_cell("right", $filedate);
print_cell("right", "<a href=\"".basename($ME)."?id=$id&wdir=$wdir&file=$filesafe&action=rename\">$strrename</a>");
@@ -774,7 +774,7 @@ function displaydir ($wdir) {
echo "<td align=\"left\" nowrap=\"nowrap\">";
link_to_popup_window ($ffurl, "display",
"<img src=\"$CFG->pixpath/f/$icon\" height=\"16\" width=\"16\" border=\"0\" alt=\"file\">",
"<img src=\"$CFG->pixpath/f/$icon\" height=\"16\" width=\"16\" border=\"0\" alt=\"file\" />",
480, 640);
echo "<font size=\"-1\" face=\"Arial, Helvetica\">";
link_to_popup_window ($ffurl, "display", htmlspecialchars($file), 480, 640);
@@ -799,7 +799,7 @@ function displaydir ($wdir) {
}
}
echo "</table>";
echo "<hr width=\"640\" align=\"center\" noshade=\"noshade\" size=\"1\">";
echo "<hr width=\"640\" align=\"center\" noshade=\"noshade\" size=\"1\" />";
if (empty($wdir)) {
$wdir = "/";
@@ -845,7 +845,7 @@ function displaydir ($wdir) {
echo "</form>";
echo "</td></tr>";
echo "</table>";
echo "<hr width=\"640\" align=\"center\" noshade=\"noshade\" size=\"1\">";
echo "<hr width=\"640\" align=\"center\" noshade=\"noshade\" size=\"1\" />";
}
mod/scorm/lib.php
+5 -5
View File
@@ -209,15 +209,15 @@ function scorm_grades($scormid) {
$scores->{scorm_remove_spaces($data->cmi_core_lesson_status)}++;
}
if ($scores->completed)
$result.="<img src=\"$CFG->wwwroot/mod/scorm/pix/completed.gif\" alt=\"".get_string('completed','scorm')."\" title=\"".get_string('completed','scorm')."\"> $scores->completed ";
$result.="<img src=\"$CFG->wwwroot/mod/scorm/pix/completed.gif\" alt=\"".get_string('completed','scorm')."\" title=\"".get_string('completed','scorm')."\" /> $scores->completed ";
if ($scores->incomplete)
$result.="<img src=\"$CFG->wwwroot/mod/scorm/pix/incomplete.gif\" alt=\"".get_string('incomplete','scorm')."\" title=\"".get_string('incomplete','scorm')."\"> $scores->incomplete ";
$result.="<img src=\"$CFG->wwwroot/mod/scorm/pix/incomplete.gif\" alt=\"".get_string('incomplete','scorm')."\" title=\"".get_string('incomplete','scorm')."\" /> $scores->incomplete ";
if ($scores->failed)
$result.="<img src=\"$CFG->wwwroot/mod/scorm/pix/failed.gif\" alt=\"".get_string('failed','scorm')."\" title=\"".get_string('failed','scorm')."\"> $scores->failed ";
$result.="<img src=\"$CFG->wwwroot/mod/scorm/pix/failed.gif\" alt=\"".get_string('failed','scorm')."\" title=\"".get_string('failed','scorm')."\" /> $scores->failed ";
if ($scores->browsed)
$result.="<img src=\"$CFG->wwwroot/mod/scorm/pix/browsed.gif\" alt=\"".get_string('browsed','scorm')."\" title=\"".get_string('browsed','scorm')."\"> $scores->browsed ";
$result.="<img src=\"$CFG->wwwroot/mod/scorm/pix/browsed.gif\" alt=\"".get_string('browsed','scorm')."\" title=\"".get_string('browsed','scorm')."\" /> $scores->browsed ";
if ($scores->notattempted)
$result.="<img src=\"$CFG->wwwroot/mod/scorm/pix/notattempted.gif\" alt=\"".get_string('notattempted','scorm')."\" title=\"".get_string('notattempted','scorm')."\"> $scores->notattempted ";
$result.="<img src=\"$CFG->wwwroot/mod/scorm/pix/notattempted.gif\" alt=\"".get_string('notattempted','scorm')."\" title=\"".get_string('notattempted','scorm')."\" /> $scores->notattempted ";
$return->grades[$sco_user->userid]=$result;
}
mod/scorm/view.php
+2 -2
View File
@@ -187,9 +187,9 @@
print_string("mode","scorm");
echo ": <input type=\"radio\" id=\"b\" name=\"mode\" value=\"browse\" /><label for=\"b\">".get_string("browse","scorm")."</label>\n";
if ($incomplete === true) {
echo "<input type=\"radio\" id=\"n\" name=\"mode\" value=\"normal\" checked /><label for=\"n\">".get_string("normal","scorm")."</label>\n";
echo "<input type=\"radio\" id=\"n\" name=\"mode\" value=\"normal\" checked=\"checked\" /><label for=\"n\">".get_string("normal","scorm")."</label>\n";
} else {
echo "<input type=\"radio\" id=\"r\" name=\"mode\" value=\"review\" checked /><label for=\"r\">".get_string("review","scorm")."</label>\n";
echo "<input type=\"radio\" id=\"r\" name=\"mode\" value=\"review\" checked=\"checked\" /><label for=\"r\">".get_string("review","scorm")."</label>\n";
}
echo "</td>\n</tr>\n<tr><td align=\"center\">";
echo '<input type="hidden" name="scoid" />
mod/survey/lib.php
+2 -2
View File
@@ -451,7 +451,7 @@ function survey_print_single($question) {
} else if ($question->type > 0) { // Choose one of a number
$strchoose = get_string("choose");
echo "<select name=$question->id>";
echo "<option value=\"0\" SELECTED>$strchoose...</option>";
echo "<option value=\"0\" selected=\"selected\">$strchoose...</option>";
$options = explode( ",", $question->options);
foreach ($options as $key => $val) {
$key++;
@@ -487,7 +487,7 @@ function survey_print_graph($url) {
} else {
echo "<img height=\"$SURVEY_GHEIGHT\" width=\"$SURVEY_GWIDTH\" border=\"1\"".
" src=\"$CFG->wwwroot/mod/survey/graph.php?$url\">";
" src=\"$CFG->wwwroot/mod/survey/graph.php?$url\" />";
}
}
mod/workshop/assessments.php
+69 -69
View File
@@ -49,7 +49,7 @@
$navigation = "";
if ($course->category) {
$navigation = "<a HREF=\"../../course/view.php?id=$course->id\">$course->shortname</a> ->";
$navigation = "<a href=\"../../course/view.php?id=$course->id\">$course->shortname</a> ->";
}
$strworkshops = get_string("modulenameplural", "workshop");
@@ -58,8 +58,8 @@
// ... print the header and...
print_header_simple("$workshop->name", "",
"<a HREF=index.php?id=$course->id>$strworkshops</a> ->
<a HREF=\"view.php?id=$cm->id\">$workshop->name</a> -> $strassessments",
"<a href=\"index.php?id=$course->id\">$strworkshops</a> ->
<a href=\"view.php?id=$cm->id\">$workshop->name</a> -> $strassessments",
"", "", true);
//...get the action
@@ -79,26 +79,26 @@
error("Submission not found");
}
?>
<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'] ?>" />
<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'] ?>" />
<center>
<table CELLPADDING=5 BORDER=1>
<table cellpadding="5" border="1">
<?php
// now get the comment
echo "<tr valign=top>\n";
echo "<tr valign=\"top\">\n";
echo " <td align=right><p><b>". get_string("comment", "workshop").":</b></p></td>\n";
echo " <td align=\"right\"><p><b>". get_string("comment", "workshop").":</b></p></td>\n";
echo " <td>\n";
echo " <textarea name=\"comments\" rows=5 cols=75 wrap=\"virtual\">\n";
echo " <textarea name=\"comments\" rows=\"5\" cols=\"75\" wrap=\"virtual\">\n";
echo "</textarea>\n";
echo " </td></tr></table>\n";
echo "<input TYPE=submit VALUE=\"".get_string("savemycomment", "workshop")."\" />\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";
workshop_print_assessment($workshop, $assessment);
@@ -255,25 +255,25 @@
error("Edit Comment: Submission not found");
}
?>
<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'] ?>" />
<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'] ?>" />
<center>
<table CELLPADDING=5 BORDER=1>
<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 "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("comment", "workshop").":</b></p></td>\n";
echo " <td>\n";
echo " <textarea name=\"comments\" rows=5 cols=75 wrap=\"virtual\">\n";
echo " <textarea name=\"comments\" rows=\"5\" cols=\"75\" wrap=\"virtual\">\n";
if (isset($comment->comments)) {
echo $comment->comments;
}
echo " </textarea>\n";
echo " </td></tr></table>\n";
echo "<input TYPE=submit VALUE=\"".get_string("savemycomment", "workshop")."\" />\n";
echo "<input type=\"submit\" value=\"".get_string("savemycomment", "workshop")."\" />\n";
echo "</center></form>\n";
workshop_print_assessment($workshop, $assessment);
}
@@ -296,7 +296,7 @@
<form name="form" method="post" action="assessments.php">
<input type="hidden" name="id" value="<?php echo $cm->id ?>" />
<input type="hidden" name="action" value="insertelements" />
<center><table cellpadding=5 border=1>
<center><table cellpadding="5" border="1">
<?php
// get existing elements, if none set up appropriate default ones
@@ -319,12 +319,12 @@
case 0: // no grading
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 "<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></tr>\n";
echo "<tr valign=top>\n";
echo " <td colspan=2 BGCOLOR=\"$THEME->cellheading2\">&nbsp;</td>\n";
echo "<tr valign=\"top\">\n";
echo " <td colspan=\"2\" bgcolor=\"$THEME->cellheading2\">&nbsp;</td>\n";
echo "</tr>\n";
}
break;
@@ -336,24 +336,24 @@
}
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 "<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></tr>\n";
echo "<tr valign=top>\n";
echo " <td align=right><p><b>". get_string("typeofscale", "workshop"). ":</b></p></td>\n";
echo "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("typeofscale", "workshop"). ":</b></p></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 "<tr valign=top><td ALIGN=RIGHT><b>".get_string("elementweight", "workshop").":</b></td><td>\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";
echo "</tr>\n";
echo "<tr valign=top>\n";
echo " <td colspan=2 BGCOLOR=\"$THEME->cellheading2\">&nbsp;</td>\n";
echo "<tr valign=\"top\">\n";
echo " <td colspan=\"2\" bgcolor=\"$THEME->cellheading2\">&nbsp;</td>\n";
echo "</tr>\n";
}
break;
@@ -361,32 +361,32 @@
case 2: // error banded grading
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 "<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></tr>\n";
if ($elements[$i]->weight == '') { // not set
$elements[$i]->weight = 11; // unity
}
echo "</tr>\n";
echo "<tr valign=top><td ALIGN=RIGHT><b>".get_string("elementweight", "workshop").":</b></td><td>\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";
echo "</tr>\n";
echo "<tr valign=top>\n";
echo " <td colspan=2 BGCOLOR=\"$THEME->cellheading2\">&nbsp;</td>\n";
echo "<tr valign=\"top\">\n";
echo " <td colspan=\"2\" bgcolor=\"$THEME->cellheading2\">&nbsp;</td>\n";
echo "</tr>\n";
}
echo "</center></table><br />\n";
echo "<p><center><b>".get_string("gradetable","workshop")."</b></center>\n";
echo "<center><table cellpadding=5 border=1><tr><td ALIGN=\"CENTER\">".
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";
for ($j = $workshop->grade; $j >= 0; $j--) {
$numbers[$j] = $j;
}
for ($i=0; $i<=$workshop->nelements; $i++) {
echo "<tr><td ALIGN=\"CENTER\">$i</td><td ALIGN=\"CENTER\">";
echo "<tr><td align=\"CENTER\">$i</td><td align=\"CENTER\">";
if (!isset($elements[$i])) { // the "last one" will be!
$elements[$i]->description = "";
$elements[$i]->maxscore = 0;
@@ -403,15 +403,15 @@
}
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 "<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></tr>\n";
echo "<tr><td><b>". get_string("suggestedgrade", "workshop").":</b></td><td>\n";
choose_from_menu($numbers, "maxscore[$i]", $elements[$i]->maxscore, "");
echo "</td></tr>\n";
echo "<tr valign=top>\n";
echo " <td colspan=2 BGCOLOR=\"$THEME->cellheading2\">&nbsp;</td>\n";
echo "<tr valign=\"top\">\n";
echo " <td colspan=\"2\" bgcolor=\"$THEME->cellheading2\">&nbsp;</td>\n";
echo "</tr>\n";
}
break;
@@ -427,11 +427,11 @@
}
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 "<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></tr>\n";
echo "<tr valign=top><td ALIGN=RIGHT><b>".get_string("elementweight", "workshop").":</b></td><td>\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";
echo "</tr>\n";
@@ -441,13 +441,13 @@
if (empty($rubrics[$i][$j])) {
$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 "<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></tr>\n";
}
echo "<tr valign=top>\n";
echo " <td colspan=2 BGCOLOR=\"$THEME->cellheading2\">&nbsp;</td>\n";
echo "<tr valign=\"top\">\n";
echo " <td colspan=\"2\" bgcolor=\"$THEME->cellheading2\">&nbsp;</td>\n";
echo "</tr>\n";
}
break;
@@ -457,7 +457,7 @@
?>
</table>
<input type="submit" value="<?php print_string("savechanges") ?>" />
<input type="submit" name=cancel value="<?php print_string("cancel") ?>" />
<input type="submit" name="cancel" value="<?php print_string("cancel") ?>" />
</center>
</form>
<?php
@@ -509,30 +509,30 @@
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'] ?>" />
<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'] ?>" />
<center>
<table CELLPADDING=5 BORDER=1>
<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 "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("teacherscomment", "workshop").":</b></p></td>\n";
echo " <td>\n";
echo " <textarea name=\"teachercomment\" rows=5 cols=75 wrap=\"virtual\">\n";
echo " <textarea name=\"teachercomment\" rows=\"5\" cols=\"75\" wrap=\"virtual\">\n";
if (isset($assessment->teachercomment)) {
echo $assessment->teachercomment;
}
echo "</textarea>\n";
echo " </td>\n";
echo "</tr>\n";
echo "<tr><td ALIGN=RIGHT><b>".get_string("gradeforstudentsassessment", "workshop")."</td><td>\n";
echo "<tr><td align=\"right\"><b>".get_string("gradeforstudentsassessment", "workshop")."</td><td>\n";
choose_from_menu($num, "gradinggrade", $assessment->gradinggrade, "");
echo "</td></tr></table>\n";
echo "<input TYPE=submit VALUE=\"".get_string("savemygrading", "workshop")."\" />\n";
echo "<input type=\"submit\" value=\"".get_string("savemygrading", "workshop")."\" />\n";
echo "</center></form>\n";
}
mod/workshop/index.php
+5 -5
View File
@@ -66,15 +66,15 @@
$submitted = userdate($submission->timecreated);
}
else {
$submitted = "<font COLOR=red>".userdate($submission->timecreated)."</font>";
$submitted = "<font color=\"red\">".userdate($submission->timecreated)."</font>";
}
$due = userdate($workshop->deadline);
if (!$workshop->visible) {
//Show dimmed if the mod is hidden
$link = "<a class=\"dimmed\" HREF=\"view.php?id=$workshop->coursemodule\">$workshop->name</a><br />";
$link = "<a class=\"dimmed\" href=\"view.php?id=$workshop->coursemodule\">$workshop->name</a><br />";
} else {
//Show normal if the mod is visible
$link = "<a HREF=\"view.php?id=$workshop->coursemodule\">$workshop->name</a><br />";
$link = "<a href=\"view.php?id=$workshop->coursemodule\">$workshop->name</a><br />";
}
if (isstudent($course->id)) {
$link .= " ($submission->title)"; // show students the title of their submission(s)
@@ -100,10 +100,10 @@
$due = userdate($workshop->deadline);
if (!$workshop->visible) {
//Show dimmed if the mod is hidden
$link = "<a class=\"dimmed\" HREF=\"view.php?id=$workshop->coursemodule\">$workshop->name</a>";
$link = "<a class=\"dimmed\" href=\"view.php?id=$workshop->coursemodule\">$workshop->name</a>";
} else {
//Show normal if the mod is visible
$link = "<a HREF=\"view.php?id=$workshop->coursemodule\">$workshop->name</a>";
$link = "<a href=\"view.php?id=$workshop->coursemodule\">$workshop->name</a>";
}
if ($course->format == "weeks" or $course->format == "topics") {
$table->data[] = array ($workshop->section, $link, $info, $submitted, $due);
mod/workshop/lib.php
+38 -38
View File
@@ -202,14 +202,14 @@ function workshop_cron () {
$posttext .= " $CFG->wwwroot/mod/workshop/view.php?id=$cm->id\n";
$posttext .= "---------------------------------------------------------------------\n";
if ($sendto->mailformat == 1) { // HTML
$posthtml = "<p><font FACE=sans-serif>".
"<a HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->".
"<a HREF=\"$CFG->wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops</a> ->".
"<a HREF=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</a></font></p>";
$posthtml .= "<hr><font FACE=sans-serif>";
$posthtml = "<p><font face=\"sans-serif\">".
"<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->".
"<a href=\"$CFG->wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops</a> ->".
"<a href=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</a></font></p>";
$posthtml .= "<hr><font face=\"sans-serif\">";
$posthtml .= "<p>$msg</p>";
$posthtml .= "<p>".get_string("mail3", "workshop").
" <a HREF=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</a>.</p></font><hr>";
" <a href=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</a>.</p></font><hr>";
} else {
$posthtml = "";
}
@@ -291,14 +291,14 @@ function workshop_cron () {
$posttext .= " $CFG->wwwroot/mod/workshop/view.php?id=$cm->id\n";
$posttext .= "---------------------------------------------------------------------\n";
if ($sendto->mailformat == 1) { // HTML
$posthtml = "<p><font FACE=sans-serif>".
"<a HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->".
"<a HREF=\"$CFG->wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops</a> ->".
"<a HREF=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</a></font></p>";
$posthtml .= "<hr><font FACE=sans-serif>";
$posthtml = "<p><font face=\"sans-serif\">".
"<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->".
"<a href=\"$CFG->wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops</a> ->".
"<a href=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</a></font></p>";
$posthtml .= "<hr><font face=\"sans-serif\">";
$posthtml .= "<p>$msg</p>";
$posthtml .= "<p>".get_string("mail3", "workshop").
" <a HREF=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</a>.</p></font><hr>";
" <a href=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</a>.</p></font><hr>";
}
else {
$posthtml = "";
@@ -391,14 +391,14 @@ function workshop_cron () {
$posttext .= " $CFG->wwwroot/mod/workshop/view.php?id=$cm->id\n";
$posttext .= "---------------------------------------------------------------------\n";
if ($sendto->mailformat == 1) { // HTML
$posthtml = "<p><font FACE=sans-serif>".
"<a HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->".
"<a HREF=\"$CFG->wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops</a> ->".
"<a HREF=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</a></font></p>";
$posthtml .= "<hr><font FACE=sans-serif>";
$posthtml = "<p><font face=\"sans-serif\">".
"<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->".
"<a href=\"$CFG->wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops</a> ->".
"<a href=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</a></font></p>";
$posthtml .= "<hr><font face=\"sans-serif\">";
$posthtml .= "<p>$msg</p>";
$posthtml .= "<p>".get_string("mail3", "workshop").
" <a HREF=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</a>
" <a href=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</a>
.</p></font><hr>";
}
else {
@@ -438,14 +438,14 @@ function workshop_cron () {
$posttext .= " $CFG->wwwroot/mod/workshop/view.php?id=$cm->id\n";
$posttext .= "---------------------------------------------------------------------\n";
if ($sendto->mailformat == 1) { // HTML
$posthtml = "<p><font FACE=sans-serif>".
"<a HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->".
"<a HREF=\"$CFG->wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops</a> ->".
"<a HREF=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</a></font></p>";
$posthtml .= "<hr><font FACE=sans-serif>";
$posthtml = "<p><font face=\"sans-serif\">".
"<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->".
"<a href=\"$CFG->wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops</a> ->".
"<a href=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</a></font></p>";
$posthtml .= "<hr><font face=\"sans-serif\">";
$posthtml .= "<p>$msg</p>";
$posthtml .= "<p>".get_string("mail3", "workshop").
" <a HREF=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</a>.</p></font><hr>";
" <a href=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</a>.</p></font><hr>";
}
else {
$posthtml = "";
@@ -534,14 +534,14 @@ function workshop_cron () {
$posttext .= " $CFG->wwwroot/mod/workshop/view.php?id=$cm->id\n";
$posttext .= "---------------------------------------------------------------------\n";
if ($sendto->mailformat == 1) { // HTML
$posthtml = "<p><font FACE=sans-serif>".
"<a HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->".
"<a HREF=\"$CFG->wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops</a> ->".
"<a HREF=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</a></font></p>";
$posthtml .= "<hr><font FACE=sans-serif>";
$posthtml = "<p><font face=\"sans-serif\">".
"<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->".
"<a href=\"$CFG->wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops</a> ->".
"<a href=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</a></font></p>";
$posthtml .= "<hr><font face=\"sans-serif\">";
$posthtml .= "<p>$msg</p>";
$posthtml .= "<p>".get_string("mail3", "workshop").
" <a HREF=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</a>.</p></font><hr>";
" <a href=\"$CFG->wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name</a>.</p></font><hr>";
} else {
$posthtml = "";
}
@@ -691,10 +691,10 @@ function workshop_print_recent_activity($course, $isteacher, $timestart) {
if (instance_is_visible("workshop",$tempmod)) {
$date = userdate($log->time, $strftimerecent);
if (isteacher($course->id, $log->userid)) {
echo "<p><font size=1>$date - ".fullname($log)."<br />";
echo "<p><font size=\"1\">$date - ".fullname($log)."<br />";
}
else { // don't break anonymous rule
echo "<p><font size=1>$date - A $course->student<br />";
echo "<p><font size=\"1\">$date - A $course->student<br />";
}
echo "\"<a href=\"$CFG->wwwroot/mod/workshop/$log->url\">";
echo "$log->name";
@@ -732,10 +732,10 @@ function workshop_print_recent_activity($course, $isteacher, $timestart) {
if (instance_is_visible("workshop",$tempmod)) {
$date = userdate($log->time, $strftimerecent);
if (isteacher($course->id, $log->userid)) {
echo "<p><font size=1>$date - ".fullname($log)."<br />";
echo "<p><font size=\"1\">$date - ".fullname($log)."<br />";
}
else { // don't break anonymous rule
echo "<p><font size=1>$date - A $course->student<br />";
echo "<p><font size=\"1\">$date - A $course->student<br />";
}
echo "\"<a href=\"$CFG->wwwroot/mod/workshop/$log->url\">";
echo "$log->name";
@@ -772,7 +772,7 @@ function workshop_print_recent_activity($course, $isteacher, $timestart) {
//Obtain the visible property from the instance
if (instance_is_visible("workshop",$tempmod)) {
$date = userdate($log->time, $strftimerecent);
echo "<p><font size=1>$date - A $course->student<br />";
echo "<p><font size=\"1\">$date - A $course->student<br />";
echo "\"<a href=\"$CFG->wwwroot/mod/workshop/$log->url\">";
echo "$log->name";
echo "</a>\"</font></p>";
@@ -807,7 +807,7 @@ function workshop_print_recent_activity($course, $isteacher, $timestart) {
//Obtain the visible property from the instance
if (instance_is_visible("workshop",$tempmod)) {
$date = userdate($log->time, $strftimerecent);
echo "<p><font size=1>$date - $course->teacher<br />";
echo "<p><font size=\"1\">$date - $course->teacher<br />";
echo "\"<a href=\"$CFG->wwwroot/mod/workshop/$log->url\">";
echo "$log->name";
echo "</a>\"</font></p>";
@@ -842,7 +842,7 @@ function workshop_print_recent_activity($course, $isteacher, $timestart) {
//Obtain the visible property from the instance
if (instance_is_visible("workshop",$tempmod)) {
$date = userdate($log->time, $strftimerecent);
echo "<p><font size=1>$date - ".fullname($log)."<br />";
echo "<p><font size=\"1\">$date - ".fullname($log)."<br />";
echo "\"<a href=\"$CFG->wwwroot/mod/workshop/$log->url\">";
echo "$log->name";
echo "</a>\"</font></p>";
@@ -1105,7 +1105,7 @@ function workshop_print_recent_mod_activity($activity, $course, $detail=false) {
if ($detail) {
echo "<img src=\"$CFG->modpixpath/$activity->type/icon.gif\" ".
"height=16 width=16 alt=\"$activity->name\"> ";
"height=16 width=\"16\" alt=\"$activity->name\" /> ";
}
echo "<a href=\"$CFG->wwwroot/mod/workshop/view.php?"
. "#" . $activity->content->id . "\">".$activity->content->title;
mod/workshop/locallib.php
+128 -128
View File
@@ -101,19 +101,19 @@ 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";
$output .= " <option value=\"$nothingvalue\"\n";
if ($nothingvalue == $selected) {
$output .= " SELECTED";
$output .= " selected=\"selected\"";
}
$output .= ">$nothing</option>\n";
}
if (!empty($options)) {
foreach ($options as $value => $label) {
$output .= " <option VALUE=\"$value\"";
$output .= " <option value=\"$value\"";
if ($value == $selected) {
$output .= " SELECTED";
$output .= " selected=\"selected\"";
}
// stop zero label being replaced by array index value
// if ($label) {
@@ -711,7 +711,7 @@ function workshop_list_all_submissions($workshop, $user) {
AND userid = $user->id")) {
$curtime = time();
if (($curtime - $assessment->timecreated) > $CFG->maxeditingtime) {
$action = "<a HREF=\"assessments.php?action=viewassessment&id=$cm->id&aid=$assessment->id\">"
$action = "<a href=\"assessments.php?action=viewassessment&id=$cm->id&aid=$assessment->id\">"
.get_string("view", "workshop")."</a>";
// has teacher graded user's assessment?
if ($assessment->timegraded) {
@@ -721,12 +721,12 @@ function workshop_list_all_submissions($workshop, $user) {
}
}
else { // there's still time left to edit...
$action = "<a HREF=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
$action = "<a href=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
get_string("edit", "workshop")."</a>";
}
}
else { // user has not graded this submission
$action = "<a HREF=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
$action = "<a href=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
get_string("assess", "workshop")."</a>";
}
$table->data[] = array(workshop_print_submission_title($workshop, $submission), $action,
@@ -758,7 +758,7 @@ function workshop_list_all_submissions($workshop, $user) {
AND userid = $user->id")) {
$curtime = time();
if (($curtime - $assessment->timecreated) > $CFG->maxeditingtime) {
$action = "<a HREF=\"assessments.php?action=viewassessment&id=$cm->id&aid=$assessment->id\">".
$action = "<a href=\"assessments.php?action=viewassessment&id=$cm->id&aid=$assessment->id\">".
get_string("view", "workshop")."</a>";
// has teacher graded on user's assessment?
if ($assessment->timegraded) {
@@ -768,17 +768,17 @@ function workshop_list_all_submissions($workshop, $user) {
}
$otherassessments = workshop_get_assessments($submission);
if (count($otherassessments) > 1) {
$comment .= "<a HREF=\"assessments.php?action=viewallassessments&id=$cm->id&sid=$submission->id\">".
$comment .= "<a href=\"assessments.php?action=viewallassessments&id=$cm->id&sid=$submission->id\">".
get_string("viewotherassessments", "workshop")."</a>";
}
}
else { // there's still time left to edit...
$action = "<a HREF=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
$action = "<a href=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
get_string("edit", "workshop")."</a>";
}
}
else { // user has not assessed this submission
$action = "<a HREF=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
$action = "<a href=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
get_string("assess", "workshop")."</a>";
}
$table->data[] = array(workshop_print_submission_title($workshop, $submission), $action,
@@ -809,11 +809,11 @@ function workshop_list_all_ungraded_assessments($workshop) {
foreach ($assessments as $assessment) {
if (!isteacher($workshop->course, $assessment->userid)) {
if (($timenow - $assessment->timegraded) < $CFG->maxeditingtime) {
$action = "<a HREF=\"assessments.php?action=gradeassessment&id=$cm->id&aid=$assessment->id\">".
$action = "<a href=\"assessments.php?action=gradeassessment&id=$cm->id&aid=$assessment->id\">".
get_string("edit", "workshop")."</a>";
}
else {
$action = "<a HREF=\"assessments.php?action=gradeassessment&id=$cm->id&aid=$assessment->id\">".
$action = "<a href=\"assessments.php?action=gradeassessment&id=$cm->id&aid=$assessment->id\">".
get_string("gradeassessment", "workshop")."</a>";
}
$submission = get_record("workshop_submissions", "id", $assessment->submissionid);
@@ -859,20 +859,20 @@ function workshop_list_assessed_submissions($workshop, $user) {
if ($assessment->timecreated < ($timenow - $CFG->maxeditingtime)) { // it's cold
if ($workshop->agreeassessments) {
if (!$assessment->timeagreed) {
$action = "<a HREF=\"assessments.php?action=viewassessment&id=$cm->id&aid=$assessment->id&".
$action = "<a href=\"assessments.php?action=viewassessment&id=$cm->id&aid=$assessment->id&".
"allowcomments=$workshop->agreeassessments\">".
get_string("view", "workshop")."</a>";
$action .= " | <a HREF=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
$action .= " | <a href=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
get_string("reassess", "workshop")."</a>";
} else {
$action = "";
}
} else {
if ($assessment->timegraded) {
$action = "<a HREF=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
$action = "<a href=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
get_string("reassess", "workshop")."</a>";
} else {
$action = "<a HREF=\"assessments.php?action=viewassessment&id=$cm->id&aid=$assessment->id\">".
$action = "<a href=\"assessments.php?action=viewassessment&id=$cm->id&aid=$assessment->id\">".
get_string("view", "workshop")."</a>";
}
}
@@ -943,7 +943,7 @@ function workshop_list_peer_assessments($workshop, $user) {
($assessment->userid != $user->id)) {
$timenow = time();
if (($timenow - $assessment->timecreated) > $CFG->maxeditingtime) {
$action = "<a HREF=\"assessments.php?action=viewassessment&id=$cm->id&aid=$assessment->id&".
$action = "<a href=\"assessments.php?action=viewassessment&id=$cm->id&aid=$assessment->id&".
"allowcomments=$workshop->agreeassessments\">".
get_string("view", "workshop")."</a>";
$comment = get_string("assessedon", "workshop", userdate($assessment->timecreated));
@@ -1014,7 +1014,7 @@ function workshop_list_self_assessments($workshop, $user) {
if ($submission->userid == $user->id) { // this will always be true
$comment = get_string("ownwork", "workshop"); // just in case they don't know!
}
$action = "<a HREF=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
$action = "<a href=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
get_string("assess", "workshop")."</a>";
$table->data[] = array(workshop_print_submission_title($workshop, $submission), $action, $comment);
}
@@ -1134,12 +1134,12 @@ function workshop_list_student_submissions($workshop, $user) {
// just assessed but still editable [warm]; and "static" (may or may not have been graded by teacher, that
// is shown in the comment) [cold]
if ($assessment->timecreated > $timenow) { // user needs to assess this submission
$action = "<a HREF=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
$action = "<a href=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
get_string("assess", "workshop")."</a>";
$table->data[] = array(workshop_print_submission_title($workshop, $submission), $action, $comment);
}
elseif ($assessment->timecreated > ($timenow - $CFG->maxeditingtime)) { // there's still time left to edit...
$action = "<a HREF=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
$action = "<a href=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
get_string("edit", "workshop")."</a>";
$table->data[] = array(workshop_print_submission_title($workshop, $submission), $action, $comment);
}
@@ -1403,7 +1403,7 @@ function workshop_list_teacher_assessments($workshop, $user) {
if ($assessments = workshop_get_assessments($submission)) {
foreach ($assessments as $assessment) {
if (isteacher($workshop->course, $assessment->userid)) { // assessments by teachers only
$action = "<a HREF=\"assessments.php?action=viewassessment&id=$cm->id&aid=$assessment->id\">".
$action = "<a href=\"assessments.php?action=viewassessment&id=$cm->id&aid=$assessment->id\">".
get_string("view", "workshop")."</a>";
// has teacher commented on teacher's assessment? shouldn't happen but leave test in
if ($assessment->timegraded and ($timenow - $assessment->timegraded > $CFG->maxeditingtime)) {
@@ -1497,16 +1497,16 @@ function workshop_list_teacher_submissions($workshop, $user) {
// user assessment has two states: record created but not assessed (date created in the future);
// assessed but always available for re-assessment
if ($assessment->timecreated > $timenow) { // user needs to assess this submission
$action = "<a HREF=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
$action = "<a href=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
get_string("assess", "workshop")."</a>";
}
elseif ($assessment->timegraded) {
// allow student to improve on their assessment once it's been graded
$action = "<a HREF=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
$action = "<a href=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
get_string("reassess", "workshop")."</a>";
} else {
// allow student just to see their assessment if it hasn't been graded
$action = "<a HREF=\"assessments.php?action=viewassessment&id=$cm->id&aid=$assessment->id\">".
$action = "<a href=\"assessments.php?action=viewassessment&id=$cm->id&aid=$assessment->id\">".
get_string("view", "workshop")."</a>";
}
// see if the assessment is graded
@@ -1568,7 +1568,7 @@ function workshop_list_unassessed_student_submissions($workshop, $user) {
if (($timenow - $assessment->timecreated < $CFG->maxeditingtime)) {
// last chance salon
$submissionowner = get_record("user", "id", $submission->userid);
$action = "<a HREF=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
$action = "<a href=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
get_string("edit", "workshop")."</a>";
$table->data[] = array(workshop_print_submission_title($workshop, $submission),
fullname($submissionowner), $action, $comment);
@@ -1576,7 +1576,7 @@ function workshop_list_unassessed_student_submissions($workshop, $user) {
}
else { // no assessment
$submissionowner = get_record("user", "id", $submission->userid);
$action = "<a HREF=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
$action = "<a href=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
get_string("assess", "workshop")."</a>";
$table->data[] = array(workshop_print_submission_title($workshop, $submission),
fullname($submissionowner), $action, $comment);
@@ -1614,13 +1614,13 @@ function workshop_list_unassessed_teacher_submissions($workshop, $user) {
$timenow = time();
if (($timenow - $assessment->timecreated < $CFG->maxeditingtime)) {
// last chance salon
$action = "<a HREF=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
$action = "<a href=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
get_string("edit", "workshop")."</a>";
$table->data[] = array(workshop_print_submission_title($workshop, $submission), $action, $comment);
}
}
else { // no assessment
$action = "<a HREF=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
$action = "<a href=\"assessments.php?action=assesssubmission&id=$cm->id&sid=$submission->id\">".
get_string("assess", "workshop")."</a>";
$table->data[] = array(workshop_print_submission_title($workshop, $submission), $action, $comment);
}
@@ -1661,11 +1661,11 @@ function workshop_list_ungraded_assessments($workshop, $stype) {
foreach ($assessments as $assessment) {
if (!isteacher($workshop->course, $assessment->userid)) { // don't let teacher grade their own assessments
if (($timenow - $assessment->timegraded) < $CFG->maxeditingtime) {
$action = "<a HREF=\"assessments.php?action=gradeassessment&id=$cm->id&stype=$stype&aid=$assessment->id\">".
$action = "<a href=\"assessments.php?action=gradeassessment&id=$cm->id&stype=$stype&aid=$assessment->id\">".
get_string("edit", "workshop")."</a>";
}
else {
$action = "<a HREF=\"assessments.php?action=gradeassessment&id=$cm->id&stype=$stype&aid=$assessment->id\">".
$action = "<a href=\"assessments.php?action=gradeassessment&id=$cm->id&stype=$stype&aid=$assessment->id\">".
get_string("grade", "workshop")."</a>";
}
$submission = get_record("workshop_submissions", "id", $assessment->submissionid);
@@ -1749,13 +1749,13 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
$showgrades = true;
}
echo "<center><table BORDER=\"1\" WIDTH=\"30%\"><tr>
<td ALIGN=CENTER BGCOLOR=\"$THEME->cellcontent\">\n";
echo "<center><table border=\"1\" width=\"30%\"><tr>
<td align=\"center\" bgcolor=\"$THEME->cellcontent\">\n";
if (!$submission = get_record("workshop_submissions", "id", $assessment->submissionid)) {
error ("Workshop_print_assessment: Submission record not found");
}
echo workshop_print_submission_title($workshop, $submission);
echo "</td></tr></table><br CLEAR=ALL />\n";
echo "</td></tr></table><br clear=\"all\" />\n";
// see if this is a pre-filled assessment for a re-submission...
if ($assessment->resubmission) {
@@ -1770,10 +1770,10 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
// first print any comments on this assessment
if ($comments = workshop_get_comments($assessment)) {
echo "<table CELLPADDING=2 BORDER=1>\n";
echo "<table cellpadding=\"2\" border=\"1\">\n";
$firstcomment = TRUE;
foreach ($comments as $comment) {
echo "<tr valign=top><td BGCOLOR=\"$THEME->cellheading2\"><p><b>".
echo "<tr valign=\"top\"><td bgcolor=\"$THEME->cellheading2\"><p><b>".
get_string("commentby","workshop")." ";
if (isteacher($workshop->course, $comment->userid)) {
echo $course->teacher;
@@ -1791,23 +1791,23 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
// show links depending on who doing the viewing
$firstcomment = FALSE;
if (isteacher($workshop->course, $USER->id) and ($comment->userid != $USER->id)) {
echo "<p ALIGN=RIGHT><a HREF=\"assessments.php?action=addcomment&id=$cm->id&aid=$assessment->id\">".
echo "<p align=\"right\"><a href=\"assessments.php?action=addcomment&id=$cm->id&aid=$assessment->id\">".
get_string("reply", "workshop")."</a>\n";
}
elseif (($comment->userid ==$USER->id) and (($timenow - $comment->timecreated) < $CFG->maxeditingtime)) {
echo "<p ALIGN=RIGHT><a HREF=\"assessments.php?action=editcomment&id=$cm->id&cid=$comment->id\">".
echo "<p align=\"right\"><a href=\"assessments.php?action=editcomment&id=$cm->id&cid=$comment->id\">".
get_string("edit", "workshop")."</a>\n";
if ($USER->id == $submission->userid) {
echo " | <a HREF=\"assessments.php?action=agreeassessment&id=$cm->id&aid=$assessment->id\">".
echo " | <a href=\"assessments.php?action=agreeassessment&id=$cm->id&aid=$assessment->id\">".
get_string("agreetothisassessment", "workshop")."</a>\n";
}
}
elseif (($comment->userid != $USER->id) and (($USER->id == $assessment->userid) or
($USER->id == $submission->userid))) {
echo "<p ALIGN=RIGHT><a HREF=\"assessments.php?action=addcomment&id=$cm->id&aid=$assessment->id\">".
echo "<p align=\"right\"><a href=\"assessments.php?action=addcomment&id=$cm->id&aid=$assessment->id\">".
get_string("reply", "workshop")."</a>\n";
if ($USER->id == $submission->userid) {
echo " | <a HREF=\"assessments.php?action=agreeassessment&id=$cm->id&aid=$assessment->id\">".
echo " | <a href=\"assessments.php?action=agreeassessment&id=$cm->id&aid=$assessment->id\">".
get_string("agreetothisassessment", "workshop")."</a>\n";
}
}
@@ -1820,7 +1820,7 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
// only show the grade if grading strategy > 0 and the grade is positive
if ($showgrades and $workshop->gradingstrategy and $assessment->grade >= 0) {
echo "<center><b>".get_string("thegradeis", "workshop").": ".number_format($assessment->grade, 2)." (".
get_string("maximumgrade")." ".number_format($workshop->grade, 0).")</b></center><br CLEAR=ALL />\n";
get_string("maximumgrade")." ".number_format($workshop->grade, 0).")</b></center><br clear=\"all\" />\n";
}
}
@@ -1833,10 +1833,10 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
<input type="hidden" name="action" value="updateassessment" />
<input type="hidden" name="returnto" value="<?php echo $returnto ?>" />
<center>
<table cellpadding=2 border=1>
<table cellpadding="2" border="1">
<?php
echo "<tr valign=top>\n";
echo " <td colspan=2 bgcolor=\"$THEME->cellheading2\"><center><b>".get_string("assessment", "workshop").
echo "<tr valign=\"top\">\n";
echo " <td colspan=\"2\" bgcolor=\"$THEME->cellheading2\"><center><b>".get_string("assessment", "workshop").
"</b></center></td>\n";
echo "</tr>\n";
@@ -1875,15 +1875,15 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
// now print the form
for ($i=0; $i < count($elements); $i++) {
$iplus1 = $i+1;
echo "<tr valign=top>\n";
echo " <td align=right><p><b>". get_string("element","workshop")." $iplus1:</b></p></td>\n";
echo "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("element","workshop")." $iplus1:</b></p></td>\n";
echo " <td>".text_to_html($elements[$i]->description);
echo "</td></tr>\n";
echo "<tr valign=top>\n";
echo " <td align=right><p><b>". get_string("feedback").":</b></p></td>\n";
echo "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("feedback").":</b></p></td>\n";
echo " <td>\n";
if ($allowchanges) {
echo " <textarea name=\"feedback[]\" rows=3 cols=75 wrap=\"virtual\">\n";
echo " <textarea name=\"feedback[]\" rows=\"3\" cols=\"75\" wrap=\"virtual\">\n";
if (isset($grades[$i]->feedback)) {
echo $grades[$i]->feedback;
}
@@ -1894,8 +1894,8 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
}
echo " </td>\n";
echo "</tr>\n";
echo "<tr valign=top>\n";
echo " <td COLSPAN=2 BGCOLOR=\"$THEME->cellheading2\">&nbsp;</td>\n";
echo "<tr valign=\"top\">\n";
echo " <td colspan=\"2\" bgcolor=\"$THEME->cellheading2\">&nbsp;</td>\n";
echo "</tr>\n";
}
break;
@@ -1904,15 +1904,15 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
// now print the form
for ($i=0; $i < count($elements); $i++) {
$iplus1 = $i+1;
echo "<tr valign=top>\n";
echo " <td align=right><p><b>". get_string("element","workshop")." $iplus1:</b></p></td>\n";
echo "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("element","workshop")." $iplus1:</b></p></td>\n";
echo " <td>".text_to_html($elements[$i]->description);
echo "<p align=right><font size=1>".get_string("weight", "workshop").": ".
echo "<p align=\"right\"><font size=\"1\">".get_string("weight", "workshop").": ".
number_format($WORKSHOP_EWEIGHTS[$elements[$i]->weight], 2)."</font>\n";
echo "</td></tr>\n";
if ($showgrades) {
echo "<tr valign=top>\n";
echo " <td align=right><p><b>". get_string("grade"). ":</b></p></td>\n";
echo "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("grade"). ":</b></p></td>\n";
echo " <td valign=\"top\">\n";
// get the appropriate scale
@@ -1935,10 +1935,10 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
}
}
if ($checked) {
echo " <input TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED=\"checked\" /> &nbsp;&nbsp;&nbsp;\n";
echo " <input type=\"RADIO\" name=\"grade[$i]\" value=\"$j\" checked=\"checked\" /> &nbsp;&nbsp;&nbsp;\n";
}
else {
echo " <input TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" /> &nbsp;&nbsp;&nbsp;\n";
echo " <input type=\"RADIO\" name=\"grade[$i]\" value=\"$j\" /> &nbsp;&nbsp;&nbsp;\n";
}
}
echo "&nbsp;&nbsp;&nbsp;<b>$SCALE->end</b></center>\n";
@@ -1960,11 +1960,11 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
echo " </td>\n";
echo "</tr>\n";
}
echo "<tr valign=top>\n";
echo " <td align=right><p><b>". get_string("feedback").":</b></p></td>\n";
echo "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("feedback").":</b></p></td>\n";
echo " <td>\n";
if ($allowchanges) {
echo " <textarea name=\"feedback[]\" rows=3 cols=75 wrap=\"virtual\">\n";
echo " <textarea name=\"feedback[]\" rows=\"3\" cols=\"75\" wrap=\"virtual\">\n";
if (isset($grades[$i]->feedback)) {
echo $grades[$i]->feedback;
}
@@ -1975,8 +1975,8 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
}
echo " </td>\n";
echo "</tr>\n";
echo "<tr valign=top>\n";
echo " <td COLSPAN=2 BGCOLOR=\"$THEME->cellheading2\">&nbsp;</td>\n";
echo "<tr valign=\"top\">\n";
echo " <td colspan=\"2\" bgcolor=\"$THEME->cellheading2\">&nbsp;</td>\n";
echo "</tr>\n";
}
break;
@@ -1986,14 +1986,14 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
$negativecount = 0;
for ($i=0; $i < count($elements) - 1; $i++) {
$iplus1 = $i+1;
echo "<tr valign=top>\n";
echo " <td align=right><p><b>". get_string("element","workshop")." $iplus1:</b></p></td>\n";
echo "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("element","workshop")." $iplus1:</b></p></td>\n";
echo " <td>".text_to_html($elements[$i]->description);
echo "<p align=right><font size=1>".get_string("weight", "workshop").": ".
echo "<p align=\"right\"><font size=\"1\">".get_string("weight", "workshop").": ".
number_format($WORKSHOP_EWEIGHTS[$elements[$i]->weight], 2)."</font>\n";
echo "</td></tr>\n";
echo "<tr valign=top>\n";
echo " <td align=right><p><b>". get_string("grade"). ":</b></p></td>\n";
echo "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("grade"). ":</b></p></td>\n";
echo " <td valign=\"top\">\n";
// get the appropriate scale - yes/no scale (0)
@@ -2015,10 +2015,10 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
}
}
if ($checked) {
echo " <input TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED=\"checked\" /> &nbsp;&nbsp;&nbsp;\n";
echo " <input type=\"RADIO\" name=\"grade[$i]\" value=\"$j\" checked=\"checked\" /> &nbsp;&nbsp;&nbsp;\n";
}
else {
echo " <input TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" /> &nbsp;&nbsp;&nbsp;\n";
echo " <input type=\"RADIO\" name=\"grade[$i]\" value=\"$j\" /> &nbsp;&nbsp;&nbsp;\n";
}
}
echo "&nbsp;&nbsp;&nbsp;<b>$SCALE->end</b></center>\n";
@@ -2039,11 +2039,11 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
echo " </td>\n";
echo "</tr>\n";
echo "<tr valign=top>\n";
echo " <td align=right><p><b>". get_string("feedback").":</b></p></td>\n";
echo "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("feedback").":</b></p></td>\n";
echo " <td>\n";
if ($allowchanges) {
echo " <textarea name=\"feedback[$i]\" rows=3 cols=75 wrap=\"virtual\">\n";
echo " <textarea name=\"feedback[$i]\" rows=\"3\" cols=\"75\" wrap=\"virtual\">\n";
if (isset($grades[$i]->feedback)) {
echo $grades[$i]->feedback;
}
@@ -2056,8 +2056,8 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
}
echo "&nbsp;</td>\n";
echo "</tr>\n";
echo "<tr valign=top>\n";
echo " <td COLSPAN=2 BGCOLOR=\"$THEME->cellheading2\">&nbsp;</td>\n";
echo "<tr valign=\"top\">\n";
echo " <td colspan=\"2\" bgcolor=\"$THEME->cellheading2\">&nbsp;</td>\n";
echo "</tr>\n";
if (empty($grades[$i]->grade)) {
$negativecount++;
@@ -2065,12 +2065,12 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
}
// print the number of negative elements
// echo "<tr><td>".get_string("numberofnegativeitems", "workshop")."</td><td>$negativecount</td></tr>\n";
// echo "<tr valign=top>\n";
// echo " <td COLSPAN=2 BGCOLOR=\"$THEME->cellheading2\">&nbsp;</td>\n";
// echo "<tr valign=\"top\">\n";
// echo " <td colspan=\"2\" bgcolor=\"$THEME->cellheading2\">&nbsp;</td>\n";
echo "</table></center>\n";
// now print the grade table
echo "<p><center><b>".get_string("gradetable","workshop")."</b></center>\n";
echo "<center><table cellpadding=5 border=1><tr><td ALIGN=\"CENTER\">".
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";
for ($j = 100; $j >= 0; $j--) {
@@ -2078,14 +2078,14 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
}
for ($i=0; $i<=$workshop->nelements; $i++) {
if ($i == $negativecount) {
echo "<tr><td ALIGN=\"CENTER\"><img SRC=\"$CFG->pixpath/t/right.gif\"> $i</td><td ALIGN=\"CENTER\">{$elements[$i]->maxscore}</td></tr>\n";
echo "<tr><td align=\"CENTER\"><img src=\"$CFG->pixpath/t/right.gif\" /> $i</td><td align=\"CENTER\">{$elements[$i]->maxscore}</td></tr>\n";
}
else {
echo "<tr><td ALIGN=\"CENTER\">$i</td><td ALIGN=\"CENTER\">{$elements[$i]->maxscore}</td></tr>\n";
echo "<tr><td align=\"CENTER\">$i</td><td align=\"CENTER\">{$elements[$i]->maxscore}</td></tr>\n";
}
}
echo "</table></center>\n";
echo "<p><center><table cellpadding=5 border=1><tr><td><b>".get_string("optionaladjustment",
echo "<p><center><table cellpadding=\"5\" border=\"1\"><tr><td><b>".get_string("optionaladjustment",
"workshop")."</b></td><td>\n";
unset($numbers);
for ($j = 20; $j >= -20; $j--) {
@@ -2101,11 +2101,11 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
break;
case 3: // criteria grading
echo "<tr valign=top>\n";
echo " <td BGCOLOR=\"$THEME->cellheading2\">&nbsp;</td>\n";
echo " <td BGCOLOR=\"$THEME->cellheading2\"><b>". get_string("criterion","workshop")."</b></td>\n";
echo " <td BGCOLOR=\"$THEME->cellheading2\"><b>".get_string("select", "workshop")."</b></td>\n";
echo " <td BGCOLOR=\"$THEME->cellheading2\"><b>".get_string("suggestedgrade", "workshop")."</b></td>\n";
echo "<tr valign=\"top\">\n";
echo " <td bgcolor=\"$THEME->cellheading2\">&nbsp;</td>\n";
echo " <td bgcolor=\"$THEME->cellheading2\"><b>". get_string("criterion","workshop")."</b></td>\n";
echo " <td bgcolor=\"$THEME->cellheading2\"><b>".get_string("select", "workshop")."</b></td>\n";
echo " <td bgcolor=\"$THEME->cellheading2\"><b>".get_string("suggestedgrade", "workshop")."</b></td>\n";
// find which criteria has been selected (saved in the zero element), if any
if (isset($grades[0]->grade)) {
$selection = $grades[0]->grade;
@@ -2116,18 +2116,18 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
// now run through the elements
for ($i=0; $i < count($elements); $i++) {
$iplus1 = $i+1;
echo "<tr valign=top>\n";
echo "<tr valign=\"top\">\n";
echo " <td>$iplus1</td><td>".text_to_html($elements[$i]->description)."</td>\n";
if ($selection == $i) {
echo " <td align=center><input TYPE=\"RADIO\" NAME=\"grade[0]\" VALUE=\"$i\" CHECKED=\"checked\" /></td>\n";
echo " <td align=\"center\"><input type=\"RADIO\" name=\"grade[0]\" value=\"$i\" checked=\"checked\" /></td>\n";
}
else {
echo " <td align=center><input TYPE=\"RADIO\" NAME=\"grade[0]\" VALUE=\"$i\" /></td>\n";
echo " <td align=\"center\"><input type=\"RADIO\" name=\"grade[0]\" value=\"$i\" /></td>\n";
}
echo "<td align=center>{$elements[$i]->maxscore}</td></tr>\n";
echo "<td align=\"center\">{$elements[$i]->maxscore}</td></tr>\n";
}
echo "</table></center>\n";
echo "<p><center><table cellpadding=5 border=1><tr><td><b>".get_string("optionaladjustment",
echo "<p><center><table cellpadding=\"5\" border=\"1\"><tr><td><b>".get_string("optionaladjustment",
"workshop")."</b></td><td>\n";
unset($numbers);
for ($j = 20; $j >= -20; $j--) {
@@ -2152,8 +2152,8 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
"<p align=\"right\"><font size=\"1\">".get_string("weight", "workshop").": ".
number_format($WORKSHOP_EWEIGHTS[$elements[$i]->weight], 2)."</font></td></tr>\n";
echo "<tr valign=\"top\">\n";
echo " <td BGCOLOR=\"$THEME->cellheading2\" align=\"center\"><b>".get_string("select", "workshop")."</b></td>\n";
echo " <td BGCOLOR=\"$THEME->cellheading2\"><b>". get_string("criterion","workshop")."</b></td></tr>\n";
echo " <td bgcolor=\"$THEME->cellheading2\" align=\"center\"><b>".get_string("select", "workshop")."</b></td>\n";
echo " <td bgcolor=\"$THEME->cellheading2\"><b>". get_string("criterion","workshop")."</b></td></tr>\n";
if (isset($grades[$i])) {
$selection = $grades[$i]->grade;
} else {
@@ -2170,19 +2170,19 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
if (empty($rubrics[$j]->description)) {
break; // out of inner for loop
}
echo "<tr valign=top>\n";
echo "<tr valign=\"top\">\n";
if ($selection == $j) {
echo " <td align=center><input TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED=\"checked\" /></td>\n";
echo " <td align=\"center\"><input type=\"RADIO\" name=\"grade[$i]\" value=\"$j\" checked=\"checked\" /></td>\n";
}else {
echo " <td align=center><input TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" /></td>\n";
echo " <td align=\"center\"><input type=\"RADIO\" name=\"grade[$i]\" value=\"$j\" /></td>\n";
}
echo "<td>".text_to_html($rubrics[$j]->description)."</td>\n";
}
echo "<tr valign=top>\n";
echo " <td align=right><p><b>". get_string("feedback").":</b></p></td>\n";
echo "<tr valign=\"top\">\n";
echo " <td align=\"right\"><p><b>". get_string("feedback").":</b></p></td>\n";
echo " <td>\n";
if ($allowchanges) {
echo " <textarea name=\"feedback[]\" rows=3 cols=75 wrap=\"virtual\">\n";
echo " <textarea name=\"feedback[]\" rows=\"3\" cols=\"75\" wrap=\"virtual\">\n";
if (isset($grades[$i]->feedback)) {
echo $grades[$i]->feedback;
}
@@ -2214,7 +2214,7 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
}
echo " <td>\n";
if ($allowchanges) {
echo " <textarea name=\"generalcomment\" rows=5 cols=75 wrap=\"virtual\">\n";
echo " <textarea name=\"generalcomment\" rows=\"5\" cols=\"75\" wrap=\"virtual\">\n";
if (isset($assessment->generalcomment)) {
echo $assessment->generalcomment;
}
@@ -2259,15 +2259,15 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
echo "</table>\n";
if ($assessment) {
if ($allowchanges) {
echo "<input type=\"submit\" VALUE=\"".get_string("savemyassessment", "workshop")."\" />\n";
echo "<input type=\"submit\" value=\"".get_string("savemyassessment", "workshop")."\" />\n";
}
// ...if user is author, assessment not agreed, there's no comments, the showcommentlinks flag is set and
// it's not self assessment then show some buttons!
if (($submission->userid == $USER->id) and !$assessment->timeagreed and !$comments and $showcommentlinks and
$submission->userid != $assessment->userid) {
echo "<input type=button VALUE=\"".get_string("agreetothisassessment", "workshop")."\"
echo "<input type=\"button\" value=\"".get_string("agreetothisassessment", "workshop")."\"
onclick=\"document.assessmentform.action.value='agreeassessment';document.assessmentform.submit();\" />\n";
echo "<input type=submit value=\"".get_string("disagreewiththisassessment", "workshop")."\"
echo "<input type=\"submit\" value=\"".get_string("disagreewiththisassessment", "workshop")."\"
onclick=\"document.assessmentform.action.value='addcomment';document.assessmentform.submit();\" />\n";
}
}
@@ -2351,7 +2351,7 @@ function workshop_print_assignment_info($workshop) {
function workshop_print_difference($time) {
if ($time < 0) {
$timetext = get_string("late", "assignment", format_time($time));
return " (<font COLOR=RED>$timetext</font>)";
return " (<font color=\"red\">$timetext</font>)";
} else {
$timetext = get_string("early", "assignment", format_time($time));
return " ($timetext)";
@@ -2367,20 +2367,20 @@ function workshop_print_feedback($course, $submission) {
error("Weird workshop error");
}
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=\"1\" cellspacing=\"1\" align=\"center\"><tr><td bgcolor=#888888>";
echo "\n<table border=\"0\" cellpadding=\"3\" cellspacing=\"0\" valign=\"top\">";
echo "\n<tr>";
echo "\n<td ROWSPAN=3 BGCOLOR=\"$THEME->body\" WIDTH=35 VALIGN=TOP>";
echo "\n<td rowspan=\"3\" bgcolor=\"$THEME->body\" width=\"35\" valign=\"top\">";
print_user_picture($teacher->id, $course->id, $teacher->picture);
echo "</td>";
echo "<td NOWRAP WIDTH=100% BGCOLOR=\"$THEME->cellheading\">".fullname($teacher);
echo "&nbsp;&nbsp;<font SIZE=2><i>".userdate($submission->timemarked)."</i>";
echo "<td nowrap=\"nowrap\" width=\"100%\" bgcolor=\"$THEME->cellheading\">".fullname($teacher);
echo "&nbsp;&nbsp;<font size=\"2\"><i>".userdate($submission->timemarked)."</i>";
echo "</tr>";
echo "\n<tr><td WIDTH=100% BGCOLOR=\"$THEME->cellcontent\">";
echo "\n<tr><td width=\"100%\" bgcolor=\"$THEME->cellcontent\">";
echo "<p ALIGN=RIGHT><font SIZE=-1><i>";
echo "<p align=\"right\"><font size=\"-1\"><i>";
if ($submission->grade) {
echo get_string("grade").": $submission->grade";
} else {
@@ -2571,8 +2571,8 @@ function workshop_print_submission_title($workshop, $submission) {
} else {
$ffurl = "file.php?file=/$filearea/$file";
}
return "<img SRC=\"$CFG->pixpath/f/$icon\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"File\">".
"&nbsp;<a TARGET=\"uploadedfile$submission->id\" HREF=\"$CFG->wwwroot/$ffurl\">$submission->title</a>";
return "<img src=\"$CFG->pixpath/f/$icon\" height=\"16\" width=\"16\" border=\"0\" alt=\"File\" />".
"&nbsp;<a target=\"uploadedfile$submission->id\" href=\"$CFG->wwwroot/$ffurl\">$submission->title</a>";
}
}
}
@@ -2623,7 +2623,7 @@ function workshop_print_tabbed_heading($tabs) {
if (!empty($tabs->names)) {
echo "<tr>";
echo "<td class=\"generaltablecell\">".
"<img width=\"10\" src=\"$CFG->wwwroot/pix/spacer.gif\" alt=\"\"></td>\n";
"<img width=\"10\" src=\"$CFG->wwwroot/pix/spacer.gif\" alt=\"\" /></td>\n";
foreach ($tabcontents as $key => $tab) {
if (isset($align[$key])) {
$alignment = "align=\"$align[$key]\"";
@@ -2641,12 +2641,12 @@ function workshop_print_tabbed_heading($tabs) {
$wrapping = "";
}
if ($key == $tabs->highlight) {
echo "<td valign=top class=\"generaltabselected\" $alignment $width $wrapping bgcolor=\"$THEME->cellheading2\">$tab</td>\n";
echo "<td valign=\"top\" class=\"generaltabselected\" $alignment $width $wrapping bgcolor=\"$THEME->cellheading2\">$tab</td>\n";
} else {
echo "<td valign=top class=\"generaltab\" $alignment $width $wrapping bgcolor=\"$THEME->cellheading\">$tab</td>\n";
echo "<td valign=\"top\" class=\"generaltab\" $alignment $width $wrapping bgcolor=\"$THEME->cellheading\">$tab</td>\n";
}
echo "<td class=\"generaltablecell\">".
"<img width=\"10\" src=\"$CFG->wwwroot/pix/spacer.gif\" alt=\"\"></td>\n";
"<img width=\"10\" src=\"$CFG->wwwroot/pix/spacer.gif\" alt=\"\" /></td>\n";
}
echo "</tr>\n";
} else {
@@ -2656,7 +2656,7 @@ function workshop_print_tabbed_heading($tabs) {
$ncells = count($tabs->names)*2 +1;
$height = 2;
echo "<tr><td colspan=\"$ncells\" bgcolor=\"$THEME->cellheading2\">".
"<img height=\"$height\" src=\"$CFG->wwwroot/pix/spacer.gif\" alt=\"\"></td></tr>\n";
"<img height=\"$height\" src=\"$CFG->wwwroot/pix/spacer.gif\" alt=\"\" /></td></tr>\n";
echo "</table>\n";
// print_simple_box_end();
@@ -2666,7 +2666,7 @@ function workshop_print_tabbed_heading($tabs) {
function workshop_print_time_to_deadline($time) {
if ($time < 0) {
$timetext = get_string("afterdeadline", "workshop", format_time($time));
return " (<font COLOR=RED>$timetext</font>)";
return " (<font color=\"red\">$timetext</font>)";
} else {
$timetext = get_string("beforedeadline", "workshop", format_time($time));
return " ($timetext)";
@@ -2685,13 +2685,13 @@ function workshop_print_upload_form($workshop) {
error("Course Module ID was incorrect");
}
echo "<div ALIGN=CENTER>";
echo "<form ENCTYPE=\"multipart/form-data\" METHOD=\"POST\" ACTION=upload.php>";
echo " <input TYPE=hidden NAME=MAX_FILE_SIZE value=\"$workshop->maxbytes\" />";
echo " <input TYPE=hidden NAME=id VALUE=\"$cm->id\" />";
echo "<b>".get_string("title", "workshop")."</b>: <input NAME=\"title\" TYPE=\"text\" SIZE=\"60\" MAXSIZE=\"100\" /><br /><br />\n";
echo " <input NAME=\"newfile\" TYPE=\"file\" size=\"50\" />";
echo " <input TYPE=submit NAME=save VALUE=\"".get_string("uploadthisfile")."\" />";
echo "<div align=\"center\">";
echo "<form enctype=\"multipart/form-data\" method=\"POST\" action=\"upload\".php>";
echo " <input type=\"hidden\" name=MAX_FILE_SIZE value=\"$workshop->maxbytes\" />";
echo " <input type=\"hidden\" name=\"id\" value=\"$cm->id\" />";
echo "<b>".get_string("title", "workshop")."</b>: <input name=\"title\" type=\"text\" size=\"60\" maxsize=\"100\" /><br /><br />\n";
echo " <input name=\"newfile\" type=\"file\" size=\"50\" />";
echo " <input type=\"submit\" name=\"save\" value=\"".get_string("uploadthisfile")."\" />";
echo "</form>";
echo "</div>";
}
mod/workshop/mod.html
+41 -41
View File
@@ -64,15 +64,15 @@
?>
<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>
<table cellpadding="5">
<tr valign="top">
<td align="right"><p><b><?php print_string("title", "workshop") ?>:</b></p></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) ?>" />
</td>
</tr>
<tr valign=top>
<td align=right><p><b><?php print_string("description", "workshop") ?>:</b></p>
<tr valign="top">
<td align="right"><p><b><?php print_string("description", "workshop") ?>:</b></p>
<font size="1">
<?php
helpbutton("writing", get_string("helpwriting"), "moodle", true, true);
@@ -109,8 +109,8 @@
</td>
</tr>
<tr valign=top>
<td align=right><p><b><?php print_string("gradeforassessments", "workshop") ?>:</b></p></td>
<tr valign="top">
<td align="right"><p><b><?php print_string("gradeforassessments", "workshop") ?>:</b></p></td>
<td>
<?php
for ($i=100; $i>=0; $i--) {
@@ -122,8 +122,8 @@
</td>
</tr>
<tr valign=top>
<td align=right><p><b><?php print_string("gradeforsubmission", "workshop") ?>:</b></p></td>
<tr valign="top">
<td align="right"><p><b><?php print_string("gradeforsubmission", "workshop") ?>:</b></p></td>
<td>
<?php
choose_from_menu($grades, "grade", "$form->grade", "");
@@ -132,8 +132,8 @@
</td>
</tr>
<tr valign=top>
<td align=right><p><b><?php print_string("gradingstrategy", "workshop") ?>:</b></p></td>
<tr valign="top">
<td align="right"><p><b><?php print_string("gradingstrategy", "workshop") ?>:</b></p></td>
<td>
<?php
choose_from_menu($WORKSHOP_TYPE, "gradingstrategy", $form->gradingstrategy, "");
@@ -142,8 +142,8 @@
</td>
</tr>
<tr valign=top>
<td align=right><p><b><?php print_string("numberofassessmentelements", "workshop") ?>:</b></p></td>
<tr valign="top">
<td align="right"><p><b><?php print_string("numberofassessmentelements", "workshop") ?>:</b></p></td>
<td valign="middle">
<?php
for ($i=20; $i>=0; $i--) {
@@ -156,7 +156,7 @@
</tr>
<tr>
<td align=right><p><b><?php print_string("allowresubmit", "workshop") ?>:</b></p></td>
<td align="right"><p><b><?php print_string("allowresubmit", "workshop") ?>:</b></p></td>
<td>
<?php
$options[0] = get_string("no"); $options[1] = get_string("yes");
@@ -166,8 +166,8 @@
</td>
</tr>
<tr valign=top>
<td align=right><p><b><?php print_string("numberofassessmentsofteachersexamples", "workshop") ?>:</b></p></td>
<tr valign="top">
<td align="right"><p><b><?php print_string("numberofassessmentsofteachersexamples", "workshop") ?>:</b></p></td>
<td>
<?php
unset($numbers);
@@ -181,7 +181,7 @@
</tr>
<tr>
<td align=right><p><b><?php print_string("comparisonofassessments", "workshop") ?>:</b></p></td>
<td align="right"><p><b><?php print_string("comparisonofassessments", "workshop") ?>:</b></p></td>
<td>
<?php
// set up comparison names
@@ -194,8 +194,8 @@
</td>
</tr>
<tr valign=top>
<td align=right><p><b><?php print_string("numberofassessmentsofstudentsubmissions", "workshop") ?>:</b></p></td>
<tr valign="top">
<td align="right"><p><b><?php print_string("numberofassessmentsofstudentsubmissions", "workshop") ?>:</b></p></td>
<td>
<?php
unset($numbers);
@@ -208,8 +208,8 @@
</td>
</tr>
<tr valign=top>
<td align=right><p><b><?php print_string("weightforteacherassessments", "workshop") ?>:</b></p></td>
<tr valign="top">
<td align="right"><p><b><?php print_string("weightforteacherassessments", "workshop") ?>:</b></p></td>
<td>
<?php
unset($numbers);
@@ -222,8 +222,8 @@
</td>
</tr>
<tr valign=top>
<td align=right><p><b><?php print_string("overallocation", "workshop") ?>:</b></p></td>
<tr valign="top">
<td align="right"><p><b><?php print_string("overallocation", "workshop") ?>:</b></p></td>
<td>
<?php
unset($numbers);
@@ -237,7 +237,7 @@
</tr>
<tr>
<td align=right><p><b><?php print_string("selfassessment", "workshop") ?>:</b></p></td>
<td align="right"><p><b><?php print_string("selfassessment", "workshop") ?>:</b></p></td>
<td>
<?php
$options[0] = get_string("no"); $options[1] = get_string("yes");
@@ -248,7 +248,7 @@
</tr>
<tr>
<td align=right><p><b><?php print_string("assessmentsmustbeagreed", "workshop") ?>:</b></p></td>
<td align="right"><p><b><?php print_string("assessmentsmustbeagreed", "workshop") ?>:</b></p></td>
<td>
<?php
choose_from_menu($options, "agreeassessments", $form->agreeassessments, "");
@@ -258,7 +258,7 @@
</tr>
<tr>
<td align=right><p><b><?php print_string("hidegradesbeforeagreement", "workshop") ?>:</b></p></td>
<td align="right"><p><b><?php print_string("hidegradesbeforeagreement", "workshop") ?>:</b></p></td>
<td>
<?php
choose_from_menu($options, "hidegrades", $form->hidegrades, "");
@@ -268,7 +268,7 @@
</tr>
<tr>
<td align=right><p><b><?php print_string("leaguetable", "workshop"); ?>:</b></p></td>
<td align="right"><p><b><?php print_string("leaguetable", "workshop"); ?>:</b></p></td>
<td>
<?php
unset($numbers);
@@ -284,7 +284,7 @@
</tr>
<tr>
<td align=right><p><b><? print_string("hidenamesfromstudents", "workshop", $course->students) ?>:</b></p></td>
<td align="right"><p><b><? print_string("hidenamesfromstudents", "workshop", $course->students) ?>:</b></p></td>
<td>
<?php
choose_from_menu($options, "anonymous", $form->anonymous, "");
@@ -293,8 +293,8 @@
</td>
</tr>
<tr valign=top>
<td align=right><p><b><?php print_string("maximumsize", "workshop") ?>:</b></p></td>
<tr valign="top">
<td align="right"><p><b><?php print_string("maximumsize", "workshop") ?>:</b></p></td>
<td>
<?php
$sizelist = array("10Kb", "50Kb", "100Kb", "500Kb", "1Mb", "2Mb", "5Mb", "10Mb", "20Mb", "50Mb");
@@ -319,8 +319,8 @@
</td>
</tr>
<tr valign=top>
<td align=right><p><b><?php print_string("deadline", "workshop") ?>:</b></td>
<tr valign="top">
<td align="right"><p><b><?php print_string("deadline", "workshop") ?>:</b></td>
<td><?php
print_date_selector("deadlineday", "deadlinemonth", "deadlineyear", $form->deadline);
echo "&nbsp;-&nbsp;";
@@ -331,15 +331,15 @@
</table>
<br />
<center>
<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=mode value="<?php p($form->mode) ?>" />
<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="mode" value="<?php p($form->mode) ?>" />
<input type="submit" value="<?php print_string("savechanges") ?>" />
<input type="submit" name=cancel value="<?php print_string("cancel") ?>" />
<input type="submit" name="cancel" value="<?php print_string("cancel") ?>" />
<p>
<p><?php notify(get_string("noteonassessmentelements", "workshop")); ?>
mod/workshop/submissions.php
+3 -3
View File
@@ -42,8 +42,8 @@
// ... print the header and...
print_header_simple("$workshop->name", "",
"<a HREF=index.php?id=$course->id>$strworkshops</a> ->
<a HREF=\"view.php?id=$cm->id\">$workshop->name</a> -> $strsubmissions",
"<a href=\"index.php?id=$course->id\">$strworkshops</a> ->
<a href=\"view.php?id=$cm->id\">$workshop->name</a> -> $strsubmissions",
"", "", true);
//...get the action or set up an suitable default
@@ -80,7 +80,7 @@
echo " <td>\n";
echo " <input type=\"text\" name=\"title\" size=\"60\" maxlength=\"100\" value=\"$submission->title\" />\n";
echo " </td></tr></table>\n";
echo "<input type=submit VALUE=\"".get_string("amendtitle", "workshop")."\" />\n";
echo "<input type=\"submit\" value=\"".get_string("amendtitle", "workshop")."\" />\n";
echo "</center></form>\n";
}
mod/workshop/upload.php
+2 -2
View File
@@ -25,8 +25,8 @@
$strupload = get_string("upload");
print_header_simple("$workshop->name : $strupload", "",
"<a HREF=index.php?id=$course->id>$strworkshops</a> ->
<a HREF=\"view.php?a=$workshop->id\">$workshop->name</a> -> $strupload",
"<a href=\"index.php?id=$course->id\">$strworkshops</a> ->
<a href=\"view.php?a=$workshop->id\">$workshop->name</a> -> $strupload",
"", "", true);
/****
if ($submissions = workshop_get_submissions($workshop, $USER)) {
mod/workshop/view.php
+9 -9
View File
@@ -43,7 +43,7 @@
// ...display header...
print_header_simple("$workshop->name", "",
"<a HREF=index.php?id=$course->id>$strworkshops</a> -> $workshop->name",
"<a href=\"index.php?id=$course->id\">$strworkshops</a> -> $workshop->name",
"", "", true, update_module_button($cm->id, $course->id, $strworkshop), navmenu($course, $cm));
// ...and if necessary set default action
@@ -160,7 +160,7 @@
echo "<td align=\"center\">".number_format($gradinggrade + $grade, 1)."</td></tr>\n";
}
}
echo "</table><br CLEAR=ALL />\n";
echo "</table><br clear=\"all\" />\n";
workshop_print_key($workshop);
if ($workshop->showleaguetable) {
workshop_print_league_table($workshop);
@@ -267,15 +267,15 @@
break;
}
if (workshop_count_assessments($lastsubmission)) {
echo "<hr size=\"1\" noshade>";
echo "<hr size=\"1\" noshade=\"noshade\" />";
print_heading(get_string("submitrevisedassignment", "workshop").":");
workshop_print_upload_form($workshop);
echo "<hr size=\"1\" noshade>";
echo "<hr size=\"1\" noshade=\"noshade\" />";
}
}
}
// allow user to list their submissions and assessments in a general way????
// print_heading("<a HREF=\"submissions.php?action=listallsubmissions&id=$cm->id\">".
// print_heading("<a href=\"submissions.php?action=listallsubmissions&id=$cm->id\">".
// get_string("listofallsubmissions", "workshop"));
}
}
@@ -291,7 +291,7 @@
$strdifference = format_time($workshop->deadline - time());
if (($workshop->deadline - time()) < 0) {
$strdifference = "<font COLOR=RED>$strdifference</font>";
$strdifference = "<font color=\"red\">$strdifference</font>";
}
$strduedate = userdate($workshop->deadline)." ($strdifference)";
@@ -300,7 +300,7 @@
// list previous submissions from teacher
workshop_list_user_submissions($workshop, $USER);
echo "<hr SIZE=1 NOSHADE>";
echo "<hr size=\"1\" noshade=\"noshade\" />";
// print upload form
print_heading(get_string("submitassignment", "assignment").":");
@@ -413,10 +413,10 @@
workshop_count_student_submissions_for_assessment($workshop, $USER))."</a></b> \n";
helpbutton("gradingsubmissions",
get_string("studentsubmissionsforassessment", "workshop"), "workshop");
print_heading("<a HREF=\"submissions.php?id=$cm->id&action=displayfinalgrades\">".
print_heading("<a href=\"submissions.php?id=$cm->id&action=displayfinalgrades\">".
get_string("displayoffinalgrades", "workshop")."</a>");
}
print_heading("<a HREF=\"submissions.php?id=$cm->id&action=adminlist\">".
print_heading("<a href=\"submissions.php?id=$cm->id&action=adminlist\">".
get_string("administration")."</a>");
}