From: skodak <skodak>
Date: Fri, 12 Jan 2007 11:43:25 +0000 (+0000)
Subject: MDL-7013 advanced buttons inplemented in resource settings
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=eee3dc10ddcd0a9d8d735563f016376db7f26c74;p=moodle.git

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 72461a9cd9..f76f3bc068 100644
--- 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 0df9474913..a60c16f1d5 100644
--- 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 a022517d86..4184649b04 100644
--- 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 027603b767..642e203e94 100644
--- 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 82d81627a1..b619bc0f80 100644
--- 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);
     }
 }