[geeklog-cvs] Geeklog-1.x/system lib-admin.php,1.113,1.114
Oliver
ospiess at qs1489.pair.com
Wed Aug 29 02:55:42 EDT 2007
Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv10255
Modified Files:
lib-admin.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: lib-admin.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/lib-admin.php,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** lib-admin.php 20 Aug 2007 06:14:16 -0000 1.113
--- lib-admin.php 29 Aug 2007 06:55:40 -0000 1.114
***************
*** 53,57 ****
*/
function ADMIN_simpleList($fieldfunction, $header_arr, $text_arr,
! $data_arr, $menu_arr = '', $options = '', $form_arr='')
{
global $_CONF, $_TABLES, $LANG01, $LANG_ADMIN, $LANG_ACCESS, $_IMAGE_TYPE, $MESSAGE;
--- 53,57 ----
*/
function ADMIN_simpleList($fieldfunction, $header_arr, $text_arr,
! $data_arr, $menu = '', $options = '', $form_arr='')
{
global $_CONF, $_TABLES, $LANG01, $LANG_ADMIN, $LANG_ACCESS, $_IMAGE_TYPE, $MESSAGE;
***************
*** 74,83 ****
}
- $icon = '';
- if (isset($text_arr['icon'])) {
- $icon = $text_arr['icon'];
- }
$admin_templates = new Template($_CONF['path_layout'] . 'admin/lists');
! $admin_templates->set_file (array ('topmenu' => 'topmenu_nosearch.thtml',
'list' => 'list.thtml',
'header' => 'header.thtml',
--- 74,79 ----
}
$admin_templates = new Template($_CONF['path_layout'] . 'admin/lists');
! $admin_templates->set_file (array ('top_menu' => 'topmenu.thtml',
'list' => 'list.thtml',
'header' => 'header.thtml',
***************
*** 101,115 ****
$admin_templates->set_var('formfields_bottom', $form_arr['bottom']);
}
! if (isset($text_arr['has_menu']) && $text_arr['has_menu']) {
! $menu_fields = '';
! for ($i = 0; $i < count($menu_arr); $i++) { # iterate through menu
! $menu_fields .= COM_createLink($menu_arr[$i]['text'], $menu_arr[$i]['url']);
! if ($i < (count($menu_arr) -1)) {
! $menu_fields .= ' | '; # add separator
! }
! }
! $admin_templates->set_var('menu_fields', $menu_fields);
! $admin_templates->set_var('lang_instructions', $text_arr['instructions']);
! $admin_templates->parse('top_menu', 'topmenu', true);
}
--- 97,102 ----
$admin_templates->set_var('formfields_bottom', $form_arr['bottom']);
}
! if (!empty ($menu)) {
! $admin_templates->set_var('top_menu', $menu);
}
***************
*** 214,219 ****
* @param array $text_arr array with different text strings
* @param array $query_arr array with sql-options
- * @param array $menu_arr menu-entries
* @param array $defsort_arr default sorting values
* @param string $filter additional drop-down filters
* @param string $extra additional values passed to fieldfunction
--- 201,206 ----
* @param array $text_arr array with different text strings
* @param array $query_arr array with sql-options
* @param array $defsort_arr default sorting values
+ * @param string $menu string menu-entries
* @param string $filter additional drop-down filters
* @param string $extra additional values passed to fieldfunction
***************
*** 222,226 ****
*/
function ADMIN_list($component, $fieldfunction, $header_arr, $text_arr,
! $query_arr, $menu_arr, $defsort_arr, $filter = '', $extra = '',
$options = '', $form_arr='')
{
--- 209,213 ----
*/
function ADMIN_list($component, $fieldfunction, $header_arr, $text_arr,
! $query_arr, $defsort_arr, $menu = '', $filter = '', $extra = '',
$options = '', $form_arr='')
{
***************
*** 286,290 ****
$admin_templates = new Template($_CONF['path_layout'] . 'admin/lists');
$admin_templates->set_file (array (
! 'topmenu' => 'topmenu.thtml',
'list' => 'list.thtml',
'header' => 'header.thtml',
--- 273,277 ----
$admin_templates = new Template($_CONF['path_layout'] . 'admin/lists');
$admin_templates->set_file (array (
! 'searchmenu' => 'searchmenu.thtml',
'list' => 'list.thtml',
'header' => 'header.thtml',
***************
*** 297,303 ****
$admin_templates->set_var('layout_url', $_CONF['layout_url']);
$admin_templates->set_var('form_url', $form_url);
- if ($text_arr['icon'] !== false or $text_arr['icon']='') {
- $admin_templates->set_var('icon', "<img src=\"{$text_arr['icon']}\" alt=\"\">");
- }
$admin_templates->set_var('lang_edit', $LANG_ADMIN['edit']);
$admin_templates->set_var('lang_deleteall', $LANG01[124]);
--- 284,287 ----
***************
*** 332,347 ****
. '" title="' . $LANG_ACCESS['listthem'] . '">'
);
! // the user can disable the menu. if used, create it.
! if ($text_arr['has_menu']) {
! $menu_fields = '';
! for ($i = 0; $i < count($menu_arr); $i++) { # iterate through menu
! $menu_fields .= COM_createLink($menu_arr[$i]['text'], $menu_arr[$i]['url']);
! if ($i < (count($menu_arr) -1)) {
! $menu_fields .= ' | '; # add separator
! }
! }
! $admin_templates->set_var('menu_fields', $menu_fields);
! # add text strings to template
! $admin_templates->set_var('lang_instructions', $text_arr['instructions']);
$admin_templates->set_var('lang_search', $LANG_ADMIN['search']);
$admin_templates->set_var('lang_submit', $LANG_ADMIN['submit']);
--- 316,322 ----
. '" title="' . $LANG_ACCESS['listthem'] . '">'
);
!
! // the user can disable the search. if used, create it.
! if ($text_arr['has_search']) {
$admin_templates->set_var('lang_search', $LANG_ADMIN['search']);
$admin_templates->set_var('lang_submit', $LANG_ADMIN['submit']);
***************
*** 349,353 ****
$admin_templates->set_var('last_query', COM_applyFilter($query));
$admin_templates->set_var('filter', $filter);
! $admin_templates->parse('top_menu', 'topmenu', true);
}
--- 324,332 ----
$admin_templates->set_var('last_query', COM_applyFilter($query));
$admin_templates->set_var('filter', $filter);
! $admin_templates->parse('search_menu', 'search_menu', true);
! }
!
! if (!empty ($menu)) {
! $admin_templates->set_var('top_menu', $menu);
}
***************
*** 589,592 ****
--- 568,595 ----
}
+ function ADMIN_createMenu($menu_arr, $text, $icon = '') {
+ global $_CONF;
+ $admin_templates = new Template($_CONF['path_layout'] . 'admin/lists');
+ $admin_templates->set_file (
+ array ('top_menu' => 'topmenu.thtml')
+ );
+
+ $menu_fields = '';
+ for ($i = 0; $i < count($menu_arr); $i++) { # iterate through menu
+ $menu_fields .= COM_createLink($menu_arr[$i]['text'], $menu_arr[$i]['url']);
+ if ($i < (count($menu_arr) -1)) {
+ $menu_fields .= ' | '; # add separator
+ }
+ }
+ if (!empty ($icon)) {
+ $icon = COM_createImage($icon);
+ $admin_templates->set_var('icon', $icon);
+ }
+ $admin_templates->set_var('menu_fields', $menu_fields);
+ $admin_templates->set_var('lang_instructions', $text);
+ $admin_templates->parse('top_menu', 'top_menu');
+ $retval = $admin_templates->finish($admin_templates->get_var('top_menu'));
+ return $retval;
+ }
More information about the geeklog-cvs
mailing list