Ignore:
Timestamp:
12/02/14 06:51:29 (5 years ago)
Author:
SergeD
Message:

version 1.0.15 - please refer to changelog for more details

Location:
extensions/greydragon
Files:
5 added
40 edited

Legend:

Unmodified
Added
Removed
  • extensions/greydragon/admin/admin.inc.php

    r30484 r30643  
    33if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); 
    44 
    5 define('GDTHEME_VERSION', '1.0.14'); 
     5define('GDTHEME_VERSION', '1.0.15'); 
    66 
    77require_once( PHPWG_THEMES_PATH . 'greydragon/include/greydragon.class.php'); 
  • extensions/greydragon/admin/admin.tpl

    r30484 r30643  
    147147      </li> 
    148148      <li><label><span class="graphicalCheckbox {if $options.p_pict_tab_anim=="on"}icon-check{else}icon-check-empty{/if}">&nbsp;</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}">&nbsp;</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> 
    149150    </ul> 
    150151  </fieldset> 
     
    164165        </select> 
    165166        <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> 
    166174      </li> 
    167175      <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> 
     
    210218</div> 
    211219<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>&nbsp;&nbsp;&nbsp;body { width: auto; }</li> 
    232         <li>Remove fixed width but keep min-width:<br>&nbsp;&nbsp;&nbsp;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>&nbsp;&nbsp;&nbsp;.gdthumb { box-shadow: 6px 6px 3px #888888; }</li> 
    234       </ul> 
    235   </ul> 
     220{include file='./help.inc.tpl'} 
    236221</div> 
    237222</form> 
  • extensions/greydragon/changelog.txt

    r30484 r30643  
    1818 
    1919=== Changelog === 
     20version 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 
    2032version 1.0.14 
    2133+ Hiding of photo counters extended to category menu 
  • extensions/greydragon/css/colorpack/blackhawk/styles.css

    r30484 r30643  
    6464.image-metadata-tabs { background: #222; } 
    6565 
     66#cboxWrapper { border: 1px solid #444; background: #222 !important; } 
    6667#cboxLoadedContent { background: #222 !important; } 
     68#cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose { background-image: url(images/controls.png); } 
  • extensions/greydragon/css/colorpack/greydragon/styles.css

    r30484 r30643  
    6464.image-metadata-tabs { background: #222; } 
    6565 
     66#cboxWrapper       { background: #222 !important; border: 1px solid #333; } 
    6667#cboxLoadedContent { background: #222 !important; } 
     68#cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose { background-image: url(images/controls.png); } 
  • extensions/greydragon/css/colorpack/slateblue/styles.css

    r30484 r30643  
    6363.image-metadata-tabs { background: #1a1e27; } 
    6464 
     65#cboxWrapper { border: 1px solid #666; background: #1a1e27 !important; } 
    6566#cboxLoadedContent { background: #1a1e27 !important; } 
     67#cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose { background-image: url(images/controls.png); } 
  • extensions/greydragon/css/colorpack/whitehawk/styles.css

    r30484 r30643  
    7171.image-metadata-tabs { background: #eee; border: solid 0 #bbb; border-width: 0 1px 0 1px; } 
    7272 
    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  
    196196#imageHeaderBar h2          { font-size: 100%; font-weight: inherit;} 
    197197#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; } 
    198199#imageToolBar .imageNumber  { display: inline-block; float: right; line-height: 26px; margin: 0 2px 0 0; min-width: 40px; text-align: center;} 
    199200#imageToolBar               { margin-top: -24px; margin-bottom: 0; float: right;} 
     
    238239.image-metadata .glyphicon-chevron-up, .image-metadata .glyphicon-chevron-down { float: right; padding-right: 10px; font-size: 0.8em; } 
    239240 
     241#cboxContent { margin-top: 22px; } 
    240242#cboxLoadedContent .image-metadata-tab { display: block; } 
    241243 
     
    288290.static-menu .calendarTitle, .static-menu .calendarBar { margin-left: 196px; } 
    289291 
    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; } 
    291293.infos ul, .errors ul, .warnings ul { list-style: none; margin: 0; padding: 0; overflow: hidden; } 
    292294.infos  { border-left-color: #0F0; } 
     
    311313.contact table td:first-child { padding-right: 1.5em; } 
    312314.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  
    5353      "p_pict_tab_default" => array("value" => "desc",   "quotes" => QUOTES_NONE), 
    5454      "p_pict_tab_anim"    => array("value" => "off",    "quotes" => QUOTES_NONE), 
     55      "p_pict_tab_exif"    => array("value" => "on",     "quotes" => QUOTES_NONE), 
    5556 
    5657      // Advanced Options - Root Page  
     
    5859      "p_rootpage_desc"    => array("value" => null,     "quotes" => QUOTES_SAFE | QUOTES_LAZY), 
    5960      "p_rootpage_src"     => array("value" => "slider", "quotes" => QUOTES_NONE), 
     61      "p_rootpage_size"    => array("value" => "M",      "quotes" => QUOTES_NONE), 
    6062      "p_rootpage_id"      => array("value" => 1,        "quotes" => QUOTES_NONE), 
    6163      "p_rootpage_mode"    => array("value" => "fade",   "quotes" => QUOTES_NONE), 
     
    7173 
    7274  private function loadConfig($ver = '') { 
    73     global $conf; 
     75    global $conf, $pwg_loaded_plugins; 
    7476    $this->themeConfigMin = unserialize($conf['greydragon']); 
    7577    $this->themeConfigMin["version"] = $ver; 
     78    $this->themeConfigMin["hasUserTags"] = isset($pwg_loaded_plugins['user_tags']); 
    7679 
    7780    $this->themeConfig = $this->validateDefault($this->themeConfigMin); 
     
    232235    $r_desc    = $this->getOption('p_rootpage_desc'); 
    233236    $r_scr     = $this->getOption('p_rootpage_src'); 
     237    $r_size    = $this->getOption('p_rootpage_size'); 
    234238    $r_mode    = $this->getOption('p_rootpage_mode'); 
    235239    $r_id      = $this->getOption('p_rootpage_id'); 
     
    256260 
    257261      if ($r_scr == "photo"): 
    258         $content .= '[photo id=' . $r_id . ' size=M html=yes link=no]'; 
     262        $content .= '[photo id=' . $r_id . ' size=' . $r_size . ' html=yes link=no]'; 
    259263      elseif ($r_scr == "random"): 
    260         $content .= '[random album=' . $r_id . ' size=M html=yes link=no]'; 
     264        $content .= '[random album=' . $r_id . ' size=' . $r_size . ' html=yes link=no]'; 
    261265      else: 
    262         $content .= '[slider album=' . $r_id . ' nb_images=10 random=yes size=M speed=' . $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 . ']'; 
    263267      endif; 
    264268      $content .= '       
  • extensions/greydragon/js/theme.photo.js

    r30484 r30643  
    5656  jQuery(function(){ 
    5757    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" }); 
    6364    }else{ 
    6465      setCurrentTab(); 
  • extensions/greydragon/template/footer.tpl

    r30210 r30643  
    11<div data-role="footer" id="g-footer" {if isset($greydragon.p_footer)}class="expanded"{/if}> 
    22  <ul class="g-inline g-link-list g-footer-topleft"> 
    3     {if isset($U_PROFILE)}<li class="dot">&middot;&nbsp;</li><li><a href="{$U_PROFILE}" title="{'My Profile'|@translate}">{$USERNAME}</a></li>{/if} 
    4     {if isset($U_LOGIN)}<li class="dot">&middot;&nbsp;</li><li><a href="{$U_LOGIN}">{'Login'|@translate}</a></li>{/if} 
    5     {if isset($U_REGISTER)}<li class="dot">&middot;&nbsp;</li><li><a href="{$U_REGISTER}">{'Register'|@translate}</a></li>{/if} 
    6     {if isset($U_LOGOUT)}<li class="dot">&middot;&nbsp;</li><li><a href="{$U_LOGOUT}">{'Logout'|@translate}</a></li>{/if} 
    7     {if !isset($ato)}{if isset($U_ADMIN)}<li class="dot">&middot;&nbsp;</li><li><a href="{$U_ADMIN}">{'Administration'|@translate}</a></li>{/if}{/if} 
    8     {if ($greydragon.p_adminemail == "on" && isset($CONTACT_MAIL))}<li class="dot">&middot;&nbsp;</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">&middot;&nbsp;</li><li><a href="{$U_PROFILE}" title="{'My Profile'|@translate}" rel="nofollow">{$USERNAME}</a></li>{/if} 
     4{*    {if isset($U_LOGIN)}<li class="dot">&middot;&nbsp;</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">&middot;&nbsp;</li><li><a href="{$U_LOGIN}" rel="nofollow">{'Login'|@translate}</a></li>{/if} 
     7    {if isset($U_REGISTER)}<li class="dot">&middot;&nbsp;</li><li><a href="{$U_REGISTER}" rel="nofollow">{'Register'|@translate}</a></li>{/if} 
     8    {if isset($U_LOGOUT)}<li class="dot">&middot;&nbsp;</li><li><a href="{$U_LOGOUT}" rel="nofollow">{'Logout'|@translate}</a></li>{/if} 
     9    {if !isset($ato)}{if isset($U_ADMIN)}<li class="dot">&middot;&nbsp;</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">&middot;&nbsp;</li><li><a href="mailto:{$CONTACT_MAIL}?subject={'A comment on your site'|@translate|@escape:url}" rel="nofollow">{'Contact'|@translate}</a></li>{/if} 
    911    {if ($greydragon.p_hideabout == 'off')}<li class="dot">&middot;&nbsp;</li><li><a href="{$PHPWG_ROOT_PATH}/about.php">About</a></li>{/if} 
    1012  </ul> 
  • extensions/greydragon/template/header.tpl

    r30484 r30643  
    4343{combine_script id='greydragon.bootstrap' load='footer' require='jquery' path='themes/greydragon/js/bootstrap.min.js' order=98} 
    4444{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"} 
    4646{assign var=includeMenu value="off" scope=root nocache} 
    4747{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'} 
    33{assign var=overlay_mode value="off"} 
    44{if $greydragon.p_pict_tab_mode == "txt-with-overlay" || $greydragon.p_pict_tab_mode == "ico-with-overlay"}{$overlay_mode="on"}{/if} 
    55{assign var=ico_mode value="off"} 
    66{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                                                                                            
    88{if isset($MENUBAR)}{$MENUBAR}{/if} 
    99 
     
    149149<div id="image-metadata-ico"> 
    150150  <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} 
    152152    <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> 
    153153    {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} 
    155155    {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}&nbsp;{$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} 
    156157  </ul> 
    157158</div> 
     
    163164{if !isset($metadata) && $def_tab == 'exif'}{$def_tab="desc"}{/if} 
    164165{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} 
    166167{if $greydragon.p_pict_tab_mode !== "hide" && $overlay_mode == "off"} 
    167168<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} 
    169170  <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> 
    170171  {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} 
    172173  {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}&nbsp;{$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} 
    173175  <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> 
    174176</ul> 
     
    176178{if $greydragon.p_pict_tab_mode !== "hide"} 
    177179<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 )} 
    179181  <div id="tab-desc" class="image-metadata-tab">  
    180182    {$COMMENT_IMG} 
     
    308310  {if isset($metadata)} 
    309311  <div id="tab-exif" class="image-metadata-tab">  
    310     <dl id="metadata" class="imageInfoTable dl-horizontal"> 
     312    <dl id="Metadata" class="imageInfoTable dl-horizontal"> 
    311313    {foreach from=$metadata item=meta} 
    312314      {foreach from=$meta.lines item=value key=label} 
     
    319321  {/if} 
    320322 
     323  {if ($display_info.tags && (isset($related_tags) || ($greydragon.hasUserTags)))} 
    321324  <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} 
    330330 
    331331  {if isset($COMMENT_COUNT)} 
     
    371371  </div>  
    372372  {/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} 
    373380</div> 
    374381{/if} 
  • extensions/greydragon/themeconf.inc.php

    r30484 r30643  
    22/* 
    33Theme Name: GreyDragon 
    4 Version: 1.0.14 
     4Version: 1.0.15 
    55Description: Dark, slate, white background, grayscale. 
    66Theme URI: http://piwigo.org/ext/extension_view.php?eid=775 
     
    1111if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); 
    1212 
    13 define('GDTHEME_VERSION', '1.0.14'); 
     13define('GDTHEME_VERSION', '1.0.15'); 
    1414 
    1515require_once( PHPWG_THEMES_PATH . 'greydragon/include/greydragon.class.php'); 
     
    2626add_event_handler('init', 'greydragon_init'); 
    2727 
    28 pwg_set_session_var('show_metadata', 1); 
    29  
    3028// Load Theme's Parameters 
    3129function greydragon_init() { 
     
    3836  if ($themeCore->getOption("p_nocounter") == "on"): 
    3937    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); 
    4043  endif; 
    4144 
Note: See TracChangeset for help on using the changeset viewer.