MDL-7013 advanced buttons inplemented in resource settings

diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php
index 72461a9cd94dd2d4bec7b7fa3fdf0515811d979e..f76f3bc068073663b8df5f7c958b43446b312854 100644 (file)
--- a/mod/resource/type/file/resource.class.php
+++ b/mod/resource/type/file/resource.class.php
@@ -584,6 +584,7 @@ function setup_elements(&$mform) {
     $mform->addElement('checkbox', 'framepage', get_string('frameifpossible', 'resource'));
     $mform->setDefault('framepage', 0);
     $mform->disabledIf('framepage', 'windowpopup', 'eq', 0);
+    $mform->setAdvanced('framepage');
 
     foreach ($RESOURCE_WINDOW_OPTIONS as $option) {
         if ($option == 'height' or $option == 'width') {
@@ -595,6 +596,7 @@ function setup_elements(&$mform) {
             $mform->setDefault($option, $CFG->{'resource_popup'.$option});
             $mform->disabledIf($option, 'windowpopup', 'eq', 1);
         }
+        $mform->setAdvanced($option);
     }
 
     $mform->addElement('header', 'parameters', get_string('parameters', 'resource'));
@@ -620,7 +622,8 @@ function setup_elements(&$mform) {
         $group = array();
         $group[] =& $mform->createElement('text', $parsename, '', array('size'=>'12'));//TODO: accessiblity
         $group[] =& $mform->createElement('select', $parametername, '', $options);//TODO: accessiblity
-        $mform->addGroup($group, 'pargroup', get_string('variablename', 'resource').'='.get_string('parameter', 'resource'), ' ', false);
+        $mform->addGroup($group, 'pargroup'.$i, get_string('variablename', 'resource').'='.get_string('parameter', 'resource'), ' ', false);
+        $mform->setAdvanced('pargroup'.$i);
 
         $mform->setDefault($parametername, '-');
     }

diff --git a/mod/resource/type/html/resource.class.php b/mod/resource/type/html/resource.class.php
index 0df9474913d931dc4b31b86d1c4cfc8732193013..a60c16f1d5a32946e56ab309975c08daaaaa4965 100644 (file)
--- a/mod/resource/type/html/resource.class.php
+++ b/mod/resource/type/html/resource.class.php
@@ -159,6 +159,7 @@ function setup_elements(&$mform) {
     $mform->addElement('checkbox', 'blockdisplay', get_string('showcourseblocks', 'resource'));
     $mform->setDefault('blockdisplay', 0);
     $mform->disabledIf('blockdisplay', 'windowpopup', 'eq', '0');
+    $mform->setAdvanced('blockdisplay');
 
     foreach ($RESOURCE_WINDOW_OPTIONS as $option) {
         if ($option == 'height' or $option == 'width') {
@@ -170,6 +171,7 @@ function setup_elements(&$mform) {
             $mform->setDefault($option, $CFG->{'resource_popup'.$option});
             $mform->disabledIf($option, 'windowpopup', 'eq', '1');
         }
+        $mform->setAdvanced($option);
     }
 }
 

diff --git a/mod/resource/type/ims/resource.class.php b/mod/resource/type/ims/resource.class.php
index a022517d861257a5482998ae160551e5724df403..4184649b043ca642e8dbb0158750880d4391a8ef 100644 (file)
--- a/mod/resource/type/ims/resource.class.php
+++ b/mod/resource/type/ims/resource.class.php
@@ -647,24 +647,28 @@ class resource_ims extends resource_base {
                 $mform->setDefault($option, $CFG->{'resource_popup'.$option});
                 $mform->disabledIf($option, 'windowpopup', 'eq', 1);
             }
+            $mform->setAdvanced($option);
         }
 
         $mform->addElement('header', 'parameters', get_string('parameters', 'resource'));
 
         $mform->addElement('selectyesno', 'param_navigationmenu', get_string('navigationmenu', 'resource'));
         $mform->setDefault('param_navigationmenu', 1);
+
         $mform->addElement('selectyesno', 'param_tableofcontents', get_string('tableofcontents', 'resource'));
-        $mform->disabledIf($option, 'param_navigationmenu', 'eq', 1);
+        $mform->disabledIf('param_tableofcontents', 'param_navigationmenu', 'eq', 1);
         $mform->setDefault('param_tableofcontents', 0);
+
         $mform->addElement('selectyesno', 'param_navigationbuttons', get_string('navigationbuttons', 'resource'));
         $mform->setDefault('param_navigationbuttons', 0);
+
         $mform->addElement('selectyesno', 'param_skipsubmenus', get_string('skipsubmenus', 'resource'));
         $mform->setDefault('param_skipsubmenus', 1);
-        $mform->disabledIf($option, 'param_navigationmenu', 'eq', 1);
+        $mform->disabledIf('param_skipsubmenus', 'param_navigationmenu', 'eq', 1);
+        
         $mform->addElement('selectyesno', 'param_navigationupbutton', get_string('navigationup', 'resource'));
-        $mform->setDefault('param_navigationup', 1);
-        $mform->disabledIf($option, 'param_navigationmenu', 'eq', 1);
-        $mform->disabledIf($option, 'param_navigationmenu', 'eq', 0);//????????
+        $mform->setDefault('param_navigationupbutton', 1);
+        $mform->disabledIf('param_navigationupbutton', 'param_navigationmenu', 'eq', 1);
 
     }
 

diff --git a/mod/resource/type/repository/resource.class.php b/mod/resource/type/repository/resource.class.php
index 027603b767779c7c8ce38a2e7a37d728b587822e..642e203e94f1b685cb58ed7c7c7a1b07b76dadce 100644 (file)
--- a/mod/resource/type/repository/resource.class.php
+++ b/mod/resource/type/repository/resource.class.php
@@ -577,6 +577,7 @@ function setup_elements(&$mform) {
     $mform->addElement('checkbox', 'framepage', get_string('frameifpossible', 'resource'));
     $mform->setDefault('framepage', 0);
     $mform->disabledIf('framepage', 'windowpopup', 'eq', 0);
+    $mform->setAdvanced('framepage');
 
     foreach ($RESOURCE_WINDOW_OPTIONS as $option) {
         if ($option == 'height' or $option == 'width') {
@@ -588,6 +589,7 @@ function setup_elements(&$mform) {
             $mform->setDefault($option, $CFG->{'resource_popup'.$option});
             $mform->disabledIf($option, 'windowpopup', 'eq', 1);
         }
+        $mform->setAdvanced($option);
     }
 
     $mform->addElement('header', 'parameters', get_string('parameters', 'resource'));
@@ -613,7 +615,8 @@ function setup_elements(&$mform) {
         $group = array();
         $group[] =& $mform->createElement('text', $parsename, '', array('size'=>'12'));//TODO: accessiblity
         $group[] =& $mform->createElement('select', $parametername, '', $options);//TODO: accessiblity
-        $mform->addGroup($group, 'pargroup', get_string('variablename', 'resource').'='.get_string('parameter', 'resource'), ' ', false);
+        $mform->addGroup($group, 'pargroup'.$i, get_string('variablename', 'resource').'='.get_string('parameter', 'resource'), ' ', false);
+        $mform->setAdvanced('pargroup'.$i);
 
         $mform->setDefault($parametername, '-');
     }

diff --git a/mod/resource/type/text/resource.class.php b/mod/resource/type/text/resource.class.php
index 82d81627a1bb70cd9c5bcec84ebd8126d897f089..b619bc0f805f698ba239042b02f57a62542b141c 100644 (file)
--- a/mod/resource/type/text/resource.class.php
+++ b/mod/resource/type/text/resource.class.php
@@ -166,6 +166,7 @@ function setup_elements(&$mform) {
     $mform->addElement('checkbox', 'blockdisplay', get_string('showcourseblocks', 'resource'));
     $mform->setDefault('blockdisplay', 0);
     $mform->disabledIf('blockdisplay', 'windowpopup', 'eq', 0);
+    $mform->setAdvanced('blockdisplay');
 
     foreach ($RESOURCE_WINDOW_OPTIONS as $option) {
         if ($option == 'height' or $option == 'width') {
@@ -177,6 +178,7 @@ function setup_elements(&$mform) {
             $mform->setDefault($option, $CFG->{'resource_popup'.$option});
             $mform->disabledIf($option, 'windowpopup', 'eq', 1);
         }
+        $mform->setAdvanced($option);
     }
 }