[geeklog-cvs] Geeklog-1.x/public_html/admin/plugins/links category.php, 1.3, 1.4 index.php, 1.49, 1.50

[Oliver]

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

Modified Files:
	category.php index.php 
Log Message:
de-cluttering the admin lists by outsourcing the top menu into a separate function. It has nothing to do with the list itself as such and can be used in other places now also to preserve formatting and move further HTML into a single template

Index: category.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/links/category.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** category.php	29 Aug 2007 05:23:09 -0000	1.3
--- category.php	29 Aug 2007 06:55:04 -0000	1.4
***************
*** 88,109 ****
  
      $menu_arr = array (
!                     array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php',
!                           'text' => $LANG_LINKS_ADMIN[53]),
!                     array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php?mode=edit',
!                           'text' => $LANG_LINKS_ADMIN[51]),
!                     array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php?checkhtml=true',
!                           'text' => $LANG_LINKS_ADMIN[26]),
!                     array('url' => $_CONF['site_admin_url'] . '/plugins/links/category.php',
!                           'text' => $LANG_LINKS_ADMIN[50]),
!                     array('url' => $_CONF['site_admin_url'] . '/plugins/links/category.php?mode=edit',
!                           'text' => $LANG_LINKS_ADMIN[52]),
!                     array('url' => $_CONF['site_admin_url'],
!                           'text' => $LANG_ADMIN['admin_home']));
  
!     $text_arr = array('has_menu' =>  true,
!                       'has_extras'   => true,
!                       'title' => $LANG_LINKS_ADMIN[54], 'instructions' => $LANG_LINKS_ADMIN[55],
!                       'icon' => plugin_geticon_links(),
!                       'form_url' => $_CONF['site_admin_url'] . "/plugins/links/category.php");
  
      $dummy = array();
--- 88,111 ----
  
      $menu_arr = array (
!         array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php',
!               'text' => $LANG_LINKS_ADMIN[53]),
!         array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php?mode=edit',
!               'text' => $LANG_LINKS_ADMIN[51]),
!         array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php?checkhtml=true',
!               'text' => $LANG_LINKS_ADMIN[26]),
!         array('url' => $_CONF['site_admin_url'] . '/plugins/links/category.php',
!               'text' => $LANG_LINKS_ADMIN[50]),
!         array('url' => $_CONF['site_admin_url'] . '/plugins/links/category.php?mode=edit',
!               'text' => $LANG_LINKS_ADMIN[52]),
!         array('url' => $_CONF['site_admin_url'],
!               'text' => $LANG_ADMIN['admin_home'])
!     );
!     $menu = 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"
!     );
  
      $dummy = array();
***************
*** 111,115 ****
  
      $retval .= ADMIN_simpleList ("plugin_getListField_categories", $header_arr, $text_arr,
!                             $data_arr, $menu_arr);
  
      return $retval;
--- 113,117 ----
  
      $retval .= ADMIN_simpleList ("plugin_getListField_categories", $header_arr, $text_arr,
!                             $data_arr, $menu);
  
      return $retval;

Index: index.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/links/index.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** index.php	29 Aug 2007 06:00:28 -0000	1.49
--- index.php	29 Aug 2007 06:55:04 -0000	1.50
***************
*** 377,386 ****
                'text' => $LANG_ADMIN['admin_home'])
      );
  
      $text_arr = array(
-         'has_menu' =>  true,
          'has_extras'   => true,
!         'title' => $LANG_LINKS_ADMIN[11], 'instructions' => $LANG_LINKS_ADMIN[12],
!         'icon' => plugin_geticon_links(),
          'form_url' => $_CONF['site_admin_url'] . "/plugins/links/index.php$validate"
      );
--- 377,385 ----
                'text' => $LANG_ADMIN['admin_home'])
      );
+     $menu = ADMIN_createMenu($menu_arr, $LANG_LINKS_ADMIN[12], 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"
      );
***************
*** 398,402 ****
  
      $retval .= ADMIN_list ("links", "plugin_getListField_links", $header_arr, $text_arr,
!                             $query_arr, $menu_arr, $defsort_arr);
  
      return $retval;
--- 397,401 ----
  
      $retval .= ADMIN_list ("links", "plugin_getListField_links", $header_arr, $text_arr,
!                             $query_arr, $defsort_arr, $menu);
  
      return $retval;