Fixed window choices on resources so that they use a radio button now.

bug 1741

diff --git a/mod/resource/lib.php b/mod/resource/lib.php
index 99b9006e9509f55588b99cb3a9ae6ff1a64737c7..feb0ff9b2a26fcef5b14a3adb3995bc128f892ca 100644 (file)
--- a/mod/resource/lib.php
+++ b/mod/resource/lib.php
@@ -136,23 +136,23 @@ function add_instance($resource) {
     $resource->timemodified = time();
 
     if (isset($resource->windowpopup)) {
-        $optionlist = array();
-        foreach ($RESOURCE_WINDOW_OPTIONS as $option) {
-            if (isset($resource->$option)) {
-                $optionlist[] = $option."=".$resource->$option;
+        if ($resource->windowpopup) {
+            $optionlist = array();
+            foreach ($RESOURCE_WINDOW_OPTIONS as $option) {
+                if (isset($resource->$option)) {
+                    $optionlist[] = $option."=".$resource->$option;
+                }
             }
-        }
-        $resource->popup = implode(',', $optionlist);
-        $resource->options = "";
-
-    } else if (isset($resource->windowpage)) {
-
-        if (isset($resource->framepage)) {
-            $resource->options = "frame";
-        } else {
+            $resource->popup = implode(',', $optionlist);
             $resource->options = "";
+        } else {
+            if (isset($resource->framepage)) {
+                $resource->options = "frame";
+            } else {
+                $resource->options = "";
+            }
+            $resource->popup = "";
         }
-        $resource->popup = "";
     }
 
     return insert_record("resource", $resource);
@@ -170,22 +170,23 @@ function update_instance($resource) {
     $resource->timemodified = time();
 
     if (isset($resource->windowpopup)) {
-        $optionlist = array();
-        foreach ($RESOURCE_WINDOW_OPTIONS as $option) {
-            if (isset($resource->$option)) {
-                $optionlist[] = $option."=".$resource->$option;
+        if ($resource->windowpopup) {
+            $optionlist = array();
+            foreach ($RESOURCE_WINDOW_OPTIONS as $option) {
+                if (isset($resource->$option)) {
+                    $optionlist[] = $option."=".$resource->$option;
+                }
             }
-        }
-        $resource->popup = implode(',', $optionlist);
-        $resource->options = "";
-
-    } else if (isset($resource->windowpage)) {
-        if (isset($resource->framepage)) {
-            $resource->options = "frame";
-        } else {
+            $resource->popup = implode(',', $optionlist);
             $resource->options = "";
+        } else {
+            if (isset($resource->framepage)) {
+                $resource->options = "frame";
+            } else {
+                $resource->options = "";
+            }
+            $resource->popup = "";
         }
-        $resource->popup = "";
     }
 
     return update_record("resource", $resource);

diff --git a/mod/resource/type/file/file.html b/mod/resource/type/file/file.html
index 9a2da093a33c39ca58a6c17cc661cb6c0d20e6b4..33565068cc3d00e983c822a67e1c1f7e702b2daa 100644 (file)
--- a/mod/resource/type/file/file.html
+++ b/mod/resource/type/file/file.html
@@ -28,7 +28,9 @@
             var frameitem = [<?php echo $frameoption; ?>];
             var allitems = [<?php echo $alloptions; ?>];
         </script>
-        <input type="checkbox" name="windowpage" value=1 <?php echo ($windowtype == "page") ? "checked" : "" ?> onClick="lockoptions('form', 'windowpage', frameitem); document.form.windowpopup.checked=false; return lockoptions('form', 'windowpopup', popupitems);">
+        <input type="radio" name="windowpopup" value=0 <?php echo ($windowtype != "popup") ? "checked" : "" ?> 
+        onClick="lockoptions('form', 'windowpopup[0]', frameitem); 
+        return lockoptions('form', 'windowpopup[1]', popupitems);">
         <?php print_string("pagedisplay", "resource") ?>
         <ul>
             <input type="hidden" name="hframepage" value=0>
@@ -44,8 +46,9 @@
     </td>
     
     <td>
-        <input name="setnewwindow" type=hidden value=1>
-        <input name="windowpopup" type=checkbox value=1 onclick="lockoptions('form','windowpopup', popupitems); document.form.windowpage.checked=false; return lockoptions('form', 'windowpage', frameitem);">
+        <input name="windowpopup" type=radio value=1 <?php echo ($windowtype == "popup") ? "checked" : "" ?>
+        onclick="lockoptions('form', 'windowpopup[0]', frameitem); 
+        return lockoptions('form', 'windowpopup[1]', popupitems);">
         <?php p($strnewwindowopen) ?>
         <ul>
         <?php
@@ -70,15 +73,11 @@
         <?php
             if ($windowtype == "page") {
                 echo "<script>";
-                echo "lockoptions('form','windowpopup', popupitems);";
-                echo "document.form.windowpage.checked=true;";
-                echo "document.form.windowpopup.checked=false;";
+                echo "lockoptions('form','windowpopup[1]', popupitems);";
                 echo "</script>";
             } else {
                 echo "<script>";
-                echo "lockoptions('form','windowpage', frameitem);";
-                echo "document.form.windowpopup.checked=true;";
-                echo "document.form.windowpage.checked=false;";
+                echo "lockoptions('form','windowpopup[0]', frameitem);";
                 echo "</script>";
             }
         ?>

diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php
index 57ee8ab7110ef1224c43a86b8015cc11e6dc9ac2..a4bdac5578cc362664880098431404f9d8d48927 100644 (file)
--- a/mod/resource/type/file/resource.class.php
+++ b/mod/resource/type/file/resource.class.php
@@ -479,6 +479,10 @@ function setup($form) {
     if ($form->instance) {     // Re-editing
         if (!$form->popup) {
             $windowtype = "page";   // No popup text => in page
+            foreach ($RESOURCE_WINDOW_OPTIONS as $optionname) {
+                $defaultvalue = "resource_popup$optionname";
+                $window->$optionname = $CFG->$defaultvalue;
+            }
         } else {
             $windowtype = "popup";
             $rawoptions = explode(',', $form->popup);

diff --git a/mod/resource/type/html/html.html b/mod/resource/type/html/html.html
index ce32d708ea099013b629181e0e265a6913ebcb43..fb06350310c9c4dfa1d6cb4b2de38f62dd5cee31 100644 (file)
--- a/mod/resource/type/html/html.html
+++ b/mod/resource/type/html/html.html
@@ -8,7 +8,7 @@
         </font>
     </td>
     <td>
-        <?php print_textarea($usehtmleditor, 20, 60, 680, 400, "alltext", $form->alltext); ?>
+        <?php print_textarea($usehtmleditor, 30, 60, 680, 500, "alltext", $form->alltext); ?>
     </td>
 </tr> 
 
@@ -24,7 +24,8 @@
             var popupitems = [<?php echo $popupoptions; ?>];
             var allitems = [<?php echo $alloptions; ?>];
         </script>
-        <input type="checkbox" name="windowpage" value=1 <?php echo ($windowtype == "page") ? "checked" : "" ?> onClick="document.form.windowpopup.checked=false; return lockoptions('form', 'windowpopup', popupitems);">
+        <input type="radio" name="windowpopup" value=0 <?php echo ($windowtype != "popup") ? "checked" : "" ?> 
+        onClick="return lockoptions('form', 'windowpopup[1]', popupitems);">
         <?php print_string("pagedisplay", "resource") ?>
     </td>
 </tr>
@@ -35,8 +36,8 @@
     </td>
     
     <td>
-        <input name="setnewwindow" type=hidden value=1>
-        <input name="windowpopup" type=checkbox value=1 onclick="lockoptions('form','windowpopup', popupitems); document.form.windowpage.checked=false;">
+        <input name="windowpopup" type=radio value=1 <?php echo ($windowtype == "popup") ? "checked" : "" ?>
+        onclick=" return lockoptions('form', 'windowpopup[1]', popupitems);">
         <?php p($strnewwindowopen) ?>
         <ul>
         <?php
@@ -61,14 +62,7 @@
         <?php
             if ($windowtype == "page") {
                 echo "<script>";
-                echo "lockoptions('form','windowpopup', popupitems);";
-                echo "document.form.windowpage.checked=true;";
-                echo "document.form.windowpopup.checked=false;";
-                echo "</script>";
-            } else {
-                echo "<script>";
-                echo "document.form.windowpopup.checked=true;";
-                echo "document.form.windowpage.checked=false;";
+                echo "lockoptions('form','windowpopup[1]', popupitems);";
                 echo "</script>";
             }
         ?>

diff --git a/mod/resource/type/html/resource.class.php b/mod/resource/type/html/resource.class.php
index e94518b2d3be589f92974f2308f10777b164828e..8289cfa7936b9329b3f2d2b238a73f965f9eb3ee 100644 (file)
--- a/mod/resource/type/html/resource.class.php
+++ b/mod/resource/type/html/resource.class.php
@@ -162,6 +162,10 @@ function setup($form) {
     if ($form->instance) {     // Re-editing
         if (!$form->popup) {
             $windowtype = "page";   // No popup text => in page
+            foreach ($RESOURCE_WINDOW_OPTIONS as $optionname) {
+                $defaultvalue = "resource_popup$optionname";
+                $window->$optionname = $CFG->$defaultvalue;
+            }
         } else {
             $windowtype = "popup";
             $rawoptions = explode(',', $form->popup);

diff --git a/mod/resource/type/text/resource.class.php b/mod/resource/type/text/resource.class.php
index a3a7066dd86bc4ddbed30888305c5ab75e195ac6..60160a40c15260d85da13a726cd1c92728f19d37 100644 (file)
--- a/mod/resource/type/text/resource.class.php
+++ b/mod/resource/type/text/resource.class.php
@@ -163,6 +163,10 @@ function setup($form) {
     if ($form->instance) {     // Re-editing
         if (!$form->popup) {
             $windowtype = "page";   // No popup text => in page
+            foreach ($RESOURCE_WINDOW_OPTIONS as $optionname) {
+                $defaultvalue = "resource_popup$optionname";
+                $window->$optionname = $CFG->$defaultvalue;
+            }
         } else {
             $windowtype = "popup";
             $rawoptions = explode(',', $form->popup);

diff --git a/mod/resource/type/text/text.html b/mod/resource/type/text/text.html
index a639aa50ccda6f09ec872d520de489ef322a91a5..9384fbd0846f7007088867fe0b8b20a29d70e297 100644 (file)
--- a/mod/resource/type/text/text.html
+++ b/mod/resource/type/text/text.html
@@ -34,7 +34,8 @@
             var popupitems = [<?php echo $popupoptions; ?>];
             var allitems = [<?php echo $alloptions; ?>];
         </script>
-        <input type="checkbox" name="windowpage" value=1 <?php echo ($windowtype == "page") ? "checked" : "" ?> onClick="document.form.windowpopup.checked=false; return lockoptions('form', 'windowpopup', popupitems);">
+        <input type="radio" name="windowpopup" value=0 <?php echo ($windowtype != "popup") ? "checked" : "" ?> 
+        onClick="return lockoptions('form', 'windowpopup[1]', popupitems);">
         <?php print_string("pagedisplay", "resource") ?>
     </td>
 </tr>
@@ -45,8 +46,8 @@
     </td>
     
     <td>
-        <input name="setnewwindow" type=hidden value=1>
-        <input name="windowpopup" type=checkbox value=1 onclick="lockoptions('form','windowpopup', popupitems); document.form.windowpage.checked=false;">
+        <input name="windowpopup" type=radio value=1 <?php echo ($windowtype == "popup") ? "checked" : "" ?>
+        onclick=" return lockoptions('form', 'windowpopup[1]', popupitems);">
         <?php p($strnewwindowopen) ?>
         <ul>
         <?php
@@ -71,14 +72,7 @@
         <?php
             if ($windowtype == "page") {
                 echo "<script>";
-                echo "lockoptions('form','windowpopup', popupitems);";
-                echo "document.form.windowpage.checked=true;";
-                echo "document.form.windowpopup.checked=false;";
-                echo "</script>";
-            } else {
-                echo "<script>";
-                echo "document.form.windowpopup.checked=true;";
-                echo "document.form.windowpage.checked=false;";
+                echo "lockoptions('form','windowpopup[1]', popupitems);";
                 echo "</script>";
             }
         ?>