[geeklog-cvs] Geeklog-1.x/system lib-admin.php,1.111,1.112

[Oliver]

Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv60098

Modified Files:
	lib-admin.php 
Log Message:
remove unnecessary link-only template

Index: lib-admin.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/lib-admin.php,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** lib-admin.php	11 Jul 2007 01:33:58 -0000	1.111
--- lib-admin.php	20 Aug 2007 06:06:54 -0000	1.112
***************
*** 103,115 ****
      }
      if (isset($text_arr['has_menu']) && $text_arr['has_menu']) {
!         for ($i = 0; $i < count($menu_arr); $i++) {
!             $admin_templates->set_var('menu_url', $menu_arr[$i]['url'] );
!             $admin_templates->set_var('menu_text', $menu_arr[$i]['text'] );
              if ($i < (count($menu_arr) -1)) {
!                 $admin_templates->set_var('line', '|' );
              }
-             $admin_templates->parse('menu_fields', 'menufields', true);
-             $admin_templates->clear_var('line');
          }
          $admin_templates->set_var('lang_instructions', $text_arr['instructions']);
          $admin_templates->parse('top_menu', 'topmenu', true);
--- 103,114 ----
      }
      if (isset($text_arr['has_menu']) && $text_arr['has_menu']) {
!         $menu_fields = '';
!         for ($i = 0; $i < count($menu_arr); $i++) { # iterate through menu
!             $menu_fields .= COM_createLink($menu_arr[$i]['text'], $menu_arr[$i]['url']);
              if ($i < (count($menu_arr) -1)) {
!                 $menu_fields .= ' | '; # add separator
              }
          }
+         $admin_templates->set_var('menu_fields', $menu_fields);
          $admin_templates->set_var('lang_instructions', $text_arr['instructions']);
          $admin_templates->parse('top_menu', 'topmenu', true);
***************
*** 285,289 ****
      }
  
!     # get all template fields. Maybe menufields can be only loaded if used?
      $admin_templates = new Template($_CONF['path_layout'] . 'admin/lists');
      $admin_templates->set_file (array (
--- 284,288 ----
      }
  
!     # get all template fields.
      $admin_templates = new Template($_CONF['path_layout'] . 'admin/lists');
      $admin_templates->set_file (array (
***************
*** 292,297 ****
          'header' => 'header.thtml',
          'row' => 'listitem.thtml',
!         'field' => 'field.thtml',
!         'menufields' => 'menufields.thtml'
      ));
  
--- 291,295 ----
          'header' => 'header.thtml',
          'row' => 'listitem.thtml',
!         'field' => 'field.thtml'
      ));
  
***************
*** 337,349 ****
      // the user can disable the menu. if used, create it.
      if ($text_arr['has_menu']) {
          for ($i = 0; $i < count($menu_arr); $i++) { # iterate through menu
!             $admin_templates->set_var('menu_url', $menu_arr[$i]['url'] );
!             $admin_templates->set_var('menu_text', $menu_arr[$i]['text'] );
              if ($i < (count($menu_arr) -1)) {
!                 $admin_templates->set_var('line', '|' ); # add separator
              }
-             $admin_templates->parse('menu_fields', 'menufields', true);
-             $admin_templates->clear_var('line'); # clear separator after use
          }
          # add text strings to template
          $admin_templates->set_var('lang_instructions', $text_arr['instructions']);
--- 335,346 ----
      // the user can disable the menu. if used, create it.
      if ($text_arr['has_menu']) {
+         $menu_fields = '';
          for ($i = 0; $i < count($menu_arr); $i++) { # iterate through menu
!             $menu_fields .= COM_createLink($menu_arr[$i]['text'], $menu_arr[$i]['url']);
              if ($i < (count($menu_arr) -1)) {
!                 $menu_fields .= ' | '; # add separator
              }
          }
+         $admin_templates->set_var('menu_fields', $menu_fields);
          # add text strings to template
          $admin_templates->set_var('lang_instructions', $text_arr['instructions']);