Merged new settings from stable

diff --git a/mod/resource/config.html b/mod/resource/config.html
index 1380d66136067951ba7d78504d7c4b1a755f92b0..0e81fff2d798e16b57dbe99a6d65786212925979 100644 (file)
--- a/mod/resource/config.html
+++ b/mod/resource/config.html
@@ -82,6 +82,34 @@
           echo "</tr>";
       }
 ?>
+<tr valign=top>
+       <td align=right><p>resource_windowsettings:</td>
+       <td>
+    <?php
+        unset($choices);
+        $choices["0"] = get_string("hidesettings");
+        $choices["1"] = get_string("showsettings");
+        choose_from_menu ($choices, "resource_windowsettings", $CFG->resource_windowsettings, "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configwindowsettings", "resource") ?>
+    </td>
+</tr>
+<tr valign=top>
+       <td align=right><p>resource_parametersettings:</td>
+       <td>
+    <?php
+        unset($choices);
+        $choices["0"] = get_string("hidesettings");
+        $choices["1"] = get_string("showsettings");
+        choose_from_menu ($choices, "resource_parametersettings", $CFG->resource_parametersettings, "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configparametersettings", "resource") ?>
+    </td>
+</tr>
 <tr>
     <td colspan=3 align=center>
        <input type="submit" value="<?php print_string("savechanges") ?>"></td>

diff --git a/mod/resource/lib.php b/mod/resource/lib.php
index feb0ff9b2a26fcef5b14a3adb3995bc128f892ca..1dc6eb051dfd895c75c38560324b4b3b477ca822 100644 (file)
--- a/mod/resource/lib.php
+++ b/mod/resource/lib.php
@@ -24,6 +24,14 @@ if (!isset($CFG->resource_popup)) {
     set_config("resource_popup", "");
 }  
 
+if (!isset($CFG->resource_windowsettings)) {
+    set_config("resource_windowsettings", "0");
+}  
+
+if (!isset($CFG->resource_parametersettings)) {
+    set_config("resource_parametersettings", "0");
+}  
+
 $RESOURCE_WINDOW_OPTIONS = array("resizable", "scrollbars", "directories", "location", 
                                  "menubar", "toolbar", "status", "height", "width");
 
@@ -155,6 +163,13 @@ function add_instance($resource) {
         }
     }
 
+    if (isset($resource->parametersettingspref)) {
+        set_user_preference('resource_parametersettingspref', $resource->parametersettingspref);
+    }
+    if (isset($resource->windowsettingspref)) {
+        set_user_preference('resource_windowsettingspref', $resource->windowsettingspref);
+    }
+
     return insert_record("resource", $resource);
 }
 
@@ -189,6 +204,13 @@ function update_instance($resource) {
         }
     }
 
+    if (isset($resource->parametersettingspref)) {
+        set_user_preference('resource_parametersettingspref', $resource->parametersettingspref);
+    }
+    if (isset($resource->windowsettingspref)) {
+        set_user_preference('resource_windowsettingspref', $resource->windowsettingspref);
+    }
+
     return update_record("resource", $resource);
 }
 

diff --git a/mod/resource/type/file/file.html b/mod/resource/type/file/file.html
index 34ad7755fd0c17c084f896e4f1cd6e41fa87d2bd..2c0ac837e5dc0f49ec842e081789439e4cb5b3c5 100644 (file)
--- a/mod/resource/type/file/file.html
+++ b/mod/resource/type/file/file.html
@@ -1,13 +1,26 @@
 <script language="javascript">
-    function showhide (id) {
+    function showhide (id, set) {
         divobj = document.getElementById(id);
         butobj = document.getElementById(id+'button');
-        if (divobj.style.display != 'none') {
-            divobj.style.display = 'none';
-            butobj.value = '<?php print_string("showsettings") ?>...';
+        prefobj = document.getElementById(id+'pref');
+        if (set == true) {
+            if (prefobj.value == '1') {
+                divobj.style.display = 'block';
+                butobj.value = '<?php print_string("hidesettings") ?>';
+            } else {
+                divobj.style.display = 'none';
+                butobj.value = '<?php print_string("showsettings") ?>...';
+            }
         } else {
-            divobj.style.display = 'block';
-            butobj.value = '<?php print_string("hidesettings") ?>';
+            if (prefobj.value == '1') {
+                divobj.style.display = 'none';
+                butobj.value = '<?php print_string("showsettings") ?>...';
+                prefobj.value = '0';
+            } else {
+                divobj.style.display = 'block';
+                butobj.value = '<?php print_string("hidesettings") ?>';
+                prefobj.value = '1';
+            }
         }
     }
 </script>
@@ -35,6 +48,8 @@
     <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="hidden" name="windowsettingspref" id="windowsettingspref" 
+               value="<?php echo get_user_preferences('resource_windowsettingspref', $CFG->resource_windowsettings); ?>" />
     </td>
 </tr>
 <tr><td colspan="2">
@@ -116,6 +131,8 @@
     <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="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) ?>
     </td>
 </tr>
@@ -169,6 +186,6 @@ for ($i=0; $i < $this->maxparameters; $i++) {
 
 
 <script language="javascript">
-    showhide('parametersettings');
-    showhide('windowsettings');
+    showhide('parametersettings', true);
+    showhide('windowsettings', true);
 </script>

diff --git a/mod/resource/type/html/html.html b/mod/resource/type/html/html.html
index ff41f1bfe9d6dab012e339724ead9d26a2aa6f2b..9c3807a8c1022dffb7c155743ffe86673a8f68a9 100644 (file)
--- a/mod/resource/type/html/html.html
+++ b/mod/resource/type/html/html.html
@@ -1,19 +1,31 @@
 <script language="javascript">
-    function showhide (id) {
+    function showhide (id, set) {
         divobj = document.getElementById(id);
         butobj = document.getElementById(id+'button');
-        if (divobj.style.display != 'none') {
-            divobj.style.display = 'none';
-            butobj.value = '<?php print_string("showsettings") ?>...';
+        prefobj = document.getElementById(id+'pref');
+        if (set == true) {
+            if (prefobj.value == '1') {
+                divobj.style.display = 'block';
+                butobj.value = '<?php print_string("hidesettings") ?>';
+            } else {
+                divobj.style.display = 'none';
+                butobj.value = '<?php print_string("showsettings") ?>...';
+            }
         } else {
-            divobj.style.display = 'block';
-            butobj.value = '<?php print_string("hidesettings") ?>';
+            if (prefobj.value == '1') {
+                divobj.style.display = 'none';
+                butobj.value = '<?php print_string("showsettings") ?>...';
+                prefobj.value = '0';
+            } else {
+                divobj.style.display = 'block';
+                butobj.value = '<?php print_string("hidesettings") ?>';
+                prefobj.value = '1';
+            }
         }
     }
 </script>
 
 
-
 <tr valign="top">
     <td align="right" nowrap>
         <p><b><?php print_string("fulltext", "resource") ?>:</b></p><br />
@@ -34,6 +46,8 @@
     <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="hidden" name="windowsettingspref" id="windowsettingspref" 
+               value="<?php echo get_user_preferences('resource_windowsettingspref', $CFG->resource_windowsettings); ?>" />
     </td>
 </tr>
 <tr><td colspan="2">
@@ -101,6 +115,6 @@
 
 
 <script language="javascript">
-    showhide('windowsettings');
+    showhide('windowsettings', true);
 </script>
 

diff --git a/mod/resource/type/html/resource.class.php b/mod/resource/type/html/resource.class.php
index 8289cfa7936b9329b3f2d2b238a73f965f9eb3ee..e1facc826636fb5da20372dd94c71eedea62b18e 100644 (file)
--- a/mod/resource/type/html/resource.class.php
+++ b/mod/resource/type/html/resource.class.php
@@ -30,6 +30,13 @@ function add_instance($resource) {
         $resource->popup = "";
     }
 
+    if (isset($resource->parametersettingspref)) {
+        set_user_preference('resource_parametersettingspref', $resource->parametersettingspref);
+    }
+    if (isset($resource->windowsettingspref)) {
+        set_user_preference('resource_windowsettingspref', $resource->windowsettingspref);
+    }
+
     return insert_record("resource", $resource);
 }
 
@@ -57,6 +64,13 @@ function update_instance($resource) {
         $resource->popup = "";
     }
 
+    if (isset($resource->parametersettingspref)) {
+        set_user_preference('resource_parametersettingspref', $resource->parametersettingspref);
+    }
+    if (isset($resource->windowsettingspref)) {
+        set_user_preference('resource_windowsettingspref', $resource->windowsettingspref);
+    }
+
     return update_record("resource", $resource);
 }
 

diff --git a/mod/resource/type/text/resource.class.php b/mod/resource/type/text/resource.class.php
index 60160a40c15260d85da13a726cd1c92728f19d37..8447440a1f25f2dc9dcc3baa6e914494516385ae 100644 (file)
--- a/mod/resource/type/text/resource.class.php
+++ b/mod/resource/type/text/resource.class.php
@@ -31,6 +31,13 @@ function add_instance($resource) {
         $resource->popup = "";
     }
 
+    if (isset($resource->parametersettingspref)) {
+        set_user_preference('resource_parametersettingspref', $resource->parametersettingspref);
+    }
+    if (isset($resource->windowsettingspref)) {
+        set_user_preference('resource_windowsettingspref', $resource->windowsettingspref);
+    }
+
     return insert_record("resource", $resource);
 }
 
@@ -57,6 +64,13 @@ function update_instance($resource) {
         $resource->popup = "";
     }
 
+    if (isset($resource->parametersettingspref)) {
+        set_user_preference('resource_parametersettingspref', $resource->parametersettingspref);
+    }
+    if (isset($resource->windowsettingspref)) {
+        set_user_preference('resource_windowsettingspref', $resource->windowsettingspref);
+    }
+
     return update_record("resource", $resource);
 }
 

diff --git a/mod/resource/type/text/text.html b/mod/resource/type/text/text.html
index e2bac3aacf4747a911dc0b3db7e55b6cb8dc4cf3..2f92431f1599afd56f1b31b927223075fc14f4d9 100644 (file)
--- a/mod/resource/type/text/text.html
+++ b/mod/resource/type/text/text.html
@@ -1,13 +1,26 @@
 <script language="javascript">
-    function showhide (id) {
+    function showhide (id, set) {
         divobj = document.getElementById(id);
         butobj = document.getElementById(id+'button');
-        if (divobj.style.display != 'none') {
-            divobj.style.display = 'none';
-            butobj.value = '<?php print_string("showsettings") ?>...';
+        prefobj = document.getElementById(id+'pref');
+        if (set == true) {
+            if (prefobj.value == '1') {
+                divobj.style.display = 'block';
+                butobj.value = '<?php print_string("hidesettings") ?>';
+            } else {
+                divobj.style.display = 'none';
+                butobj.value = '<?php print_string("showsettings") ?>...';
+            }
         } else {
-            divobj.style.display = 'block';
-            butobj.value = '<?php print_string("hidesettings") ?>';
+            if (prefobj.value == '1') {
+                divobj.style.display = 'none';
+                butobj.value = '<?php print_string("showsettings") ?>...';
+                prefobj.value = '0';
+            } else {
+                divobj.style.display = 'block';
+                butobj.value = '<?php print_string("hidesettings") ?>';
+                prefobj.value = '1';
+            }
         }
     }
 </script>
@@ -45,6 +58,8 @@
     <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="hidden" name="windowsettingspref" id="windowsettingspref" 
+               value="<?php echo get_user_preferences('resource_windowsettingspref', $CFG->resource_windowsettings); ?>" />
     </td>
 </tr>   
 <tr><td colspan="2">
@@ -114,6 +129,6 @@
 
 
 <script language="javascript">
-    showhide('windowsettings');
+    showhide('windowsettings', true);
 </script>