aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2013-12-23 11:18:58 +0000
committermistic100 <mistic@piwigo.org>2013-12-23 11:18:58 +0000
commit0b4646602b992ae4ac7fba79e8bf8e936a67a422 (patch)
treec725f44775b717344b0ee9d27d702a6bd81346de
parent84ff2701e6c98125e329c332187b4e704dad97cf (diff)
[elegant] changing configuration while the menu is hidden generates content overlap
git-svn-id: http://piwigo.org/svn/trunk@26114 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--themes/elegant/scripts.js7
-rw-r--r--themes/elegant/scripts_pp.js10
2 files changed, 3 insertions, 14 deletions
diff --git a/themes/elegant/scripts.js b/themes/elegant/scripts.js
index 6f7629d79..1f946303e 100644
--- a/themes/elegant/scripts.js
+++ b/themes/elegant/scripts.js
@@ -6,13 +6,6 @@
content=jQuery("#the_page > .content"),
pcontent=jQuery("#content");
- if (session_storage['page-menu'] == 'hidden') {
- jQuery("head").append('<style>#the_page #menubar {display:none;} #content.contentWithMenu, #the_page > .content {margin-left:35px;}</style>');
- }
- else {
- jQuery("head").append('<style>#content.contentWithMenu, #the_page > .content {margin-left:240px;}</style>');
- }
-
function hideMenu(delay) {
menubar.hide(delay);
menuswitcher.addClass("menuhidden").removeClass("menushown");
diff --git a/themes/elegant/scripts_pp.js b/themes/elegant/scripts_pp.js
index 26d505ebf..c5185821f 100644
--- a/themes/elegant/scripts_pp.js
+++ b/themes/elegant/scripts_pp.js
@@ -14,13 +14,6 @@
comments_add,
comments_top_offset = 0;
- if (session_storage['picture-menu'] == 'visible') {
- jQuery("head").append('<style>#content.contentWithMenu, #the_page > .content {margin-left:240px;}</style>');
- }
- else {
- jQuery("head").append('<style>#the_page #menubar {display:none;} #content.contentWithMenu, #the_page > .content {margin-left:35px;}</style>');
- }
-
function hideMenu(delay) {
menubar.hide(delay);
menuswitcher.addClass("menuhidden").removeClass("menushown");
@@ -94,6 +87,9 @@
e.preventDefault();
});
}
+ else if (menubar.length == 1 && p_main_menu=="disabled") {
+ showMenu(0);
+ }
// info show/hide
if (imageInfos.length == 1 && p_pict_descr!="disabled") {