[geeklog-cvs] Geeklog-1.x/system lib-admin.php,1.133,1.134

[Dirk Haun]

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

Modified Files:
	lib-admin.php 
Log Message:
Ensure consistent display of the admin screens (bug #0000650)


Index: lib-admin.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-admin.php,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** lib-admin.php	22 May 2008 08:23:53 -0000	1.133
--- lib-admin.php	7 Jun 2008 12:41:44 -0000	1.134
***************
*** 54,67 ****
                             $data_arr, $options = '', $form_arr='')
  {
!     global $_CONF, $_TABLES, $LANG01, $LANG_ADMIN, $LANG_ACCESS, $_IMAGE_TYPE, $MESSAGE;
  
      $retval = '';
  
!     $help_url = "";
      if (!empty($text_arr['help_url'])) {
          $help_url = $text_arr['help_url'];
      }
  
!     $title = "";
      if (!empty($text_arr['title'])) {
          $title = $text_arr['title'];
--- 54,68 ----
                             $data_arr, $options = '', $form_arr='')
  {
!     global $_CONF, $_TABLES, $LANG01, $LANG_ADMIN, $LANG_ACCESS, $MESSAGE,
!            $_IMAGE_TYPE;
  
      $retval = '';
  
!     $help_url = '';
      if (!empty($text_arr['help_url'])) {
          $help_url = $text_arr['help_url'];
      }
  
!     $title = '';
      if (!empty($text_arr['title'])) {
          $title = $text_arr['title'];
***************
*** 177,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'));
  
      return $retval;
--- 178,189 ----
      $admin_templates->parse('output', 'list');
  
!     if (!empty($title)) {
!         $retval .= COM_startBlock($title, $help_url,
!                             COM_getBlockTemplate('_admin_block', 'header'));
!     }
      $retval .= $admin_templates->finish($admin_templates->get_var('output'));
!     if (!empty($title)) {
!         $retval .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer'));
!     }
  
      return $retval;
***************
*** 539,547 ****
      $admin_templates->parse('output', 'list');
  
!     # Do the actual output
!     $retval .= COM_startBlock ($title, $help_url,
!                                COM_getBlockTemplate ('_admin_block', 'header'));
!     $retval .= $admin_templates->finish($admin_templates->get_var('output'))
!              . COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
  
      return $retval;
--- 544,556 ----
      $admin_templates->parse('output', 'list');
  
!     // Do the actual output
!     if (!empty($title)) {
!         $retval .= COM_startBlock($title, $help_url,
!                             COM_getBlockTemplate('_admin_block', 'header'));
!     }
!     $retval .= $admin_templates->finish($admin_templates->get_var('output'));
!     if (!empty($title)) {
!         $retval .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer'));
!     }
  
      return $retval;