- 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

5 files changed, 21 insertions, 14 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 = '<a class="" href="'.add_session_id($base_url).'">';
+$navigation.= $lang['home'];
+$navigation.= '</a>';
+
 // +-----------------------------------------------------------------------+
 // |                    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 = '<a class="" href="'.add_session_id($base_url).'">';
-  $navigation.= $lang['home'];
-  $navigation.= '</a>';
   $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&amp;parent_id=';
-$navigation = '<a class="" href="'.add_session_id(PHPWG_ROOT_PATH.'admin.php?page=cat_list').'">';
-$navigation.= $lang['home'].'</a>'.$conf['level_separator'];
+$url = PHPWG_ROOT_PATH.'admin.php?page=cat_modify&amp;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&amp;cat_id='
+  );
 
 $form_action = PHPWG_ROOT_PATH.'admin.php?page=cat_modify&amp;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&amp;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'],