Changeset 30643
- Timestamp:
- Dec 2, 2014, 6:51:29 AM (9 years ago)
- Location:
- extensions/greydragon
- Files:
-
- 5 added
- 40 edited
-
admin/admin.inc.php (modified) (1 diff)
-
admin/admin.tpl (modified) (3 diffs)
-
admin/help.inc.tpl (added)
-
changelog.txt (modified) (1 diff)
-
css/colorpack/blackhawk/images/controls.png (added)
-
css/colorpack/blackhawk/images/icons_sprite-hover.png (modified) (previous)
-
css/colorpack/blackhawk/images/icons_sprite.png (modified) (previous)
-
css/colorpack/blackhawk/images/menu-min.png (modified) (previous)
-
css/colorpack/blackhawk/images/menu.png (modified) (previous)
-
css/colorpack/blackhawk/styles.css (modified) (1 diff)
-
css/colorpack/greydragon/images/controls.png (added)
-
css/colorpack/greydragon/images/icons_sprite-hover.png (modified) (previous)
-
css/colorpack/greydragon/images/icons_sprite.png (modified) (previous)
-
css/colorpack/greydragon/images/menu-min.png (modified) (previous)
-
css/colorpack/greydragon/images/menu.png (modified) (previous)
-
css/colorpack/greydragon/styles.css (modified) (1 diff)
-
css/colorpack/slateblue/images/controls.png (added)
-
css/colorpack/slateblue/images/icons_sprite-hover.png (modified) (previous)
-
css/colorpack/slateblue/images/icons_sprite.png (modified) (previous)
-
css/colorpack/slateblue/images/menu-min.png (modified) (previous)
-
css/colorpack/slateblue/images/menu.png (modified) (previous)
-
css/colorpack/slateblue/styles.css (modified) (1 diff)
-
css/colorpack/whitehawk/images/controls.png (added)
-
css/colorpack/whitehawk/images/icons_sprite-hover.png (modified) (previous)
-
css/colorpack/whitehawk/images/icons_sprite.png (modified) (previous)
-
css/colorpack/whitehawk/images/menu-min.png (modified) (previous)
-
css/colorpack/whitehawk/images/menu.png (modified) (previous)
-
css/colorpack/whitehawk/styles.css (modified) (1 diff)
-
css/styles.css (modified) (4 diffs)
-
icon/arrows_ccc.png (modified) (previous)
-
icon/gallery.png (modified) (previous)
-
icon/icons_sprite-hover.png (modified) (previous)
-
icon/icons_sprite.png (modified) (previous)
-
icon/img_next.png (modified) (previous)
-
icon/img_prev.png (modified) (previous)
-
icon/img_up.png (modified) (previous)
-
icon/menu-min.png (modified) (previous)
-
icon/menu.png (modified) (previous)
-
icon/none.png (modified) (previous)
-
include/greydragon.class.php (modified) (5 diffs)
-
js/theme.photo.js (modified) (1 diff)
-
template/footer.tpl (modified) (1 diff)
-
template/header.tpl (modified) (1 diff)
-
template/picture.tpl (modified) (7 diffs)
-
themeconf.inc.php (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
extensions/greydragon/admin/admin.inc.php
r30484 r30643 3 3 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); 4 4 5 define('GDTHEME_VERSION', '1.0.1 4');5 define('GDTHEME_VERSION', '1.0.15'); 6 6 7 7 require_once( PHPWG_THEMES_PATH . 'greydragon/include/greydragon.class.php'); -
extensions/greydragon/admin/admin.tpl
r30484 r30643 147 147 </li> 148 148 <li><label><span class="graphicalCheckbox {if $options.p_pict_tab_anim=="on"}icon-check{else}icon-check-empty{/if}"> </span><input name="p_pict_tab_anim" id="p_pict_tab_anim" type="checkbox" value="on" {if $options.p_pict_tab_anim=="on"}checked="checked"{/if}>{'Animate Tabs'|@translate}</label></li> 149 <li><label><span class="graphicalCheckbox {if $options.p_pict_tab_exif=="off"}icon-check{else}icon-check-empty{/if}"> </span><input name="p_pict_tab_exif" id="p_pict_tab_exif" type="checkbox" value="off" {if $options.p_pict_tab_exif=="off"}checked="checked"{/if}>{'Hide EXIF Data'|@translate}</label></li> 149 150 </ul> 150 151 </fieldset> … … 164 165 </select> 165 166 <label for="p_rootpage_src">{'Image Source (Default: Slideshow)'|@translate}</label> 167 </li> 168 <li> 169 <select id="p_rootpage_size" name="p_rootpage_size"> 170 <option value="M" {if $options.p_rootpage_size=="M"}selected="selected"{/if}>{'Medium'|@translate}</option> 171 <option value="S" {if $options.p_rootpage_size=="S"}selected="selected"{/if}>{'Small'|@translate}</option> 172 </select> 173 <label for="p_rootpage_size">{'Image Size (Default: Medium)'|@translate}</label> 166 174 </li> 167 175 <li><input id="p_rootpage_id" name="p_rootpage_id" type="text" value="{$options.p_rootpage_id}"><label for="p_rootpage_id">{'Photo/Album Index'|@translate}</label> … … 210 218 </div> 211 219 <div id="helpContent"> 212 <fieldset> 213 <legend>{'Help'|@translate}</legend> 214 <ul> 215 <li><h3>{'Prerequisites'|@translate}</h3> 216 <p><b>REQUIREMENTS NEED TO BE MET FOR THE THEME TO FUNCTION PROPERLY.</b><br> 217 Please refer to information on the left. 218 </p></li> 219 <li><h3>{'General Settings'|@translate}</h3> 220 <p>To add logo specify <b>Logo Image</b>. Recommended logo height is 80px. If you need bigger space for your logo, CSS adjustments 221 would have to be made. In addition to Logo you can specify <b>Header Text</b>.<br> 222 <b>Footer Text</b> allows adding simple text as a row in the footer below menu links and Site's credits. 223 <p>Important feature of the theme is a support for Color Packs which is managed by <b>Color Pack</b> Option. It allows changing colors, styles, 224 theme for the pages. By default theme includes 3 color packs: slateblue, blackhawk, whitehawk, but you could be easily extend the list by 225 creating copy of one of the existing colorpack folders and then adjusting colors. 226 </p></li> 227 <li><h3>{'Advanced Options - Custom CSS'|@translate}</h3> 228 <p>This option allows fine tune Theme's styles to better suit your personal taste.</p> 229 <p>Few examples for standard CSS notation:</p> 230 <ul> 231 <li>Remove fixed width:<br> body { width: auto; }</li> 232 <li>Remove fixed width but keep min-width:<br> body { width: auto; min-width: 1270px; }</li> 233 <li>Add Thumb shadow for gdThumb: Set margin between thumbs to 10-14px. Modify shadow color to match your theme<br> .gdthumb { box-shadow: 6px 6px 3px #888888; }</li> 234 </ul> 235 </ul> 220 {include file='./help.inc.tpl'} 236 221 </div> 237 222 </form> -
extensions/greydragon/changelog.txt
r30484 r30643 18 18 19 19 === Changelog === 20 version 1.0.15 21 + ADMIN: Added "Image Size" option for Root Page 22 + ADMIN: Added "Hide EXIF" option for Photo Page 23 + ADMIN: Help content moved into standalone template file 24 + Added support for "User Tags" plugin 25 + Added support for PayPal Order Cart module - PayPal entry form now integrated as a Tab or Overlay 26 + PNG size optimization for theme elements 27 + Improved styles of Colorbox for overlays 28 + "Tags" picture data made optional - tab would be visible only if tags are present or "User Tags" plugin is enabled 29 - Fixed issue with Colorbox not be referenced in some cases causing popup overlay dialogs functionlity not be supported when user is not logged in 30 - Fixed issue of breadcrumb overlap with image toolbar 31 20 32 version 1.0.14 21 33 + Hiding of photo counters extended to category menu -
extensions/greydragon/css/colorpack/blackhawk/styles.css
r30484 r30643 64 64 .image-metadata-tabs { background: #222; } 65 65 66 #cboxWrapper { border: 1px solid #444; background: #222 !important; } 66 67 #cboxLoadedContent { background: #222 !important; } 68 #cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose { background-image: url(images/controls.png); } -
extensions/greydragon/css/colorpack/greydragon/styles.css
r30484 r30643 64 64 .image-metadata-tabs { background: #222; } 65 65 66 #cboxWrapper { background: #222 !important; border: 1px solid #333; } 66 67 #cboxLoadedContent { background: #222 !important; } 68 #cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose { background-image: url(images/controls.png); } -
extensions/greydragon/css/colorpack/slateblue/styles.css
r30484 r30643 63 63 .image-metadata-tabs { background: #1a1e27; } 64 64 65 #cboxWrapper { border: 1px solid #666; background: #1a1e27 !important; } 65 66 #cboxLoadedContent { background: #1a1e27 !important; } 67 #cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose { background-image: url(images/controls.png); } -
extensions/greydragon/css/colorpack/whitehawk/styles.css
r30484 r30643 71 71 .image-metadata-tabs { background: #eee; border: solid 0 #bbb; border-width: 0 1px 0 1px; } 72 72 73 #cboxLoadedContent { background: #eee !important; } 73 #cboxWrapper { background: #F1F1F1 !important; border: 1px solid #666; } 74 #cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose { background-image: url(images/controls.png); } -
extensions/greydragon/css/styles.css
r30484 r30643 196 196 #imageHeaderBar h2 { font-size: 100%; font-weight: inherit;} 197 197 #imageHeaderBar .browsePath { display: inline-block; float:left; font-size:120%; line-height:20px; padding: 6px 0 0 6px; font-weight:bold; } 198 #imageToolBar { background: inherit; padding-left: 0.7em; } 198 199 #imageToolBar .imageNumber { display: inline-block; float: right; line-height: 26px; margin: 0 2px 0 0; min-width: 40px; text-align: center;} 199 200 #imageToolBar { margin-top: -24px; margin-bottom: 0; float: right;} … … 238 239 .image-metadata .glyphicon-chevron-up, .image-metadata .glyphicon-chevron-down { float: right; padding-right: 10px; font-size: 0.8em; } 239 240 241 #cboxContent { margin-top: 22px; } 240 242 #cboxLoadedContent .image-metadata-tab { display: block; } 241 243 … … 288 290 .static-menu .calendarTitle, .static-menu .calendarBar { margin-left: 196px; } 289 291 290 .infos, .errors, .warnings { position: fixed; z-index: 10; right: 1em; top: 3em; border-width: 0; border-left: 0.8em solid transparent; margin: 0; padding: 1em; white-space: nowrap; }292 .infos, .errors, .warnings { position: fixed; z-index: 10; right: 1em; top: 3em; border-width: 0; border-left: 0.8em solid transparent; margin: 0; padding: 1em; white-space: nowrap; min-width: 200px; } 291 293 .infos ul, .errors ul, .warnings ul { list-style: none; margin: 0; padding: 0; overflow: hidden; } 292 294 .infos { border-left-color: #0F0; } … … 311 313 .contact table td:first-child { padding-right: 1.5em; } 312 314 .contact input[name="send_mail"] { margin-right: 1.5em; } 315 316 #tab-cart table { margin-left: 0; } 317 #tab-cart .label { font-size: 100%; color: inherit; } 318 #tab-cart select { margin-right: 1em; } 319 #tab-cart input[type="submit"] { margin-right: 1em; } 320 321 #cboxLoadedContent>div { padding: 8px 10px 20px 10px; } 322 #cboxClose { right: 5px; } 323 324 #TagsTable { width: 600px; min-height: 5.5em; } 325 #Tags { background-position: right 0 bottom 2px; } -
extensions/greydragon/include/greydragon.class.php
r30484 r30643 53 53 "p_pict_tab_default" => array("value" => "desc", "quotes" => QUOTES_NONE), 54 54 "p_pict_tab_anim" => array("value" => "off", "quotes" => QUOTES_NONE), 55 "p_pict_tab_exif" => array("value" => "on", "quotes" => QUOTES_NONE), 55 56 56 57 // Advanced Options - Root Page … … 58 59 "p_rootpage_desc" => array("value" => null, "quotes" => QUOTES_SAFE | QUOTES_LAZY), 59 60 "p_rootpage_src" => array("value" => "slider", "quotes" => QUOTES_NONE), 61 "p_rootpage_size" => array("value" => "M", "quotes" => QUOTES_NONE), 60 62 "p_rootpage_id" => array("value" => 1, "quotes" => QUOTES_NONE), 61 63 "p_rootpage_mode" => array("value" => "fade", "quotes" => QUOTES_NONE), … … 71 73 72 74 private function loadConfig($ver = '') { 73 global $conf ;75 global $conf, $pwg_loaded_plugins; 74 76 $this->themeConfigMin = unserialize($conf['greydragon']); 75 77 $this->themeConfigMin["version"] = $ver; 78 $this->themeConfigMin["hasUserTags"] = isset($pwg_loaded_plugins['user_tags']); 76 79 77 80 $this->themeConfig = $this->validateDefault($this->themeConfigMin); … … 232 235 $r_desc = $this->getOption('p_rootpage_desc'); 233 236 $r_scr = $this->getOption('p_rootpage_src'); 237 $r_size = $this->getOption('p_rootpage_size'); 234 238 $r_mode = $this->getOption('p_rootpage_mode'); 235 239 $r_id = $this->getOption('p_rootpage_id'); … … 256 260 257 261 if ($r_scr == "photo"): 258 $content .= '[photo id=' . $r_id . ' size= Mhtml=yes link=no]';262 $content .= '[photo id=' . $r_id . ' size=' . $r_size . ' html=yes link=no]'; 259 263 elseif ($r_scr == "random"): 260 $content .= '[random album=' . $r_id . ' size= Mhtml=yes link=no]';264 $content .= '[random album=' . $r_id . ' size=' . $r_size . ' html=yes link=no]'; 261 265 else: 262 $content .= '[slider album=' . $r_id . ' nb_images=10 random=yes size= Mspeed=' . $r_delay . ' title=no effect=' . $r_mode . ' arrows=' . $r_navarr . ' control=' . $r_navctr . ' elastic=' . $r_elastic . ']';266 $content .= '[slider album=' . $r_id . ' nb_images=10 random=yes size=' . $r_size . ' speed=' . $r_delay . ' title=no effect=' . $r_mode . ' arrows=' . $r_navarr . ' control=' . $r_navctr . ' elastic=' . $r_elastic . ']'; 263 267 endif; 264 268 $content .= ' -
extensions/greydragon/js/theme.photo.js
r30484 r30643 56 56 jQuery(function(){ 57 57 if ($('#image-metadata-ico').length) { 58 $("#image-metadata-ico .meta-desc").colorbox({ inline:true, href:"div#tab-desc", className:"image-metadata-overlay", speed:200, opacity:0.3 }); 59 $("#image-metadata-ico .meta-info").colorbox({ inline:true, href:"div#tab-meta", className:"image-metadata-overlay", speed:200, opacity:0.3 }); 60 $("#image-metadata-ico .meta-exif").colorbox({ inline:true, href:"div#tab-exif", className:"image-metadata-overlay", speed:200, opacity:0.3 }); 61 $("#image-metadata-ico .meta-tags").colorbox({ inline:true, href:"div#tab-tags", className:"image-metadata-overlay", speed:200, opacity:0.3 }); 62 $("#image-metadata-ico .meta-comment").colorbox({ inline:true, href:"div#tab-comment", className:"image-metadata-overlay", speed:200, opacity:0.3, width: "1200px" }); 58 $("#image-metadata-ico .meta-desc").colorbox({ inline:true, href:"div#tab-desc", className:"image-metadata-overlay", speed:200, opacity:0.4 }); 59 $("#image-metadata-ico .meta-info").colorbox({ inline:true, href:"div#tab-meta", className:"image-metadata-overlay", speed:200, opacity:0.4 }); 60 $("#image-metadata-ico .meta-exif").colorbox({ inline:true, href:"div#tab-exif", className:"image-metadata-overlay", speed:200, opacity:0.4 }); 61 $("#image-metadata-ico .meta-tags").colorbox({ inline:true, href:"div#tab-tags", className:"image-metadata-overlay", speed:200, opacity:0.4 }); 62 $("#image-metadata-ico .meta-comment").colorbox({ inline:true, href:"div#tab-comment", className:"image-metadata-overlay", speed:200, opacity:0.4, width: "1200px" }); 63 $("#image-metadata-ico .meta-cart").colorbox({ inline:true, href:"div#tab-cart", className:"image-metadata-overlay", speed:200, opacity:0.4, width: "600px" }); 63 64 }else{ 64 65 setCurrentTab(); -
extensions/greydragon/template/footer.tpl
r30210 r30643 1 1 <div data-role="footer" id="g-footer" {if isset($greydragon.p_footer)}class="expanded"{/if}> 2 2 <ul class="g-inline g-link-list g-footer-topleft"> 3 {if isset($U_PROFILE)}<li class="dot">· </li><li><a href="{$U_PROFILE}" title="{'My Profile'|@translate}">{$USERNAME}</a></li>{/if} 4 {if isset($U_LOGIN)}<li class="dot">· </li><li><a href="{$U_LOGIN}">{'Login'|@translate}</a></li>{/if} 5 {if isset($U_REGISTER)}<li class="dot">· </li><li><a href="{$U_REGISTER}">{'Register'|@translate}</a></li>{/if} 6 {if isset($U_LOGOUT)}<li class="dot">· </li><li><a href="{$U_LOGOUT}">{'Logout'|@translate}</a></li>{/if} 7 {if !isset($ato)}{if isset($U_ADMIN)}<li class="dot">· </li><li><a href="{$U_ADMIN}">{'Administration'|@translate}</a></li>{/if}{/if} 8 {if ($greydragon.p_adminemail == "on" && isset($CONTACT_MAIL))}<li class="dot">· </li><li><a href="mailto:{$CONTACT_MAIL}?subject={'A comment on your site'|@translate|@escape:url}">{'Contact'|@translate}</a></li>{/if} 3 {if isset($U_PROFILE)}<li class="dot">· </li><li><a href="{$U_PROFILE}" title="{'My Profile'|@translate}" rel="nofollow">{$USERNAME}</a></li>{/if} 4 {* {if isset($U_LOGIN)}<li class="dot">· </li><li><a href="{if $U_LOGIN|strstr:"?"}{$U_LOGIN}&redirect={$smarty.server.REQUEST_URI|escape:'urlpathinfo'}{else}{$U_LOGIN}?redirect={$smarty.server.REQUEST_URI|escape:'url'}{/if}" rel="nofollow">{'Login'|@translate}</a></li>{/if} 5 *} 6 {if isset($U_LOGIN)}<li class="dot">· </li><li><a href="{$U_LOGIN}" rel="nofollow">{'Login'|@translate}</a></li>{/if} 7 {if isset($U_REGISTER)}<li class="dot">· </li><li><a href="{$U_REGISTER}" rel="nofollow">{'Register'|@translate}</a></li>{/if} 8 {if isset($U_LOGOUT)}<li class="dot">· </li><li><a href="{$U_LOGOUT}" rel="nofollow">{'Logout'|@translate}</a></li>{/if} 9 {if !isset($ato)}{if isset($U_ADMIN)}<li class="dot">· </li><li><a href="{$U_ADMIN}" rel="nofollow">{'Administration'|@translate}</a></li>{/if}{/if} 10 {if ($greydragon.p_adminemail == "on" && isset($CONTACT_MAIL))}<li class="dot">· </li><li><a href="mailto:{$CONTACT_MAIL}?subject={'A comment on your site'|@translate|@escape:url}" rel="nofollow">{'Contact'|@translate}</a></li>{/if} 9 11 {if ($greydragon.p_hideabout == 'off')}<li class="dot">· </li><li><a href="{$PHPWG_ROOT_PATH}/about.php">About</a></li>{/if} 10 12 </ul> -
extensions/greydragon/template/header.tpl
r30484 r30643 43 43 {combine_script id='greydragon.bootstrap' load='footer' require='jquery' path='themes/greydragon/js/bootstrap.min.js' order=98} 44 44 {combine_script id='greydragon.cookie' load='footer' require='jquery' path='themes/greydragon/js/jquery.cockie.js' order=99} 45 {if $SCRIPT_NAME|strstr:"picture.php"} 45 {if $SCRIPT_NAME|strstr:"picture.php"} 46 46 {assign var=includeMenu value="off" scope=root nocache} 47 47 {elseif $SCRIPT_NAME|strstr:"identification.php"} -
extensions/greydragon/template/picture.tpl
r30484 r30643 1 { combine_script id='core.switchbox' load='async' require='jquery' path='themes/default/js/switchbox.js'}2 {combine_script id='picture-js' load='async' require='jquery, core.switchbox' path='themes/greydragon/js/theme.photo.js'}1 {include file='include/colorbox.inc.tpl'} 2 {combine_script id='picture-js' load='async' require='jquery,jquery.colorbox' path='themes/greydragon/js/theme.photo.js'} 3 3 {assign var=overlay_mode value="off"} 4 4 {if $greydragon.p_pict_tab_mode == "txt-with-overlay" || $greydragon.p_pict_tab_mode == "ico-with-overlay"}{$overlay_mode="on"}{/if} 5 5 {assign var=ico_mode value="off"} 6 6 {if $greydragon.p_pict_tab_mode == "ico-tab-open" || $greydragon.p_pict_tab_mode == "ico-tab-close" || $greydragon.p_pict_tab_mode == "ico-with-overlay"}{$ico_mode="on"}{/if} 7 7 8 8 {if isset($MENUBAR)}{$MENUBAR}{/if} 9 9 … … 149 149 <div id="image-metadata-ico"> 150 150 <ul class="image-metadata-ico"> 151 {if isset( $COMMENT_IMG)}<li class="meta-desc{if $ico_mode=="on"} glyphicon glyphicon-eye-open{/if}{if $def_tab == 'desc'} active{/if}">{if $ico_mode=="off"}{'Description'|@translate}{/if}</li>{/if}151 {if isset( $COMMENT_IMG )}<li class="meta-desc{if $ico_mode=="on"} glyphicon glyphicon-eye-open{/if}{if $def_tab == 'desc'} active{/if}">{if $ico_mode=="off"}{'Description'|@translate}{/if}</li>{/if} 152 152 <li class="meta-info {if $ico_mode=="on"} glyphicon glyphicon-info-sign{/if}{if $def_tab == 'info'} active{/if}">{if $ico_mode=="off"}{'Info'|@translate}{/if}</li> 153 153 {if isset($metadata)}<li class="meta-exif{if $ico_mode=="on"} glyphicon glyphicon-camera{/if}{if $def_tab == 'exif'} active{/if}">{if $ico_mode=="off"}{'Exif'|@translate}{/if}</li>{/if} 154 <li class="meta-tags{if $ico_mode=="on"} glyphicon glyphicon-tags{/if}{if $def_tab == 'tags'} active{/if}" >{if $ico_mode=="off"}{'Tags'|@translate}{/if}</li>154 {if ($display_info.tags && (isset($related_tags) || ($greydragon.hasUserTags)))}<li class="meta-tags{if $ico_mode=="on"} glyphicon glyphicon-tags{/if}{if $def_tab == 'tags'} active{/if}" >{if $ico_mode=="off"}{'Tags'|@translate}{/if}</li>{/if} 155 155 {if isset($COMMENT_COUNT)}<li class="meta-comment{if $ico_mode=="on"} glyphicon glyphicon-comment{/if}{if $def_tab == 'comments'} active{/if}">{if $ico_mode=="off"}{$COMMENT_COUNT|@translate_dec:'%d comment':'%d comments'}{else} {$COMMENT_COUNT}{/if}</li>{/if} 156 {if isset($ppppp_e_mail)}<li class="meta-cart{if $ico_mode=="on"} glyphicon glyphicon-shopping-cart{/if}{if $def_tab == 'cart'} active{/if}" >{if $ico_mode=="off"}{'Cart'|@translate}{/if}</li>{/if} 156 157 </ul> 157 158 </div> … … 163 164 {if !isset($metadata) && $def_tab == 'exif'}{$def_tab="desc"}{/if} 164 165 {if !isset($COMMENT_COUNT) && $def_tab == 'comments'}{$def_tab="desc"}{/if} 165 {if !isset( $COMMENT_IMG) && $def_tab == 'desc'}{$def_tab="info"}{/if}166 {if !isset( $COMMENT_IMG ) && $def_tab == 'desc'}{$def_tab="info"}{/if} 166 167 {if $greydragon.p_pict_tab_mode !== "hide" && $overlay_mode == "off"} 167 168 <ul class="image-metadata"> 168 {if isset( $COMMENT_IMG)}<li class="{if $ico_mode=="on"}glyphicon glyphicon-eye-open{/if}{if $def_tab == 'desc'} active{/if}" rel="tab-desc">{if $ico_mode=="off"}{'Description'|@translate}{/if}</li>{/if}169 {if isset( $COMMENT_IMG )}<li class="{if $ico_mode=="on"}glyphicon glyphicon-eye-open{/if}{if $def_tab == 'desc'} active{/if}" rel="tab-desc">{if $ico_mode=="off"}{'Description'|@translate}{/if}</li>{/if} 169 170 <li class="{if $ico_mode=="on"}glyphicon glyphicon-info-sign{/if}{if $def_tab == 'info'} active{/if}" rel="tab-meta">{if $ico_mode=="off"}{'Info'|@translate}{/if}</li> 170 171 {if isset($metadata)}<li class="{if $ico_mode=="on"}glyphicon glyphicon-camera{/if}{if $def_tab == 'exif'} active{/if}" rel="tab-exif">{if $ico_mode=="off"}{'Exif'|@translate}{/if}</li>{/if} 171 <li class="{if $ico_mode=="on"}glyphicon glyphicon-tags{/if}{if $def_tab == 'tags'} active{/if}" rel="tab-tags">{if $ico_mode=="off"}{'Tags'|@translate}{/if}</li>172 {if ($display_info.tags && (isset($related_tags) || ($greydragon.hasUserTags)))}<li class="{if $ico_mode=="on"}glyphicon glyphicon-tags{/if}{if $def_tab == 'tags'} active{/if}" rel="tab-tags">{if $ico_mode=="off"}{'Tags'|@translate}{/if}</li>{/if} 172 173 {if isset($COMMENT_COUNT)}<li class="{if $ico_mode=="on"}glyphicon glyphicon-comment{/if}{if $def_tab == 'comments'} active{/if}" rel="tab-comment">{if $ico_mode=="off"}{$COMMENT_COUNT|@translate_dec:'%d comment':'%d comments'}{else} {$COMMENT_COUNT}{/if}</li>{/if} 174 {if isset($ppppp_e_mail)}<li class="{if $ico_mode=="on"}glyphicon glyphicon-shopping-cart{/if}{if $def_tab == 'cart'} active{/if}" rel="tab-cart">{if $ico_mode=="off"}{'Cart'|@translate}{/if}</li>{/if} 173 175 <li id="image-metadata-toggle" class="glyphicon {if $greydragon.p_pict_tab_mode == "txt-tab-close" || $greydragon.p_pict_tab_mode == "ico-tab-close"}glyphicon-chevron-down{else}glyphicon-chevron-up{/if}" ></li> 174 176 </ul> … … 176 178 {if $greydragon.p_pict_tab_mode !== "hide"} 177 179 <div class="image-metadata-tabs{if $overlay_mode=="on"} overlay{/if}" {if $greydragon.p_pict_tab_mode == "txt-tab-close" || $greydragon.p_pict_tab_mode == "ico-tab-close" || $overlay_mode=="on"}style="display: none;"{/if}> 178 {if isset( $COMMENT_IMG)}180 {if isset( $COMMENT_IMG )} 179 181 <div id="tab-desc" class="image-metadata-tab"> 180 182 {$COMMENT_IMG} … … 308 310 {if isset($metadata)} 309 311 <div id="tab-exif" class="image-metadata-tab"> 310 <dl id=" metadata" class="imageInfoTable dl-horizontal">312 <dl id="Metadata" class="imageInfoTable dl-horizontal"> 311 313 {foreach from=$metadata item=meta} 312 314 {foreach from=$meta.lines item=value key=label} … … 319 321 {/if} 320 322 323 {if ($display_info.tags && (isset($related_tags) || ($greydragon.hasUserTags)))} 321 324 <div id="tab-tags" class="image-metadata-tab"> 322 {if $display_info.tags and isset($related_tags)} 323 <dd> 324 {foreach from=$related_tags item=tag name=tag_loop}{if !$smarty.foreach.tag_loop.first}, {/if}<a href="{$tag.URL}">{$tag.name}</a>{/foreach} 325 </dd> 326 {else} 327 ... 328 {/if} 329 </div> 325 {if ($greydragon.hasUserTags)}<table id="TagsTable"><tr id="Tags" ><td class="label"></td><td class="value">{/if} 326 {foreach from=$related_tags item=tag name=tag_loop}{if !$smarty.foreach.tag_loop.first}, {/if}<a href="{$tag.URL}">{$tag.name}</a>{/foreach} 327 {if ($greydragon.hasUserTags)}</td></tr></table>{/if} 328 </div> 329 {/if} 330 330 331 331 {if isset($COMMENT_COUNT)} … … 371 371 </div> 372 372 {/if} 373 374 {if isset($ppppp_e_mail)} 375 <div id="tab-cart" class="image-metadata-tab"> 376 {if isset($COMMENT_IMG)} 377 {/if} 378 </div> 379 {/if} 373 380 </div> 374 381 {/if} -
extensions/greydragon/themeconf.inc.php
r30484 r30643 2 2 /* 3 3 Theme Name: GreyDragon 4 Version: 1.0.1 44 Version: 1.0.15 5 5 Description: Dark, slate, white background, grayscale. 6 6 Theme URI: http://piwigo.org/ext/extension_view.php?eid=775 … … 11 11 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); 12 12 13 define('GDTHEME_VERSION', '1.0.1 4');13 define('GDTHEME_VERSION', '1.0.15'); 14 14 15 15 require_once( PHPWG_THEMES_PATH . 'greydragon/include/greydragon.class.php'); … … 26 26 add_event_handler('init', 'greydragon_init'); 27 27 28 pwg_set_session_var('show_metadata', 1);29 30 28 // Load Theme's Parameters 31 29 function greydragon_init() { … … 38 36 if ($themeCore->getOption("p_nocounter") == "on"): 39 37 add_event_handler('loc_end_index', 'no_breadcrumb_counter'); 38 endif; 39 if ($themeCore->getOption("p_pict_tab_exif") == "off"): 40 pwg_set_session_var('show_metadata', 0); 41 else: 42 pwg_set_session_var('show_metadata', 1); 40 43 endif; 41 44
Note: See TracChangeset
for help on using the changeset viewer.
