[geeklog-cvs] Geeklog-1.x/public_html/admin/plugins/staticpages index.php, 1.92, 1.93

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/staticpages
In directory qs1489.pair.com:/tmp/cvs-serv87291/public_html/admin/plugins/staticpages

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


Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/staticpages/index.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** index.php	3 May 2008 15:09:13 -0000	1.92
--- index.php	7 Jun 2008 12:41:45 -0000	1.93
***************
*** 9,13 ****
  // | Administration page.                                                      |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2007 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony AT tonybibbs DOT com                     |
--- 9,13 ----
  // | Administration page.                                                      |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony AT tonybibbs DOT com                     |
***************
*** 35,40 ****
  // $Id$
  
! require_once ('../../../lib-common.php');
! require_once ('../../auth.inc.php');
  
  if (!SEC_hasRights ('staticpages.edit')) {
--- 35,40 ----
  // $Id$
  
! require_once '../../../lib-common.php';
! require_once '../../auth.inc.php';
  
  if (!SEC_hasRights ('staticpages.edit')) {
***************
*** 382,389 ****
  {
      global $_CONF, $_TABLES, $_IMAGE_TYPE, $LANG_ADMIN, $LANG_STATIC;
!     require_once( $_CONF['path_system'] . 'lib-admin.php' );
      $retval = '';
  
!     $header_arr = array(      # dislay 'text' and use table field 'field'
          array('text' => $LANG_ADMIN['edit'], 'field' => 'edit', 'sort' => false),
          array('text' => $LANG_ADMIN['copy'], 'field' => 'copy', 'sort' => false),
--- 382,391 ----
  {
      global $_CONF, $_TABLES, $_IMAGE_TYPE, $LANG_ADMIN, $LANG_STATIC;
! 
!     require_once $_CONF['path_system'] . 'lib-admin.php';
! 
      $retval = '';
  
!     $header_arr = array(      # display 'text' and use table field 'field'
          array('text' => $LANG_ADMIN['edit'], 'field' => 'edit', 'sort' => false),
          array('text' => $LANG_ADMIN['copy'], 'field' => 'copy', 'sort' => false),
***************
*** 402,411 ****
                'text' => $LANG_ADMIN['admin_home'])
      );
      $retval .= ADMIN_createMenu($menu_arr, $LANG_STATIC['instructions'], plugin_geticon_staticpages());
  
      $text_arr = array(
!         'has_extras'   => true,
!         'title' => $LANG_STATIC['staticpagelist'],
!         'form_url' => $_CONF['site_admin_url'] . "/plugins/staticpages/index.php"
      );
  
--- 404,416 ----
                'text' => $LANG_ADMIN['admin_home'])
      );
+ 
+     $retval .= COM_startBlock($LANG_STATIC['staticpagelist'], '',
+                               COM_getBlockTemplate('_admin_block', 'header'));
+ 
      $retval .= ADMIN_createMenu($menu_arr, $LANG_STATIC['instructions'], plugin_geticon_staticpages());
  
      $text_arr = array(
!         'has_extras' => true,
!         'form_url' => $_CONF['site_admin_url'] . '/plugins/staticpages/index.php'
      );
  
***************
*** 418,425 ****
      );
  
!     $retval .= ADMIN_list ("static_pages", "plugin_getListField_staticpages", $header_arr, $text_arr,
!                             $query_arr, $defsort_arr);
!     return $retval;
  
  }
  
--- 423,431 ----
      );
  
!     $retval .= ADMIN_list('static_pages', 'plugin_getListField_staticpages',
!                           $header_arr, $text_arr, $query_arr, $defsort_arr);
!     $retval .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer'));
  
+     return $retval;
  }