bug fixed: create_navigation_bar take into account clean URL if requested.

deletion: argument link_class (HTML class of links) in function
create_navigation_bar was removed, useless since branch 1.5.

bug fixed: rate_items are now a configuration parameter (set in config file)

modification: new functions library functions_rate.inc.php to reduce
picture.php length.

bug fixed: categories were never expanded in the menu since clean URLs.

bug fixed: changing pictures sorting order in main page was always
rederecting to root category.


git-svn-id: http://piwigo.org/svn/trunk@1084 68402e56-0260-453c-a942-63ccdbb3a9ee

5 files changed, 16 insertions, 15 deletions

diff --git a/admin/element_set_global.php b/admin/element_set_global.php
index cab192aa0..40b5ac6cb 100644
--- a/admin/element_set_global.php
+++ b/admin/element_set_global.php
@@ -457,8 +457,8 @@ if (count($page['cat_elements_id']) > 0)
     $base_url.get_query_string_diff(array('start')),
     count($page['cat_elements_id']),
     $page['start'],
-    $page['nb_images'],
-    '');
+    $page['nb_images']
+    );
   $template->assign_vars(array('NAV_BAR' => $nav_bar));
 
   $query = '
diff --git a/admin/element_set_unit.php b/admin/element_set_unit.php
index 8ffd3142a..c43522894 100644
--- a/admin/element_set_unit.php
+++ b/admin/element_set_unit.php
@@ -188,8 +188,8 @@ if (count($page['cat_elements_id']) > 0)
     $base_url.get_query_string_diff(array('start')),
     count($page['cat_elements_id']),
     $page['start'],
-    $page['nb_images'],
-    '');
+    $page['nb_images']
+    );
   $template->assign_vars(array('NAV_BAR' => $nav_bar));
 
  
diff --git a/admin/rating.php b/admin/rating.php
index 072a2abdb..5d563d1a6 100644
--- a/admin/rating.php
+++ b/admin/rating.php
@@ -132,13 +132,16 @@ list($nb_images) = mysql_fetch_row(pwg_query($query));
 
 $template->set_filenames(array('rating'=>'admin/rating.tpl'));
 
-$navbar = create_navigation_bar(
-           PHPWG_ROOT_PATH.'admin.php'.get_query_string_diff(array('start','del')),
-                                $nb_images,
-                                $start,
-                                $elements_per_page,
-                                '');
-$template->assign_vars(array('NAVBAR' => $navbar));
+$template->assign_vars(
+  array(
+    'NAVBAR' => create_navigation_bar(
+      PHPWG_ROOT_PATH.'admin.php'.get_query_string_diff(array('start','del')),
+      $nb_images,
+      $start,
+      $elements_per_page,
+      )
+    )
+  );
 
 
 $template->assign_vars(
diff --git a/admin/stats.php b/admin/stats.php
index 081606e17..d11d0426a 100644
--- a/admin/stats.php
+++ b/admin/stats.php
@@ -302,8 +302,7 @@ create_navigation_bar(
   $url,
   $page['nb_logs'],
   $page['start'],
-  $conf['nb_logs_page'],
-  'admin'
+  $conf['nb_logs_page']
   );
 
 $template->assign_block_vars(
diff --git a/admin/user_list.php b/admin/user_list.php
index 6bbb5eaa1..6f1b11938 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -747,8 +747,7 @@ $navbar = create_navigation_bar(
   $url,
   count($page['filtered_users']),
   $start,
-  $conf['users_page'],
-  ''
+  $conf['users_page']
   );
 
 $template->assign_vars(array('NAVBAR' => $navbar));