aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornikrou <nikrou@piwigo.org>2009-03-19 21:39:38 +0000
committernikrou <nikrou@piwigo.org>2009-03-19 21:39:38 +0000
commit462b87485cad0f30b1eaf004669dda9ae2548867 (patch)
treec385a0f762e7374cbd759b7f82a8e1c0bad78c63
parentc86ae74710a1f5469ef104f2fd9667c80c19f25d (diff)
merge r3216 from trunk to branch 2.0
feature_948_accordion feature 948 : fix problem with incorrect submenu open in admin use a new variable (U_ACTIVE_MENU) and use default position defined in selected_admin_menu if not exists git-svn-id: http://piwigo.org/svn/branches/2.0@3217 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/advanced_feature.php3
-rw-r--r--admin/element_set.php2
-rw-r--r--admin/include/functions_themes.inc.php2
-rw-r--r--admin/template/goto/admin.tpl2
4 files changed, 7 insertions, 2 deletions
diff --git a/admin/advanced_feature.php b/admin/advanced_feature.php
index fcb265061..29c26bb98 100644
--- a/admin/advanced_feature.php
+++ b/admin/advanced_feature.php
@@ -92,7 +92,8 @@ $start_url = get_root_url().'admin.php?page=advanced_feature&amp;action=';
$template->assign(
array
(
- 'U_HELP' => get_root_url().'popuphelp.php?page=advanced_feature'
+ 'U_HELP' => get_root_url().'popuphelp.php?page=advanced_feature',
+ 'U_ACTIVE_MENU' => 5
));
// advanced_features
diff --git a/admin/element_set.php b/admin/element_set.php
index 7c8da0aa2..821c4e188 100644
--- a/admin/element_set.php
+++ b/admin/element_set.php
@@ -133,6 +133,7 @@ SELECT element_id
else if ('not_linked' == $_GET['cat'])
{
$page['title'] = l10n('Elements_not_linked');
+ $template->assign(array('U_ACTIVE_MENU' => 5 ));
// we are searching elements not linked to any virtual category
$query = '
@@ -163,6 +164,7 @@ SELECT DISTINCT(image_id)
else if ('duplicates' == $_GET['cat'])
{
$page['title'] = l10n('Duplicates');
+ $template->assign(array('U_ACTIVE_MENU' => 5 ));
// we are searching related elements twice or more to physical categories
// 1 - Retrieve Files
diff --git a/admin/include/functions_themes.inc.php b/admin/include/functions_themes.inc.php
index c00588d13..364bd1f3a 100644
--- a/admin/include/functions_themes.inc.php
+++ b/admin/include/functions_themes.inc.php
@@ -33,7 +33,9 @@ function selected_admin_menu()
case 'tags':
return 3;
case 'user_list':
+ case 'user_perm':
case 'group_list':
+ case 'group_perm':
case 'notification_by_mail':
return 4;
case 'stats':
diff --git a/admin/template/goto/admin.tpl b/admin/template/goto/admin.tpl
index 02d4f9b5f..5beb34d13 100644
--- a/admin/template/goto/admin.tpl
+++ b/admin/template/goto/admin.tpl
@@ -7,7 +7,7 @@ jQuery().ready(function(){ldelim}
jQuery('#menubar').accordion({ldelim}
header: "dt.rdion",
event: "click",
- active: {$themeconf.selected_admin_menu}
+ active: {$U_ACTIVE_MENU|default:$themeconf.selected_admin_menu}
});
});
</script>