mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-07-06 01:42:29 +02:00
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
This commit is contained in:
@@ -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 = '
|
||||
|
||||
@@ -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));
|
||||
|
||||
|
||||
|
||||
+10
-7
@@ -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(
|
||||
|
||||
+1
-2
@@ -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(
|
||||
|
||||
+1
-2
@@ -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));
|
||||
|
||||
Reference in New Issue
Block a user