Changeset 23251 for trunk/themes/elegant
- Timestamp:
- Jun 16, 2013, 4:22:35 PM (11 years ago)
- Location:
- trunk/themes/elegant
- Files:
-
- 7 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/themes/elegant/local_head.tpl
r13790 r23251 1 {footer_script} 2 var p_main_menu = "{$elegant.p_main_menu}", p_pict_descr = "{$elegant.p_pict_descr}", p_pict_comment = "{$elegant.p_pict_comment}"; 3 {/footer_script} 1 4 {if $BODY_ID=='thePicturePage'} 2 5 {combine_script id='elegant.scripts_pp' load='footer' require='jquery' path='themes/elegant/scripts_pp.js'} -
trunk/themes/elegant/scripts.js
r13730 r23251 50 50 var menubar=jQuery("#menubar"); 51 51 52 if (menubar.length == 1 ) {52 if (menubar.length == 1 && p_main_menu!="disabled") { 53 53 54 54 jQuery("#menuSwitcher").html("<div class=\"switchArrow\"> </div>"); … … 57 57 if (sidemenu == 'hidden') { 58 58 hideMenu(0); 59 } else { 59 } else if (sidemenu == 'visible') { 60 showMenu(0); 61 } else if (p_main_menu == 'off') { 62 hideMenu(0); 63 } else { 60 64 showMenu(0); 61 65 } 62 66 63 67 jQuery("#menuSwitcher").click(function(){ 64 68 if (jQuery("#menubar").is(":hidden")) { -
trunk/themes/elegant/scripts_pp.js
r23233 r23251 78 78 var menubar=jQuery("#menubar"); 79 79 80 if (menubar.length == 1 ) {80 if (menubar.length == 1 && p_main_menu!="disabled") { 81 81 82 82 jQuery("#menuSwitcher").html("<div class=\"switchArrow\"> </div>"); 83 83 84 84 // if cookie says the menu is hiding, keep it hidden! 85 if (sidemenu == 'visible') { 85 if (sidemenu == 'hidden') { 86 hideMenu(0); 87 } else if (sidemenu == 'visible') { 86 88 showMenu(0); 87 } else {89 } else if (p_main_menu == 'off') { 88 90 hideMenu(0); 91 } else { 92 showMenu(0); 89 93 } 90 94 … … 106 110 var imageInfos=jQuery("#imageInfos"); 107 111 108 if (imageInfos.length == 1 ) {112 if (imageInfos.length == 1 && p_pict_descr!="disabled") { 109 113 110 114 jQuery("#infoSwitcher").html("<div class=\"switchArrow\"> </div>"); … … 113 117 if (sideinfo == 'hidden') { 114 118 hideInfo(0); 119 } else if (sideinfo == 'visible') { 120 showInfo(0); 121 } else if (p_pict_descr == 'off') { 122 hideInfo(0); 115 123 } else { 116 124 showInfo(0); … … 136 144 commentsswicther.html("<div class=\"switchArrow\"> </div>"); 137 145 138 if (comments.length == 1 ) {146 if (comments.length == 1 && p_pict_comment!="disabled") { 139 147 var comments_button=jQuery("#comments h3"); 140 148 … … 144 152 } 145 153 146 if (jQuery.cookie('comments') == 'visible') { 154 if (jQuery.cookie('comments') == 'hidden') { 155 comments.addClass("commentshidden"); 156 comments_button.addClass("comments_toggle").addClass("comments_toggle_on"); 157 } else if (jQuery.cookie('comments') == 'visible') { 147 158 comments.addClass("commentsshown"); 148 159 comments_button.addClass("comments_toggle").addClass("comments_toggle_off"); 149 } else {160 } else if (p_pict_comment == 'off') { 150 161 comments.addClass("commentshidden"); 151 162 comments_button.addClass("comments_toggle").addClass("comments_toggle_on"); 163 } else { 164 comments.addClass("commentsshown"); 165 comments_button.addClass("comments_toggle").addClass("comments_toggle_off"); 152 166 } 153 167 -
trunk/themes/elegant/themeconf.inc.php
r23235 r23251 13 13 'local_head' => 'local_head.tpl' 14 14 ); 15 // Need upgrade? 16 global $conf; 17 include(PHPWG_THEMES_PATH.'elegant/admin/upgrade.inc.php'); 18 19 add_event_handler('init', 'set_config_values_elegant'); 20 function set_config_values_elegant() 21 { 22 global $conf, $template; 23 $config = unserialize( $conf['elegant'] ); 24 $template->assign( 'elegant', $config ); 25 } 26 15 27 ?>
Note: See TracChangeset
for help on using the changeset viewer.