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

More XHTML fixes

Browse source
This commit is contained in:
moodler 2004-10-15 12:23:43 +00:00
parent 73a1105ba1
commit 3981ecbeaf
7 changed files with 41 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mod/resource/index.php
View file

@ -39,13 +39,13 @@
if ($course->format == "weeks") { if ($course->format == "weeks") {
$table->head = array ($strweek, $strname, $strsummary); $table->head = array ($strweek, $strname, $strsummary);
$table->align = array ("CENTER", "LEFT", "LEFT"); $table->align = array ("center", "left", "left");
} else if ($course->format == "topics") { } else if ($course->format == "topics") {
$table->head = array ($strtopic, $strname, $strsummary); $table->head = array ($strtopic, $strname, $strsummary);
$table->align = array ("CENTER", "LEFT", "LEFT"); $table->align = array ("center", "left", "left");
} else { } else {
$table->head = array ($strlastmodified, $strname, $strsummary); $table->head = array ($strlastmodified, $strname, $strsummary);
$table->align = array ("LEFT", "LEFT", "LEFT"); $table->align = array ("left", "left", "left");
} }
$currentsection = ""; $currentsection = "";

2
mod/resource/type/common.html
View file

@ -13,7 +13,7 @@
<tr valign="top"> <tr valign="top">
<td align="right"><p><b><?php print_string("name") ?>:</b></p></td> <td align="right"><p><b><?php print_string("name") ?>:</b></p></td>
<td> <td>
<input type="text" name="name" size="65" value="<?php p($form->name) ?>" /> <input type="text" name="name" size="65" value="<?php p($form->name) ?>" alt="<?php print_string("name") ?>" />
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">

2
mod/resource/type/directory/resource.class.php
View file

@ -119,7 +119,7 @@ function display() {
echo '<tr>'; echo '<tr>';
echo '<td>'; echo '<td>';
echo "<img src=\"$CFG->pixpath/f/$icon\" width=\"16\" height=\"16\" />"; echo "<img src=\"$CFG->pixpath/f/$icon\" width=\"16\" height=\"16\" alt=\"\"/>";
echo '</td>'; echo '</td>';
echo '<td nowrap="nowrap"><p>'; echo '<td nowrap="nowrap"><p>';
if ($icon == 'folder.gif') { if ($icon == 'folder.gif') {

20
mod/resource/type/html/html.html
View file

@ -1,4 +1,9 @@
<script language="javascript">
<tr valign="top">
<td align="right" nowrap="nowrap">
<script language="javascript" type="text/javascript">
function showhide (id, set) { function showhide (id, set) {
divobj = document.getElementById(id); divobj = document.getElementById(id);
butobj = document.getElementById(id+'button'); butobj = document.getElementById(id+'button');
@ -26,8 +31,6 @@
</script> </script>
<tr valign="top">
<td align="right" nowrap="nowrap">
<p><b><?php print_string("fulltext", "resource") ?>:</b></p><br /> <p><b><?php print_string("fulltext", "resource") ?>:</b></p><br />
<font size="1"> <font size="1">
<?php helpbutton("writing", get_string("helpwriting"), "moodle", true, true) ?><br /> <?php helpbutton("writing", get_string("helpwriting"), "moodle", true, true) ?><br />
@ -77,7 +80,7 @@
<input name="windowpopup" type="radio" value="1" <?php echo ($windowtype == "popup") ? "checked=\"checked\"" : "" ?> <input name="windowpopup" type="radio" value="1" <?php echo ($windowtype == "popup") ? "checked=\"checked\"" : "" ?>
onclick=" return lockoptions('form', 'windowpopup[1]', popupitems);" /> onclick=" return lockoptions('form', 'windowpopup[1]', popupitems);" />
<b title="<?php p($strnewwindowopen) ?>"><?php p($strnewwindow) ?></b> <b title="<?php p($strnewwindowopen) ?>"><?php p($strnewwindow) ?></b>
<ul> <blockquote>
<?php <?php
foreach ($window as $name => $value) { foreach ($window as $name => $value) {
if ($name == "height" or $name == "width") { if ($name == "height" or $name == "width") {
@ -104,7 +107,7 @@
echo "</script>"; echo "</script>";
} }
?> ?>
</ul> </blockquote>
</td> </td>
</tr> </tr>
@ -112,10 +115,11 @@
</div> </div>
</td></tr>
<script language="javascript" type="text/javascript">
<script language="javascript">
showhide('windowsettings', true); showhide('windowsettings', true);
</script> </script>
</td></tr>

9
mod/resource/type/html/resource.class.php
View file

@ -110,9 +110,9 @@ function display() {
"", "", true, update_module_button($this->cm->id, $course->id, $strresource), "", "", true, update_module_button($this->cm->id, $course->id, $strresource),
navmenu($course, $this->cm)); navmenu($course, $this->cm));
echo "\n<script language=\"Javascript\">"; echo "\n<script language=\"javascript\" type=\"text/javascript\">";
echo "\n<!--\n"; echo "\n<!--\n";
echo "openpopup('/mod/resource/view.php?inpopup=true&amp;id={$this->cm->id}','resource{$resource->id}','{$resource->popup}');\n"; echo "openpopup('/mod/resource/view.php?inpopup=true&id={$this->cm->id}','resource{$resource->id}','{$resource->popup}');\n";
echo "\n-->\n"; echo "\n-->\n";
echo '</script>'; echo '</script>';
@ -132,6 +132,7 @@ function display() {
print_footer($course); print_footer($course);
} }
} else { /// not a popup at all } else { /// not a popup at all
die;
add_to_log($course->id, "resource", "view", "view.php?id={$this->cm->id}", $resource->id, $this->cm->id); add_to_log($course->id, "resource", "view", "view.php?id={$this->cm->id}", $resource->id, $this->cm->id);
print_header($pagetitle, $course->fullname, "$navigation {$resource->name}", print_header($pagetitle, $course->fullname, "$navigation {$resource->name}",
@ -140,7 +141,7 @@ function display() {
print_simple_box(format_text($resource->alltext, FORMAT_HTML, $formatoptions, $course->id), "center", "", "$THEME->cellcontent", "20"); print_simple_box(format_text($resource->alltext, FORMAT_HTML, $formatoptions, $course->id), "center", "", "$THEME->cellcontent", "20");
echo "<center><p><font size=\"1\">$strlastmodified: ".userdate($resource->timemodified)."</p></center>"; echo "<center><p><font size=\"1\">$strlastmodified: ".userdate($resource->timemodified)."</font></p></center>";
print_footer($course); print_footer($course);
} }
@ -190,7 +191,7 @@ function setup($form) {
if ($optionname == "height" or $optionname == "width") { if ($optionname == "height" or $optionname == "width") {
$window->$optionname = $optionvalue; $window->$optionname = $optionvalue;
} else if ($optionvalue) { } else if ($optionvalue) {
$window->$optionname = "checked"; $window->$optionname = "checked=\"checked\"";
} }
} }
} }

9
mod/resource/type/text/resource.class.php
View file

@ -102,15 +102,16 @@ function display() {
print_header(); print_header();
print_simple_box(format_text($resource->alltext, $resource->options, $formatoptions, $course->id), print_simple_box(format_text($resource->alltext, $resource->options, $formatoptions, $course->id),
"center", "", "$THEME->cellcontent", "20"); "center", "", "$THEME->cellcontent", "20");
print_footer($course);
} else { /// Make a page and a pop-up window } else { /// Make a page and a pop-up window
print_header($pagetitle, $course->fullname, "$navigation {$resource->name}", print_header($pagetitle, $course->fullname, "$navigation {$resource->name}",
"", "", true, update_module_button($this->cm->id, $course->id, $strresource), "", "", true, update_module_button($this->cm->id, $course->id, $strresource),
navmenu($course, $this->cm)); navmenu($course, $this->cm));
echo "\n<script language=\"Javascript\">"; echo "\n<script language=\"javascript\" type=\"text/javascript\">";
echo "\n<!--\n"; echo "\n<!--\n";
echo "openpopup('/mod/resource/view.php?inpopup=true&amp;id={$this->cm->id}','resource{$resource->id}','{$resource->popup}');\n"; echo "openpopup('/mod/resource/view.php?inpopup=true&id={$this->cm->id}','resource{$resource->id}','{$resource->popup}');\n";
echo "\n-->\n"; echo "\n-->\n";
echo '</script>'; echo '</script>';
@ -139,7 +140,7 @@ function display() {
print_simple_box(format_text($resource->alltext, $resource->options, $formatoptions, $course->id), print_simple_box(format_text($resource->alltext, $resource->options, $formatoptions, $course->id),
"center", "", "$THEME->cellcontent", "20"); "center", "", "$THEME->cellcontent", "20");
echo "<center><p><font size=\"1\">$strlastmodified: ".userdate($resource->timemodified)."</p></center>"; echo "<center><p><font size=\"1\">$strlastmodified: ".userdate($resource->timemodified)."</font></p></center>";
print_footer($course); print_footer($course);
} }
@ -191,7 +192,7 @@ function setup($form) {
if ($optionname == "height" or $optionname == "width") { if ($optionname == "height" or $optionname == "width") {
$window->$optionname = $optionvalue; $window->$optionname = $optionvalue;
} else if ($optionvalue) { } else if ($optionvalue) {
$window->$optionname = "checked"; $window->$optionname = "checked=\"checked\"";
} }
} }
} }

22
mod/resource/type/text/text.html
View file

@ -1,4 +1,9 @@
<script language="javascript">
<tr valign="top">
<td align="right" nowrap="nowrap">
<script language="javascript" type="text/javascript">
function showhide (id, set) { function showhide (id, set) {
divobj = document.getElementById(id); divobj = document.getElementById(id);
butobj = document.getElementById(id+'button'); butobj = document.getElementById(id+'button');
@ -27,8 +32,6 @@
<tr valign="top">
<td align="right" nowrap="nowrap">
<p><b><?php print_string("fulltext", "resource") ?>:</b></p><br /> <p><b><?php print_string("fulltext", "resource") ?>:</b></p><br />
<font size="1"> <font size="1">
<?php helpbutton("writing", get_string("helpwriting"), "moodle", true, true) ?><br /> <?php helpbutton("writing", get_string("helpwriting"), "moodle", true, true) ?><br />
@ -91,7 +94,7 @@
onclick=" return lockoptions('form', 'windowpopup[1]', popupitems);" /> onclick=" return lockoptions('form', 'windowpopup[1]', popupitems);" />
<b title="<?php p($strnewwindowopen) ?>"><?php p($strnewwindow) ?></b> <b title="<?php p($strnewwindowopen) ?>"><?php p($strnewwindow) ?></b>
<?php p($strnewwindowopen) ?> <?php p($strnewwindowopen) ?>
<ul> <blockquote>
<?php <?php
foreach ($window as $name => $value) { foreach ($window as $name => $value) {
if ($name == "height" or $name == "width") { if ($name == "height" or $name == "width") {
@ -118,7 +121,7 @@
echo "</script>"; echo "</script>";
} }
?> ?>
</ul> </blockquote>
</td> </td>
</tr> </tr>
@ -126,10 +129,13 @@
</div> </div>
</td></tr>
<script language="javascript" type="text/javascript">
<script language="javascript">
showhide('windowsettings', true); showhide('windowsettings', true);
</script> </script>
</td></tr>