[geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.11, 1.12

[Blaine Lang]

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv23890

Modified Files:
	config.class.php 
Log Message:
Changes to support revised conifg manager menu

Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** config.class.php	30 Dec 2007 03:07:07 -0000	1.11
--- config.class.php	5 Jan 2008 23:41:13 -0000	1.12
***************
*** 335,339 ****
              return config::_UI_perm_denied();
  
!         if (!isset($sg)) $sg = '0';
          $t = new Template($_CONF['path_layout'] . 'admin/config');
          $t->set_file(array('main' => 'configuration.thtml','menugroup' => 'menu_element.thtml'));
--- 335,339 ----
              return config::_UI_perm_denied();
  
!         if (!isset($sg) OR empty($sg)) $sg = '0';
          $t = new Template($_CONF['path_layout'] . 'admin/config');
          $t->set_file(array('main' => 'configuration.thtml','menugroup' => 'menu_element.thtml'));
***************
*** 345,349 ****
  
          $groups = $this->_get_groups();
! 
          if (count($groups) > 0) {
              $t->set_block('menugroup','subgroup-selector','subgroups');
--- 345,349 ----
  
          $groups = $this->_get_groups();
!         $outerloopcntr = 1;
          if (count($groups) > 0) {
              $t->set_block('menugroup','subgroup-selector','subgroups');
***************
*** 353,374 ****
                  $t->set_var("group_display", ucwords($group));
                  $subgroups = $this->get_sgroups($group);
!                 $i=1;
                  foreach ($subgroups as $sgroup) {
!                     $t->set_var('select_id', ($sg === $sgroup ? 'id="current"' : ''));
                      $t->set_var('subgroup_name', $sgroup);
                      $t->set_var("subgroup_display_name",
                                  $LANG_configsubgroups[$group][$sgroup]);
!                     if ($i == 1) {
                          $t->parse('subgroups', "subgroup-selector");
                      } else {
                          $t->parse('subgroups', "subgroup-selector", true);
                      }
!                     $i++;
                  }
                  $t->parse("menu_elements", "menugroup", true);
              }
          } else {
              $t->set_var('hide_groupselection','none');
          }
          $t->set_var('open_sg', $sg);
          $t->set_block('main','fieldset','sg_contents');
--- 353,383 ----
                  $t->set_var("group_display", ucwords($group));
                  $subgroups = $this->get_sgroups($group);
!                 $innerloopcntr=1;
                  foreach ($subgroups as $sgroup) {
!                     if ($grp == $group AND $sg == $sgroup) {
!                         $t->set_var('group_active_name',ucwords($group));
!                         $t->set_var('subgroup_active_name',$LANG_configsubgroups[$group][$sgroup]);
!                         $t->set_var('select_id', 'id="current"');
!                     } else {
!                         $t->set_var('select_id', '');
!                     }
                      $t->set_var('subgroup_name', $sgroup);
                      $t->set_var("subgroup_display_name",
                                  $LANG_configsubgroups[$group][$sgroup]);
!                     if ($innerloopcntr == 1) {
                          $t->parse('subgroups', "subgroup-selector");
                      } else {
                          $t->parse('subgroups', "subgroup-selector", true);
                      }
!                     $innerloopcntr++;
                  }
+                 $t->set_var('cntr',$outerloopcntr);
                  $t->parse("menu_elements", "menugroup", true);
+                 $outerloopcntr++;
              }
          } else {
              $t->set_var('hide_groupselection','none');
          }
+ 
          $t->set_var('open_sg', $sg);
          $t->set_block('main','fieldset','sg_contents');