Changeset 23251

Timestamp:

Jun 16, 2013, 4:22:35 PM (11 years ago)

Author:

flop25

Message:

feature:2924
adding 3 options for the default behaviour of the panels
ToDo lang files

Location:

trunk/themes/elegant

Files:

• admin (added)
• admin/admin.inc.php (added)
• admin/admin.tpl (added)
• admin/index.php (added)
• admin/jquery.ui.button.css (added)
• admin/maintain.inc.php (added)
• admin/upgrade.inc.php (added)
• local_head.tpl (modified) (1 diff)
• scripts.js (modified) (2 diffs)
• scripts_pp.js (modified) (5 diffs)
• themeconf.inc.php (modified) (1 diff)

trunk/themes/elegant/local_head.tpl

@@ +1 @@
+{footer_script}
+  var p_main_menu = "{$elegant.p_main_menu}", p_pict_descr = "{$elegant.p_pict_descr}", p_pict_comment = "{$elegant.p_pict_comment}";
+{/footer_script}
 {if $BODY_ID=='thePicturePage'}
         {combine_script id='elegant.scripts_pp' load='footer' require='jquery' path='themes/elegant/scripts_pp.js'}

trunk/themes/elegant/scripts.js

@@ -50 +50 @@
         var menubar=jQuery("#menubar");
 
-        if (menubar.length == 1) {
+        if (menubar.length == 1 && p_main_menu!="disabled") {
 
                 jQuery("#menuSwitcher").html("<div class=\"switchArrow\">&nbsp;</div>");
@@ -57 +57 @@
                 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")) {

trunk/themes/elegant/scripts_pp.js

@@ -78 +78 @@
         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 == 'visible') {
+                if (sidemenu == 'hidden') {
+                        hideMenu(0);
+                } else if (sidemenu == 'visible') {
                         showMenu(0);
-                } else {
+                } else if (p_main_menu == 'off') {
                         hideMenu(0);
+                }       else {
+                        showMenu(0);
                 }
         
@@ -106 +110 @@
         var imageInfos=jQuery("#imageInfos");
 
-        if (imageInfos.length == 1) {
+        if (imageInfos.length == 1 && p_pict_descr!="disabled") {
 
                 jQuery("#infoSwitcher").html("<div class=\"switchArrow\">&nbsp;</div>");
@@ -113 +117 @@
                 if (sideinfo == 'hidden') {
                         hideInfo(0);
+                } else if (sideinfo == 'visible') {
+                        showInfo(0);
+                } else if (p_pict_descr == 'off') {
+                        hideInfo(0);
                 } else {
                         showInfo(0);
@@ -136 +144 @@
         commentsswicther.html("<div class=\"switchArrow\">&nbsp;</div>");
         
-        if (comments.length == 1) {
+        if (comments.length == 1 && p_pict_comment!="disabled") {
                 var comments_button=jQuery("#comments h3");
 
@@ -144 +152 @@
                 }
         
-                if (jQuery.cookie('comments') == 'visible') {
+                if (jQuery.cookie('comments') == 'hidden') {
+                        comments.addClass("commentshidden");
+                        comments_button.addClass("comments_toggle").addClass("comments_toggle_on");
+                } else if (jQuery.cookie('comments') == 'visible') {
                         comments.addClass("commentsshown");
                         comments_button.addClass("comments_toggle").addClass("comments_toggle_off");
-                } else {
+                } else if (p_pict_comment == 'off') {
                         comments.addClass("commentshidden");
                         comments_button.addClass("comments_toggle").addClass("comments_toggle_on");
+                } else {
+                        comments.addClass("commentsshown");
+                        comments_button.addClass("comments_toggle").addClass("comments_toggle_off");
                 }
                 

trunk/themes/elegant/themeconf.inc.php

@@ -13 +13 @@
   'local_head'  => 'local_head.tpl'
 );
+// Need upgrade?
+global $conf;
+include(PHPWG_THEMES_PATH.'elegant/admin/upgrade.inc.php');
+
+add_event_handler('init', 'set_config_values_elegant');
+function set_config_values_elegant()
+{
+  global $conf, $template;
+  $config = unserialize( $conf['elegant'] );
+  $template->assign( 'elegant', $config );
+}
+
 ?>