aboutsummaryrefslogtreecommitdiffstats
path: root/admin/themes
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-03-17 23:50:53 +0000
committerplegall <plg@piwigo.org>2010-03-17 23:50:53 +0000
commitcd00dffa7210a16063ab8e8f7811929b75f9a8e8 (patch)
tree530c3db41beecbaeac6381dcb4389cacf3d5ad07 /admin/themes
parent3c6ef3d16d9746767647e88e0ba083e37855e03c (diff)
feature 1515: the new admin menu organization implies to tell the accordion
menu which section to open on page load. I've moved the single function in functions_themes.inc.php to function.php to avoid misunderstanding with theme manager. Ability to preset the active menu (in the future, a plugin may add its admin page anywhere in the menu, this features needs other change to be possible) git-svn-id: http://piwigo.org/svn/trunk@5173 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/themes/clear/themeconf.inc.php5
-rw-r--r--admin/themes/default/template/admin.tpl2
-rw-r--r--admin/themes/roma/themeconf.inc.php5
3 files changed, 1 insertions, 11 deletions
diff --git a/admin/themes/clear/themeconf.inc.php b/admin/themes/clear/themeconf.inc.php
index de1d34209..e007a971d 100644
--- a/admin/themes/clear/themeconf.inc.php
+++ b/admin/themes/clear/themeconf.inc.php
@@ -1,12 +1,7 @@
<?php
-if (!function_exists('selected_admin_menu'))
-{
- include_once(PHPWG_ROOT_PATH.'admin/include/functions_themes.inc.php');
-}
$themeconf = array(
'theme' => 'clear',
'parent' => 'default',
'admin_icon_dir' => 'admin/themes/clear/icon',
- 'selected_admin_menu' => selected_admin_menu(),
);
?>
diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl
index 0c029031d..bd63518a9 100644
--- a/admin/themes/default/template/admin.tpl
+++ b/admin/themes/default/template/admin.tpl
@@ -7,7 +7,7 @@ jQuery().ready(function(){ldelim}
jQuery('#menubar').accordion({ldelim}
header: "dt.rdion",
event: "click",
- active: {$U_ACTIVE_MENU|default:$themeconf.selected_admin_menu}
+ active: {$ACTIVE_MENU}
});
});
</script>
diff --git a/admin/themes/roma/themeconf.inc.php b/admin/themes/roma/themeconf.inc.php
index 1260576ab..886ed60db 100644
--- a/admin/themes/roma/themeconf.inc.php
+++ b/admin/themes/roma/themeconf.inc.php
@@ -1,11 +1,6 @@
<?php
-if (!function_exists('selected_admin_menu'))
-{
- include_once(PHPWG_ROOT_PATH.'admin/include/functions_themes.inc.php');
-}
$themeconf = array(
'theme' => 'roma',
'parent' => 'default',
- 'selected_admin_menu' => selected_admin_menu(),
);
?>