[geeklog-cvs] Geeklog-1.x/plugins/calendar functions.inc, 1.71, 1.72

[Oliver]

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

Modified Files:
	functions.inc 
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: functions.inc
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/plugins/calendar/functions.inc,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** functions.inc	5 Aug 2007 07:51:40 -0000	1.71
--- functions.inc	29 Aug 2007 06:54:32 -0000	1.72
***************
*** 909,926 ****
  
      $menu_arr = array (
!                     array('url' => $_CONF['site_admin_url'] . '/plugins/calendar/index.php?mode=edit',
!                           'text' => $LANG_ADMIN['create_new']),
!                     array('url' => $_CONF['site_admin_url'] . '/plugins/calendar/index.php?mode=batchdelete',
!                           'text' => $LANG_CAL_ADMIN[26]),
!                     array('url' => $_CONF['site_admin_url'],
!                           'text' => $LANG_ADMIN['admin_home'])
      );
  
!     $text_arr = array('has_menu' =>  true,
!                       'has_extras'   => true,
!                       'title' => $LANG_CAL_ADMIN[11],
!                       'instructions' => $LANG_CAL_ADMIN[12],
!                       'icon' => plugin_geticon_calendar(),
!                       'form_url' => $_CONF['site_admin_url'] . "/plugins/calendar/index.php");
  
      $sql = "SELECT {$_TABLES['events']}.*, {$_TABLES['users']}.username, {$_TABLES['users']}.fullname "
--- 909,926 ----
  
      $menu_arr = array (
!         array('url' => $_CONF['site_admin_url'] . '/plugins/calendar/index.php?mode=edit',
!               'text' => $LANG_ADMIN['create_new']),
!         array('url' => $_CONF['site_admin_url'] . '/plugins/calendar/index.php?mode=batchdelete',
!               'text' => $LANG_CAL_ADMIN[26]),
!         array('url' => $_CONF['site_admin_url'],
!               'text' => $LANG_ADMIN['admin_home'])
      );
+     $menu = ADMIN_createMenu($menu_arr, $LANG_CAL_ADMIN[12], plugin_geticon_calendar());
  
!     $text_arr = array(
!         'has_extras'   => true,
!         'title' => $LANG_CAL_ADMIN[11],
!         'form_url' => $_CONF['site_admin_url'] . "/plugins/calendar/index.php"
!     );
  
      $sql = "SELECT {$_TABLES['events']}.*, {$_TABLES['users']}.username, {$_TABLES['users']}.fullname "
***************
*** 936,941 ****
  
      $retval .= ADMIN_list ('calendar', 'plugin_getListField_calendar',
!                            $header_arr, $text_arr, $query_arr, $menu_arr,
!                            $defsort_arr);
  
      return $retval;
--- 936,941 ----
  
      $retval .= ADMIN_list ('calendar', 'plugin_getListField_calendar',
!                            $header_arr, $text_arr, $query_arr,
!                            $defsort_arr, $menu);
  
      return $retval;