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

[Dirk Haun]

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

Modified Files:
	config.class.php 
Log Message:
Reinstated some earlier improvements: Nice names for the config sections; sections sorted by plugin name (with "Geeklog" always on top)


Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** config.class.php	2 Feb 2008 21:56:43 -0000	1.19
--- config.class.php	3 Feb 2008 08:36:20 -0000	1.20
***************
*** 651,671 ****
  
  
!     function _UI_configmanager_menu($conf_group) {
!         global $_CONF,$LANG_configsubgroups,$LANG_CONFIG;
  
-         $retval = COM_startBlock( 'Config Sections', '', COM_getBlockTemplate( 'configmanager_block', 'header' ));
-         $retval .= "<div><a href=\"{$_CONF['site_url']}\">{$LANG_CONFIG['home']}</a></div>";
-         $retval .= "<div><a href=\"{$_CONF['site_admin_url']}\">{$LANG_CONFIG['admin_home']}</a></div>";
          $groups = $this->_get_groups();
          if (count($groups) > 0) {
              foreach ($groups as $group) {
!                 $group_display = ucwords($group);
!                 $retval .= "<div><a href=\"#\" onclick='open_group(\"$group\")'>$group_display</a></div>";
              }
          }
-         $retval .= COM_endBlock(COM_getBlockTemplate( 'configmanager_block', 'footer' ));
  
!         $subgroup_title = ucwords($conf_group);
!         $retval .= COM_startBlock( $subgroup_title, '',COM_getBlockTemplate( 'configmanager_block', 'header' ) );
  
          $groups = $this->get_sgroups($conf_group);
--- 651,698 ----
  
  
!     function _UI_configmanager_menu($conf_group)
!     {
!         global $_CONF, $LANG_ADMIN, $LANG_CONFIG,
!                $LANG_configsections, $LANG_configsubgroups;
! 
!         $retval = COM_startBlock($LANG_CONFIG['sections'], '',
!                         COM_getBlockTemplate('configmanager_block', 'header'));
!         $link_array = array();
  
          $groups = $this->_get_groups();
          if (count($groups) > 0) {
              foreach ($groups as $group) {
!                 if (empty($LANG_configsections[$group]['label'])) {
!                     $group_display = ucwords($group);
!                 } else {
!                     $group_display = $LANG_configsections[$group]['label'];
!                 }
!                 $link = "<div><a href=\"#\" onclick='open_group(\"$group\")'>$group_display</a></div>";
! 
!                 if ($group == 'Core') {
!                     $retval .= $link;
!                 } else {
!                     $link_array[$group_display] = $link;
!                 }
              }
          }
  
!         uksort($link_array, 'strcasecmp');
!         foreach ($link_array as $link) {
!             $retval .= $link;
!         }
! 
!         $retval .= '<div><a href="' . $_CONF['site_admin_url'] . '">'
!                 . $LANG_ADMIN['admin_home'] . '</a></div>';
!         $retval .= COM_endBlock(COM_getBlockTemplate('configmanager_block',
!                                                      'footer'));
! 
!         if (empty($LANG_configsections[$conf_group]['title'])) {
!             $subgroup_title = ucwords($conf_group);
!         } else {
!             $subgroup_title = $LANG_configsections[$conf_group]['title'];
!         }
!         $retval .= COM_startBlock($subgroup_title, '',
!                         COM_getBlockTemplate('configmanager_block', 'header'));
  
          $groups = $this->get_sgroups($conf_group);
***************
*** 676,683 ****
              }
          }
!         $retval .= COM_endBlock(COM_getBlockTemplate( 'configmanager_block', 'footer' ));
  
          return $retval;
- 
      }
  }
--- 703,710 ----
              }
          }
!         $retval .= COM_endBlock(COM_getBlockTemplate('configmanager_block',
!                                                      'footer'));
  
          return $retval;
      }
  }