Some changes for XHTML compatibility

diff --git a/mod/resource/lib.php b/mod/resource/lib.php
index 867ce4d668fb70d515dd58ee31e71029d2981cdb..b0c43bd6e1606f6a64acf27ac2602daa91efb30a 100644 (file)
--- a/mod/resource/lib.php
+++ b/mod/resource/lib.php
@@ -335,7 +335,7 @@ function resource_get_coursemodule_info($coursemodule) {
 
    if ($resource = get_record("resource", "id", $coursemodule->instance)) {
        if (!empty($resource->popup)) {
-           $info->extra =  urlencode("target=\"resource$resource->id\" onClick=\"return ".
+           $info->extra =  urlencode("target=\"resource$resource->id\" onclick=\"return ".
                             "openpopup('/mod/resource/view.php?inpopup=true&id=".
                             $coursemodule->id.
                             "','resource$resource->id','$resource->popup');\"");

diff --git a/mod/resource/type/file/file.html b/mod/resource/type/file/file.html
index d6410b7d519368b79fe632e412160c6b8c79c4ef..1c4b5d6b50a0a58d09c5cc10830dd52ab2e8a3b6 100644 (file)
--- a/mod/resource/type/file/file.html
+++ b/mod/resource/type/file/file.html
@@ -37,7 +37,7 @@
         echo "<input name=\"reference\" size=\"90\" value=\"$form->reference\" /><br />";
         button_to_popup_window ("/mod/resource/coursefiles.php?id=$form->course", "coursefiles", $strchooseafile, 500, 750, $strchooseafile);
         echo "<input type=\"button\" name=\"searchbutton\" value=\"$strsearch ...\" ".
-             "onClick=\"return window.open('$CFG->resource_websearch', 'websearch', 'menubar=1,location=1,directories=1,toolbar=1,scrollbars,resizable,width=800,height=600');\" />\n";
+             "onclick=\"return window.open('$CFG->resource_websearch', 'websearch', 'menubar=1,location=1,directories=1,toolbar=1,scrollbars,resizable,width=800,height=600');\" />\n";
     ?>
     </td>
 </tr>
@@ -47,7 +47,7 @@
 <tr>
     <td align="right"><p><b><?php print_string("display", "resource") ?>:</b></p></td>
     <td>
-        <input type="button" value="hide settings" id="windowsettingsbutton" onClick="javascript: return showhide('windowsettings');" />
+        <input type="button" value="hide settings" id="windowsettingsbutton" onclick="javascript: return showhide('windowsettings');" />
         <input type="hidden" name="windowsettingspref" id="windowsettingspref" 
                value="<?php echo get_user_preferences('resource_windowsettingspref', $CFG->resource_windowsettings); ?>" />
         <?php helpbutton("window", get_string("display", "resource"), "resource", true) ?>
@@ -69,7 +69,7 @@
             var allitems = [<?php echo $alloptions; ?>];
         </script>
         <input type="radio" name="windowpopup" value="0" <?php echo ($windowtype != "popup") ? "checked=\"checked\"" : "" ?> 
-        onClick="lockoptions('form', 'windowpopup[0]', frameitem); 
+        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>
@@ -131,7 +131,7 @@
 <tr>
     <td align="right"><p><b><?php print_string("parameters", "resource") ?>:</b></p></td>
     <td>
-        <input type="button" value="hide settings" id="parametersettingsbutton" onClick="javascript: return showhide('parametersettings');" />
+        <input type="button" value="hide settings" id="parametersettingsbutton" onclick="javascript: return showhide('parametersettings');" />
         <input type="hidden" name="parametersettingspref" id="parametersettingspref" 
                value="<?php echo get_user_preferences('resource_parametersettingspref', $CFG->resource_parametersettings); ?>" />
         <?php helpbutton("parameters", get_string("parameters", "resource"), "resource", true) ?>

diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php
index 1f542d3724515eecf896d9943b37ce712266402e..7b991035ef673167650fe42852b7a919a0b69410 100644 (file)
--- a/mod/resource/type/file/resource.class.php
+++ b/mod/resource/type/file/resource.class.php
@@ -301,7 +301,7 @@ function display() {
             print_simple_box(format_text($resource->summary, FORMAT_MOODLE, $formatoptions), "center");
         }
 
-        $link = "<a href=\"$CFG->wwwroot/mod/resource/view.php?inpopup=true&amp;id={$this->cm->id}\" target=\"resource{$resource->id}\" onClick=\"return openpopup('/mod/resource/view.php?inpopup=true&amp;id={$this->cm->id}', 'resource{$resource->id}','{$resource->popup}');\">{$resource->name}</a>";
+        $link = "<a href=\"$CFG->wwwroot/mod/resource/view.php?inpopup=true&amp;id={$this->cm->id}\" target=\"resource{$resource->id}\" onclick=\"return openpopup('/mod/resource/view.php?inpopup=true&amp;id={$this->cm->id}', 'resource{$resource->id}','{$resource->popup}');\">{$resource->name}</a>";
 
         echo "<p>&nbsp</p>";
         echo '<p align="center">';

diff --git a/mod/resource/type/html/html.html b/mod/resource/type/html/html.html
index a008202930c3d53e10fe2c402b9d69cc6a9ef13a..77c1b8cb0ee4d79d35653ee22a1566165ec77177 100644 (file)
--- a/mod/resource/type/html/html.html
+++ b/mod/resource/type/html/html.html
@@ -45,7 +45,7 @@
 <tr>
     <td align="right"><p><b><?php print_string("display", "resource") ?>:</b></p></td>
     <td>
-        <input type="button" value="hide settings" id="windowsettingsbutton" onClick="javascript: return showhide('windowsettings');" />
+        <input type="button" value="hide settings" id="windowsettingsbutton" onclick="javascript: return showhide('windowsettings');" />
         <input type="hidden" name="windowsettingspref" id="windowsettingspref" 
                value="<?php echo get_user_preferences('resource_windowsettingspref', $CFG->resource_windowsettings); ?>" />
         <?php helpbutton("window", get_string("display", "resource"), "resource", true) ?>
@@ -66,7 +66,7 @@
             var allitems = [<?php echo $alloptions; ?>];
         </script>
         <input type="radio" name="windowpopup" value="0" <?php echo ($windowtype != "popup") ? "checked=\"checked\"" : "" ?> 
-        onClick="return lockoptions('form', 'windowpopup[1]', popupitems);" />
+        onclick="return lockoptions('form', 'windowpopup[1]', popupitems);" />
         <b title="<?php print_string("pagedisplay", "resource") ?>"><?php print_string("pagewindow", "resource") ?></b>
     </td>
 </tr>

diff --git a/mod/resource/type/html/resource.class.php b/mod/resource/type/html/resource.class.php
index e4361ab7767b7b0ca79d8ce2d7b073d04ffe4ace..9034ecf7c3419bd31b7fa4ccfd6dd91c3be211e9 100644 (file)
--- a/mod/resource/type/html/resource.class.php
+++ b/mod/resource/type/html/resource.class.php
@@ -120,7 +120,7 @@ function display() {
                 print_simple_box(format_text($resource->summary, FORMAT_MOODLE, $formatoptions, $course->id), "center");
             }
     
-            $link = "<a href=\"$CFG->wwwroot/mod/resource/view.php?inpopup=true&amp;id={$this->cm->id}\" target=\"resource{$resource->id}\" onClick=\"return openpopup('/mod/resource/view.php?inpopup=true&amp;id={$this->cm->id}', 'resource{$resource->id}','{$resource->popup}');\">{$resource->name}</a>";
+            $link = "<a href=\"$CFG->wwwroot/mod/resource/view.php?inpopup=true&amp;id={$this->cm->id}\" target=\"resource{$resource->id}\" onclick=\"return openpopup('/mod/resource/view.php?inpopup=true&amp;id={$this->cm->id}', 'resource{$resource->id}','{$resource->popup}');\">{$resource->name}</a>";
     
             echo "<p>&nbsp</p>";
             echo '<p align="center">';

diff --git a/mod/resource/type/text/resource.class.php b/mod/resource/type/text/resource.class.php
index eb87a41bbc802e96de885a55baa4a5bef0f288df..9e6eec54fc222ab2e5b91e8aea8c713f000e72df 100644 (file)
--- a/mod/resource/type/text/resource.class.php
+++ b/mod/resource/type/text/resource.class.php
@@ -118,7 +118,7 @@ function display() {
                 print_simple_box(format_text($resource->summary, FORMAT_MOODLE, $formatoptions, $course->id), "center");
             }
     
-            $link = "<a href=\"$CFG->wwwroot/mod/resource/view.php?inpopup=true&amp;id={$this->cm->id}\" target=\"resource{$resource->id}\" onClick=\"return openpopup('/mod/resource/view.php?inpopup=true&amp;id={$this->cm->id}', 'resource{$resource->id}','{$resource->popup}');\">{$resource->name}</a>";
+            $link = "<a href=\"$CFG->wwwroot/mod/resource/view.php?inpopup=true&amp;id={$this->cm->id}\" target=\"resource{$resource->id}\" onclick=\"return openpopup('/mod/resource/view.php?inpopup=true&amp;id={$this->cm->id}', 'resource{$resource->id}','{$resource->popup}');\">{$resource->name}</a>";
     
             echo "<p>&nbsp</p>";
             echo '<p align="center">';

diff --git a/mod/resource/type/text/text.html b/mod/resource/type/text/text.html
index 3fe80f48fde1e480c718c3429f5574b06fce1a84..235f2688d2568d8bfea593b8374428153d309730 100644 (file)
--- a/mod/resource/type/text/text.html
+++ b/mod/resource/type/text/text.html
@@ -57,7 +57,7 @@
 <tr>
     <td align="right"><p><b><?php print_string("display", "resource") ?>:</b></p></td>
     <td>
-        <input type="button" value="hide settings" id="windowsettingsbutton" onClick="javascript: return showhide('windowsettings');" />
+        <input type="button" value="hide settings" id="windowsettingsbutton" onclick="javascript: return showhide('windowsettings');" />
         <input type="hidden" name="windowsettingspref" id="windowsettingspref" 
                value="<?php echo get_user_preferences('resource_windowsettingspref', $CFG->resource_windowsettings); ?>" />
         <?php helpbutton("window", get_string("display", "resource"), "resource", true) ?>
@@ -78,7 +78,7 @@
             var allitems = [<?php echo $alloptions; ?>];
         </script>
         <input type="radio" name="windowpopup" value="0" <?php echo ($windowtype != "popup") ? "checked=\"checked\"" : "" ?> 
-        onClick="return lockoptions('form', 'windowpopup[1]', popupitems);" />
+        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") ?>
     </td>