[geeklog-cvs] Geeklog-1.x/system lib-admin.php,1.121,1.122

[Oliver]

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

Modified Files:
	lib-admin.php 
Log Message:
code improvements

Index: lib-admin.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/lib-admin.php,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** lib-admin.php	9 Oct 2007 05:37:20 -0000	1.121
--- lib-admin.php	10 Oct 2007 02:28:57 -0000	1.122
***************
*** 99,119 ****
      }
  
!     $icon_arr = array(
!         'edit' => '<img src="' . $_CONF['layout_url'] . '/images/edit.'
!              . $_IMAGE_TYPE . '" alt="' . $LANG_ADMIN['edit'] . '" title="'
!              . $LANG_ADMIN['edit'] . '">',
!         'copy' => '<img src="' . $_CONF['layout_url'] . '/images/copy.'
!              . $_IMAGE_TYPE . '" alt="' . $LANG_ADMIN['copy'] . '" title="'
!              . $LANG_ADMIN['copy'] . '">',
!         'list' => '<img src="' . $_CONF['layout_url'] . '/images/list.'
!             . $_IMAGE_TYPE . '" alt="' . $LANG_ACCESS['listthem']
!             . '" title="' . $LANG_ACCESS['listthem'] . '">',
!         'addchild' => '<img src="' . $_CONF['layout_url'] . '/images/addchild.'
!             . $_IMAGE_TYPE . '" alt="' . $LANG_ADMIN['add_child']
!             . '" title="' . $LANG_ADMIN['add_child'] . '">'
!     );
! 
!     $retval .= COM_startBlock ($title, $help_url,
!                                COM_getBlockTemplate ('_admin_block', 'header'));
  
      // Check if the delete checkbox and support for the delete all feature should be displayed
--- 99,109 ----
      }
  
!     # define icon paths. Those will be transmitted to $fieldfunction.
!     $icons_type_arr = array('edit', 'copy', 'list', 'addchild');
!     $icon_arr = array();
!     foreach ($icons_type_arr as $icon_type) {
!         $icon_url = "{$_CONF['layout_url']}/images/$icon_type.$_IMAGE_TYPE";
!         $icon_arr[$icon_type] = COM_createImage($icon_url, $LANG_ADMIN[$icon_type]);
!     }
  
      // Check if the delete checkbox and support for the delete all feature should be displayed
***************
*** 188,191 ****
--- 178,184 ----
  
      $admin_templates->parse('output', 'list');
+ 
+     $retval .= COM_startBlock ($title, $help_url,
+                                COM_getBlockTemplate ('_admin_block', 'header'));
      $retval .= $admin_templates->finish($admin_templates->get_var('output'));
      $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
***************
*** 549,555 ****
      $retval .= COM_startBlock ($title, $help_url,
                                 COM_getBlockTemplate ('_admin_block', 'header'));
-     if (!$has_extras) {
-         $retval .= $text_arr['instructions'];
-     }
      $retval .= $admin_templates->finish($admin_templates->get_var('output'))
               . COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
--- 542,545 ----