From 939c01e410286691fd80029bed811406ede3f1e5 Mon Sep 17 00:00:00 2001 From: plegall Date: Fri, 19 Aug 2005 17:00:20 +0000 Subject: - improvement : standardization of categories navigation bar on top of administration screen element_set_(global|unit), cat_modify, cat_list, cat_perm. - new : direct link to admin/cat_modify from category.php. git-svn-id: http://piwigo.org/svn/trunk@834 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/cat_list.php | 15 ++++++++------ admin/cat_modify.php | 9 ++++----- admin/element_set.php | 7 ++++++- admin/element_set_global.php | 2 +- admin/element_set_unit.php | 2 +- category.php | 29 ++++++++++++++++++++++++--- doc/ChangeLog | 8 ++++++++ template/default/admin/cat_list.tpl | 2 +- template/default/admin/element_set_global.tpl | 2 +- template/default/admin/element_set_unit.tpl | 4 +++- template/default/category.tpl | 6 +++++- 11 files changed, 65 insertions(+), 21 deletions(-) diff --git a/admin/cat_list.php b/admin/cat_list.php index e38d5b4c9..4a66aee12 100644 --- a/admin/cat_list.php +++ b/admin/cat_list.php @@ -61,8 +61,14 @@ function save_categories_order($categories) // +-----------------------------------------------------------------------+ // | initialization | // +-----------------------------------------------------------------------+ + $categories = array(); -$navigation = $lang['home']; + +$base_url = PHPWG_ROOT_PATH.'admin.php?page=cat_list'; +$navigation = ''; +$navigation.= $lang['home']; +$navigation.= ''; + // +-----------------------------------------------------------------------+ // | virtual categories management | // +-----------------------------------------------------------------------+ @@ -195,16 +201,13 @@ while ($row = mysql_fetch_assoc($result)) $categories[$row['rank']] = $row; $categories[$row['rank']]['nb_subcats'] = 0; } + // +-----------------------------------------------------------------------+ // | Navigation path | // +-----------------------------------------------------------------------+ + if (isset($_GET['parent_id'])) { - $base_url = PHPWG_ROOT_PATH.'admin.php?page=cat_list'; - - $navigation = ''; - $navigation.= $lang['home']; - $navigation.= ''; $navigation.= $conf['level_separator']; $current_category = get_cat_info($_GET['parent_id']); diff --git a/admin/cat_modify.php b/admin/cat_modify.php index 1215b4e73..791dff589 100644 --- a/admin/cat_modify.php +++ b/admin/cat_modify.php @@ -104,13 +104,12 @@ foreach (array('comment','dir','site_id', 'id_uppercat') as $nullable) $category['is_virtual'] = empty($category['dir']) ? true : false; // Navigation path -$url = PHPWG_ROOT_PATH.'admin.php?page=cat_list&parent_id='; -$navigation = ''; -$navigation.= $lang['home'].''.$conf['level_separator']; +$url = PHPWG_ROOT_PATH.'admin.php?page=cat_modify&cat_id='; -$navigation.= get_cat_display_name_cache( +$navigation = get_cat_display_name_cache( $category['uppercats'], - $url); + PHPWG_ROOT_PATH.'admin.php?page=cat_modify&cat_id=' + ); $form_action = PHPWG_ROOT_PATH.'admin.php?page=cat_modify&cat_id='.$_GET['cat_id']; $status = ($category['status']=='public')?'STATUS_PUBLIC':'STATUS_PRIVATE'; diff --git a/admin/element_set.php b/admin/element_set.php index e4e913b74..82920d9a8 100644 --- a/admin/element_set.php +++ b/admin/element_set.php @@ -104,7 +104,12 @@ DELETE if (is_numeric($_GET['cat'])) { $cat_infos = get_cat_info($_GET['cat']); - $page['title'] = get_cat_display_name($cat_infos['name'], '', false); + $page['title'] = + get_cat_display_name( + $cat_infos['name'], + PHPWG_ROOT_PATH.'admin.php?page=cat_modify&cat_id=', + false + ); $query = ' SELECT image_id diff --git a/admin/element_set_global.php b/admin/element_set_global.php index 33ede7dfc..96386802f 100644 --- a/admin/element_set_global.php +++ b/admin/element_set_global.php @@ -266,7 +266,7 @@ $base_url = PHPWG_ROOT_PATH.'admin.php'; $template->assign_vars( array( - 'CATEGORY_TITLE'=>$page['title'], + 'CATEGORIES_NAV'=>$page['title'], 'L_SUBMIT'=>$lang['submit'], diff --git a/admin/element_set_unit.php b/admin/element_set_unit.php index 74aaf1eb0..15dcd62a3 100644 --- a/admin/element_set_unit.php +++ b/admin/element_set_unit.php @@ -110,7 +110,7 @@ $base_url = PHPWG_ROOT_PATH.'admin.php'; $template->assign_vars( array( - 'CATEGORY_TITLE'=>$page['title'], + 'CATEGORIES_NAV'=>$page['title'], 'L_SUBMIT'=>$lang['submit'], diff --git a/category.php b/category.php index 9c597b23a..cfef60065 100644 --- a/category.php +++ b/category.php @@ -171,8 +171,7 @@ $template->assign_vars(array( 'U_REGISTER' => add_session_id( PHPWG_ROOT_PATH.'register.php' ), 'U_LOGOUT' => PHPWG_ROOT_PATH.'category.php?act=logout', 'U_ADMIN'=>add_session_id( PHPWG_ROOT_PATH.'admin.php' ), - 'U_PROFILE'=>add_session_id(PHPWG_ROOT_PATH.'profile.php'), - 'U_CADDIE'=>add_session_id(PHPWG_ROOT_PATH.'category.php'.get_query_string_diff(array('caddie')).'&caddie=1') + 'U_PROFILE'=>add_session_id(PHPWG_ROOT_PATH.'profile.php') ) ); //-------------------------------------------------------------- external links @@ -313,6 +312,22 @@ $template->assign_block_vars( 'U_SUMMARY'=>add_session_id(PHPWG_ROOT_PATH.'notification.php') )); +if (isset($page['cat']) + and is_numeric($page['cat']) + and 'admin' == $user['status']) +{ + $template->assign_block_vars( + 'edit', + array( + 'URL' => + add_session_id( + PHPWG_ROOT_PATH.'admin.php?page=cat_modify' + .'&cat_id='.$page['cat'] + ) + ) + ); +} + //------------------------------------------------------ main part : thumbnails if (isset($page['cat']) and ((is_numeric($page['cat']) and $page['cat_nb_images'] != 0) @@ -329,7 +344,15 @@ if (isset($page['cat']) if ('admin' == $user['status']) { - $template->assign_block_vars('caddie', array()); + $template->assign_block_vars( + 'caddie', + array( + 'URL' => + add_session_id( + PHPWG_ROOT_PATH.'category.php' + .get_query_string_diff(array('caddie')).'&caddie=1') + ) + ); } } elseif (isset($page['cat']) and $page['cat'] == 'calendar') diff --git a/doc/ChangeLog b/doc/ChangeLog index df5afdaa5..4996a81c4 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,11 @@ +2005-08-19 Pierrick LE GALL + + * improvement : standardization of categories navigation bar on + top of administration screen element_set_(global|unit), + cat_modify, cat_list, cat_perm. + + * new : direct link to admin/cat_modify from category.php. + 2005-08-19 Pierrick LE GALL * modification : RSS feed work only with a given feed diff --git a/template/default/admin/cat_list.tpl b/template/default/admin/cat_list.tpl index b6303b960..7f92478fb 100644 --- a/template/default/admin/cat_list.tpl +++ b/template/default/admin/cat_list.tpl @@ -1,6 +1,6 @@

{lang:title_categories}

-
{CATEGORIES_NAV}
+

{CATEGORIES_NAV}

diff --git a/template/default/admin/element_set_global.tpl b/template/default/admin/element_set_global.tpl index 6014291f9..e15baee34 100644 --- a/template/default/admin/element_set_global.tpl +++ b/template/default/admin/element_set_global.tpl @@ -1,6 +1,6 @@

{lang:Batch management}

-
{CATEGORY_TITLE}
+

{CATEGORIES_NAV}

global mode diff --git a/template/default/admin/element_set_unit.tpl b/template/default/admin/element_set_unit.tpl index 48dac9046..494e81478 100644 --- a/template/default/admin/element_set_unit.tpl +++ b/template/default/admin/element_set_unit.tpl @@ -1,4 +1,6 @@ -

{CATEGORY_TITLE}
+

{lang:Batch management}

+ +

{CATEGORIES_NAV}

global mode diff --git a/template/default/category.tpl b/template/default/category.tpl index 0d523c129..fb5352443 100644 --- a/template/default/category.tpl +++ b/template/default/category.tpl @@ -91,8 +91,12 @@

    -
    • +
    • + + +
  • {lang:edit}
    • +
{TITLE}
-- cgit v1.2.3