aboutsummaryrefslogtreecommitdiffstats
path: root/themes/elegant/scripts.js
diff options
context:
space:
mode:
authorflop25 <flop25@piwigo.org>2013-06-16 14:22:35 +0000
committerflop25 <flop25@piwigo.org>2013-06-16 14:22:35 +0000
commitb4cac600761d9f54a2af389dc394be061fad292c (patch)
tree5b6c1d71e80588dc82c03aa6393c84f9f11e9bc3 /themes/elegant/scripts.js
parentc86481cbbef6d221d0bcd1d69e9434fd19dc2b22 (diff)
feature:2924
adding 3 options for the default behaviour of the panels ToDo lang files git-svn-id: http://piwigo.org/svn/trunk@23251 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'themes/elegant/scripts.js')
-rw-r--r--themes/elegant/scripts.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/themes/elegant/scripts.js b/themes/elegant/scripts.js
index 20433ac65..86a43a1eb 100644
--- a/themes/elegant/scripts.js
+++ b/themes/elegant/scripts.js
@@ -49,17 +49,21 @@ jQuery("document").ready(function(jQuery){
var sidemenu = jQuery.cookie('page-menu');
var menubar=jQuery("#menubar");
- if (menubar.length == 1) {
+ if (menubar.length == 1 && p_main_menu!="disabled") {
jQuery("#menuSwitcher").html("<div class=\"switchArrow\">&nbsp;</div>");
// if cookie says the menu is hiding, keep it hidden!
if (sidemenu == 'hidden') {
hideMenu(0);
- } else {
+ } else if (sidemenu == 'visible') {
+ showMenu(0);
+ } else if (p_main_menu == 'off') {
+ hideMenu(0);
+ } else {
showMenu(0);
}
-
+
jQuery("#menuSwitcher").click(function(){
if (jQuery("#menubar").is(":hidden")) {
showMenu(0);