[geeklog-cvs] Geeklog-1.x/public_html/admin/plugins/links category.php, 1.16, 1.17 index.php, 1.60, 1.61

[Dirk Haun]

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

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


Index: category.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/links/category.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** category.php	18 May 2008 13:55:40 -0000	1.16
--- category.php	7 Jun 2008 12:41:45 -0000	1.17
***************
*** 102,111 ****
                'text' => $LANG_ADMIN['admin_home'])
      );
      $retval .= ADMIN_createMenu($menu_arr, $LANG_LINKS_ADMIN[12], plugin_geticon_links());
  
      $text_arr = array(
!         'has_extras'   => true,
!         'title' => $LANG_LINKS_ADMIN[54],
!         'form_url' => $_CONF['site_admin_url'] . '/plugins/links/category.php'
      );
  
--- 102,114 ----
                'text' => $LANG_ADMIN['admin_home'])
      );
+ 
+     $retval .= COM_startBlock($LANG_LINKS_ADMIN[54], '',
+                               COM_getBlockTemplate('_admin_block', 'header'));
+ 
      $retval .= ADMIN_createMenu($menu_arr, $LANG_LINKS_ADMIN[12], plugin_geticon_links());
  
      $text_arr = array(
!         'has_extras' => true,
!         'form_url'   => $_CONF['site_admin_url'] . '/plugins/links/category.php'
      );
  
***************
*** 115,118 ****
--- 118,122 ----
      $retval .= ADMIN_simpleList('plugin_getListField_categories', $header_arr,
                                  $text_arr, $data_arr);
+     $retval .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer'));
  
      return $retval;

Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/links/index.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** index.php	18 May 2008 13:55:40 -0000	1.60
--- index.php	7 Jun 2008 12:41:45 -0000	1.61
***************
*** 405,413 ****
                'text' => $LANG_ADMIN['admin_home']);
  
      $retval .= ADMIN_createMenu($menu_arr, $LANG_LINKS_ADMIN[12] . $validate_help, plugin_geticon_links());
  
      $text_arr = array(
!         'has_extras'   => true,
!         'title' => $LANG_LINKS_ADMIN[11],
          'form_url' => $_CONF['site_admin_url'] . "/plugins/links/index.php$validate"
      );
--- 405,415 ----
                'text' => $LANG_ADMIN['admin_home']);
  
+     $retval .= COM_startBlock($LANG_LINKS_ADMIN[11], '',
+                               COM_getBlockTemplate('_admin_block', 'header'));
+ 
      $retval .= ADMIN_createMenu($menu_arr, $LANG_LINKS_ADMIN[12] . $validate_help, plugin_geticon_links());
  
      $text_arr = array(
!         'has_extras' => true,
          'form_url' => $_CONF['site_admin_url'] . "/plugins/links/index.php$validate"
      );
***************
*** 424,429 ****
      );
  
!     $retval .= ADMIN_list ("links", "plugin_getListField_links", $header_arr, $text_arr,
!                             $query_arr, $defsort_arr, '', '', '', $form_arr);
  
      return $retval;
--- 426,432 ----
      );
  
!     $retval .= ADMIN_list('links', 'plugin_getListField_links', $header_arr,
!                     $text_arr, $query_arr, $defsort_arr, '', '', '', $form_arr);
!     $retval .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer'));
  
      return $retval;