Changeset 31043 for extensions/greydragon

Timestamp:

Mar 19, 2015, 7:31:56 AM (10 years ago)

Author:

SergeD

Message:

version 1.2.22 - see changelog for details

Location:

extensions/greydragon

Files:

• admin/admin.inc.php (modified) (1 diff)
• admin/admin.tpl (modified) (1 diff)
• admin/help.inc.tpl (modified) (2 diffs)
• changelog.txt (modified) (1 diff)
• css/styles.css (modified) (1 diff)
• include/greydragon.class.php (modified) (3 diffs)
• js/theme.menu.js (modified) (2 diffs)
• js/theme.photo.js (modified) (1 diff)
• template/footer.tpl (modified) (2 diffs)
• template/header.tpl (modified) (2 diffs)
• template/picture.tpl (modified) (3 diffs)
• template/picture_tab_content.tpl (added)
• template/picture_tab_ico.tpl (added)
• template/picture_tab_txt.tpl (added)
• themeconf.inc.php (modified) (5 diffs)

extensions/greydragon/admin/admin.inc.php

@@ -65 +65 @@
 endif;
 
-$packlist = array();
-$packroot = $themeroot . 'css/colorpack/';
-foreach (scandir($packroot) as $pack_name):
-  if (file_exists($packroot . "$pack_name/styles.css")):
-    if ($pack_name[0] == "."):
-      continue;
-    endif;
-    $packlist[] = $pack_name;
-  endif;
-endforeach;
+$packlist = $themeCore->getColorPackList();
 
 // Ensure default values are set

extensions/greydragon/admin/admin.tpl

@@ -102 +102 @@
       </li>
       <li><label><span class="graphicalCheckbox {if $options.p_animated_menu=="on"}icon-check{else}icon-check-empty{/if}">&nbsp;</span><input name="p_animated_menu" id="p_animated_menu" type="checkbox" value="on" {if $options.p_animated_menu=="on"}checked="checked"{/if}>{'Animate Menu'|@translate}</label></li>
+      <li><label><span class="graphicalCheckbox {if $options.p_main_menu_close=="on"}icon-check{else}icon-check-empty{/if}">&nbsp;</span><input name="p_main_menu_close" id="p_main_menu_close" type="checkbox" value="on" {if $options.p_main_menu_close=="on"}checked="checked"{/if}>{'Auto Close Popup Menu on Refresh'|@translate}</label></li>
       <li>
         <select id="p_credits" name="p_credits">

extensions/greydragon/admin/help.inc.tpl

@@ -12 +12 @@
 
     <li><h3>{'General Settings'|@translate}</h3>
-      <p>{'To add logo specify <b>Logo Image</b>. Recommended logo height is 80px. If you need bigger space for your logo, CSS adjustments
-        would have to be made. In addition to Logo you can specify <b>Header Text</b>.'|@translate}</p>
-      <p>{'Supported macros'|@translate}:
+      <p>{'<b>Logo Image</b> - optional - path to image used as gallery logo. Recommended logo height is 80px. If you need bigger space for your logo, CSS 
+        adjustments would have to be made'|@translate}<br>
+      {'<b>Header Text</b> - optional - Text to be added in header area next to Logo'|@translate}<br>
+      {'Supported macros'|@translate}:
         <ul><li>%gallery_title% - {'Gallery title'|@translate}</li>
         </ul>
-      </p>
-      <p>{'<b>Footer Text</b> allows adding simple text as a row in the footer below menu links and Site\'s credits.'|@translate}</p>
-      <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,
-        theme for the pages. By default theme includes 3 color packs: slateblue, blackhawk, whitehawk, but you could be easily extend the list by 
-        creating copy of one of the existing colorpack folders and then adjusting colors.'|@translate}</p>
+      <p>{'If neither Logo Image or Header Text are set, header region would collapse'|@translate}<br>
+      {'<b>Footer Text</b> allows adding content in the footer below menu links and Site\'s credits.'|@translate}</p>
+      <p>{'<b>Color Pack</b> - select color pack to be used with the theme. It allows changing colors, styles, theme for the pages. By default theme includes 
+        4 color packs: blackhawk, greydragon, slateblue, and whitehawk, but you could extend the list by creating copy of one of the existing colorpack 
+        folders and adjusting managed styles.'|@translate}</p>
     </li>
 
@@ -32 +33 @@
         <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; }'|@translate}</li>
         <li>{'Remove Root link in page\'s breadcrumbs: set $conf[\'level_separator\'] = \'\'; and apply CSS<br>&nbsp;&nbsp;&nbsp;.browsePath a:first-child { display: none; }<br>&nbsp;&nbsp;&nbsp;.browsePath a:after { content: " :: "; }'|@translate}</li>
+        <li>{'Change height of the footer to accomodate larger <b>Footer Text</b> content<br>&nbsp;&nbsp;&nbsp;#g-footer { min-height: 5em !important; }'|@translate}</li>
+        <li>{'Center <b>Footer Text</b> content<br>&nbsp;&nbsp;&nbsp;.g-footer-bottomleft { text-align: center; }'|@translate}</li>
       </ul></li>
 

extensions/greydragon/changelog.txt

@@ -18 +18 @@
 
 === Changelog ===
+version 1.2.22 *
++ Added Photo metadata tab targets in picture.tpl (see template for positioning): {*GD_META_ICO*}, {*GD_META_TXT*}, {*GD_META_CONTENT*}
++ Picture tab "classic" content moved into external templates picture_tab_ico.tpl, picture_tab_txt.tpl, picture_tab_content.tpl
++ Added support for gd_get_metadata content trigger
+  You can add custom content for picture meta tabs 
+    Ex: add_event_handler('gd_get_metadata', 'my_get_tab_metadata');
+        function greydragon_get_tab_metadata($metadata) { return $metadata; }
+        where each array element represents the tab
+          $metadata[] = array(
+             "id"         => unique id of the tab
+             "icon_class" => class to be used to render icon tabs
+             "title"      => tab or menu block title
+             "content"    => block content
+             "target"     => optional, rendering target - "left", "top", "right", "bottom", not supported, reserved for future use
+             "combine"    => combine_css or combine_js reference block
+           );
+  Prior to rendering $metadata is processed and converted in appropriate construct to be used by the theme
+  See ShareThis plugin for more details
++ Tab switch logic in Photo page optimized to allow management of dynamic tabs introduced by 3rd party plugins
++ Improved presentation and content alignment of Tags tab in picture page
++ Added support for auto-close of popup menu on navigation or refresh - Auto Close Popup Menu on Refresh 
++ Help improvements
+- Fixed issue with missing colorpack setting when theme is first installed and settings are not set yet
+- Fixed issue with number of undefined theme params (unused at this time)
+- Fixed issue with missing enumerator for $footer_elements in footer.tpl
+
 version 1.1.21
 - Another attempt to fix issue with root url associated with gallery logo was not referring to the sites root properly when installed as sub-folder

extensions/greydragon/css/styles.css

@@ -331 +331 @@
 
 #TagsTable { width: 600px; min-height: 5.5em; }
-#Tags { background-position: right 0 bottom 2px; }
+#tab-tags #TagsTable { width: 100%; min-width: 400px; z-index: 1; }
+// #Tags { background: none; }
+#Tags td.value { position: relative; vertical-align: top; }
+#Tags div.tags-edit-marker { position: absolute; right: 0; bottom: 0; }

extensions/greydragon/include/greydragon.class.php

@@ -3 +3 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-define('GDTHEME_VERSION', '1.1.21');
+define('GDTHEME_VERSION', '1.2.22');
 
 define("QUOTES_NONE",   FALSE);
@@ -36 +36 @@
 
     return array(
-      "p_version"          => array("value" => "",       "quotes" => QUOTES_NONE),
+      "p_version"          => array("value" => "",           "quotes" => QUOTES_NONE),
 
       // General Settings
-      "p_logo_path"        => array("value" => null,     "quotes" => QUOTES_NONE),
-      "p_header"           => array("value" => null,     "quotes" => QUOTES_LAZY),
-      "p_footer"           => array("value" => null,     "quotes" => QUOTES_LAZY),
-      "p_colorpack"        => array("value" => null,     "quotes" => QUOTES_NONE),
-
-      "p_favicon_ico"      => array("value" => null,     "quotes" => QUOTES_NONE),
-      "p_favicon_png"      => array("value" => null,     "quotes" => QUOTES_NONE),
-      "p_favicon_gif"      => array("value" => null,     "quotes" => QUOTES_NONE),
-      "p_favicon_apple"    => array("value" => null,     "quotes" => QUOTES_NONE),
-      "p_favicon_noshine"  => array("value" => "off",    "quotes" => QUOTES_NONE),
+      "p_logo_path"        => array("value" => null,         "quotes" => QUOTES_NONE),
+      "p_header"           => array("value" => null,         "quotes" => QUOTES_LAZY),
+      "p_footer"           => array("value" => null,         "quotes" => QUOTES_LAZY),
+      "p_colorpack"        => array("value" => "greydragon", "quotes" => QUOTES_NONE),
+
+      "p_favicon_ico"      => array("value" => null,         "quotes" => QUOTES_NONE),
+      "p_favicon_png"      => array("value" => "",         "quotes" => QUOTES_NONE),
+      "p_favicon_gif"      => array("value" => "",         "quotes" => QUOTES_NONE),
+      "p_favicon_apple"    => array("value" => "",         "quotes" => QUOTES_NONE),
+      "p_favicon_noshine"  => array("value" => "off",        "quotes" => QUOTES_NONE),
     
       // Advanced Options - General
-      "p_main_menu"        => array("value" => "closed", "quotes" => QUOTES_NONE), // static, closed, opened, top, header-bottom, header-top, disabled
-      "p_animated_menu"    => array("value" => "off",    "quotes" => QUOTES_NONE),
-
-      "p_lowertext"        => array("value" => "off",    "quotes" => QUOTES_NONE),
-      "p_credits"          => array("value" => "off",    "quotes" => QUOTES_NONE),
-      "p_nogenerator"      => array("value" => "off",    "quotes" => QUOTES_NONE),
-      "p_hideabout"        => array("value" => "off",    "quotes" => QUOTES_NONE),
-      "p_adminemail"       => array("value" => "off",    "quotes" => QUOTES_NONE),
-      "p_nocounter"        => array("value" => "off",    "quotes" => QUOTES_NONE),
+      "p_main_menu"        => array("value" => "closed",     "quotes" => QUOTES_NONE), // static, closed, opened, top, header-bottom, header-top, disabled
+      "p_animated_menu"    => array("value" => "off",        "quotes" => QUOTES_NONE),
+      "p_main_menu_close"  => array("value" => "off",        "quotes" => QUOTES_NONE),
+
+      "p_lowertext"        => array("value" => "off",        "quotes" => QUOTES_NONE),
+      "p_credits"          => array("value" => "off",        "quotes" => QUOTES_NONE),
+      "p_nogenerator"      => array("value" => "off",        "quotes" => QUOTES_NONE),
+      "p_hideabout"        => array("value" => "off",        "quotes" => QUOTES_NONE),
+      "p_adminemail"       => array("value" => "off",        "quotes" => QUOTES_NONE),
+      "p_nocounter"        => array("value" => "off",        "quotes" => QUOTES_NONE),
 
       // Advanced Options - Photo Page 
       "p_pict_tab_mode"    => array("value" => "txt-tab-open", "quotes" => QUOTES_NONE),
-      "p_pict_tab_default" => array("value" => "desc",   "quotes" => QUOTES_NONE),
-      "p_pict_tab_anim"    => array("value" => "off",    "quotes" => QUOTES_NONE),
-      "p_pict_tab_exif"    => array("value" => "on",     "quotes" => QUOTES_NONE),
+      "p_pict_tab_default" => array("value" => "desc",       "quotes" => QUOTES_NONE),
+      "p_pict_tab_anim"    => array("value" => "off",        "quotes" => QUOTES_NONE),
+      "p_pict_tab_exif"    => array("value" => "on",         "quotes" => QUOTES_NONE),
 
       // Advanced Options - Root Page 
@@ -412 +413 @@
   }
 
+  public function getColorPackList() {
+    $themeroot = './themes/' . basename(dirname(dirname(__FILE__))) . '/';
+
+    $packlist = array();
+    $packroot = $themeroot . 'css/colorpack/';
+    foreach (scandir($packroot) as $pack_name):
+      if (file_exists($packroot . "$pack_name/styles.css")):
+        if ($pack_name[0] == "."):
+          continue;
+        endif;
+        $packlist[] = $pack_name;
+      endif;
+    endforeach;
+    return $packlist;
+  }
+
 }
 

extensions/greydragon/js/theme.menu.js

@@ -6 +6 @@
       pcontent=jQuery("#content");
 
-  // static, opened, closed, disabled
+  // static, opened, closed, disabled, force_hide
 
   function hideMenu(delay) {
@@ -52 +52 @@
 
     if (menubar.length == 1 && p_main_menu != "disabled" && p_main_menu != 'header-bottom') {
-      if (jQuery.cookie('side-menu') == undefined) {
-        if (p_main_menu == 'opened') {
-          jQuery.cookie('side-menu', 'visible', {path: "/"});
-        }else{
-          jQuery.cookie('side-menu', 'hidden', {path: "/"});
+      if (p_main_menu == "force_hide") {
+        jQuery.cookie('side-menu', 'hidden', {path: "/"});
+      }else{
+        if (jQuery.cookie('side-menu') == undefined) {
+          if (p_main_menu == 'opened') {
+            jQuery.cookie('side-menu', 'visible', {path: "/"});
+          }else{
+            jQuery.cookie('side-menu', 'hidden', {path: "/"});
+          }
         }
       }

extensions/greydragon/js/theme.photo.js

@@ -55 +55 @@
 
   jQuery(function(){
+    if ($('#TagsTable #Tags').css('background-image') == "none") {
+      $('#TagsTable #Tags .tags-edit-marker').hide();
+    }else{
+      $('#TagsTable #Tags .tags-edit-marker').show();
+      $('#TagsTable #Tags').css("background", "none");
+    }
+
     if ($('#image-metadata-ico').length) {
-      $("#image-metadata-ico .meta-desc").colorbox({ inline:true, href:"div#tab-desc", className:"image-metadata-overlay", speed:200, opacity:0.6 });
-      $("#image-metadata-ico .meta-info").colorbox({ inline:true, href:"div#tab-meta", className:"image-metadata-overlay", speed:200, opacity:0.6 });
-      $("#image-metadata-ico .meta-exif").colorbox({ inline:true, href:"div#tab-exif", className:"image-metadata-overlay", speed:200, opacity:0.6 });
-      $("#image-metadata-ico .meta-tags").colorbox({ inline:true, href:"div#tab-tags", className:"image-metadata-overlay", speed:200, opacity:0.6 });
-      $("#image-metadata-ico .meta-comment").colorbox({ inline:true, href:"div#tab-comment", className:"image-metadata-overlay", speed:200, opacity:0.6, width: "1200px" });
-      $("#image-metadata-ico .meta-cart").colorbox({ inline:true, href:"div#tab-cart", className:"image-metadata-overlay", speed:200, opacity:0.6, width: "600px" });
+      $("#image-metadata-ico>ul>li").each(function() {
+        var el = $(this);
+        var classNames = el.attr('class').split(" ");
+        if (classNames.length > 0) {
+          var classMeta = classNames[0].split("-");
+          if ((classMeta.length == 2) && (classMeta[0] == "meta")) { 
+            var metaTag = classMeta[1];
+            if (metaTag == "info")    { var _href = "div#tab-meta"; } else { var _href = "div#tab-" + metaTag; }
+            if (metaTag == "comment") { var _width = "1200px"; } else if (metaTag == "cart") { _width = "600px"; } else { var _width = false; }
+            
+            el.colorbox({ inline:true, href: _href, className:"image-metadata-overlay", speed:200, opacity:0.6, width: _width });
+          }
+        }
+      });
     }else{
       setCurrentTab();

extensions/greydragon/template/footer.tpl

@@ -2 +2 @@
   <ul class="g-inline g-link-list g-footer-topleft">
     {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}
-{*    {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}
-*}
     {if isset($U_LOGIN)}<li class="dot">&middot;&nbsp;</li><li><a href="{$U_LOGIN}" rel="nofollow">{'Login'|@translate}</a></li>{/if}
     {if isset($U_REGISTER)}<li class="dot">&middot;&nbsp;</li><li><a href="{$U_REGISTER}" rel="nofollow">{'Register'|@translate}</a></li>{/if}
@@ -11 +9 @@
     {if ($greydragon.p_hideabout == 'off')}<li class="dot">&middot;&nbsp;</li><li><a href="{$PHPWG_ROOT_PATH}/about.php">About</a></li>{/if}
   </ul>
-  {if isset($greydragon.p_footer)}
+  {if isset($greydragon.p_footer) || isset($footer_elements)}
   <div class="g-footer-bottomleft">
-    {$greydragon.p_footer}
+    {if isset($greydragon.p_footer)} {$greydragon.p_footer} {/if}
+    {if isset($footer_elements)}
+      {foreach from=$footer_elements item=elt}
+        {$elt}
+      {/foreach}
+    {/if}
   </div>
   {/if}

extensions/greydragon/template/header.tpl

@@ -73 +73 @@
 {if $includeMenu=="on"} 
   {combine_script id='greydragon.scripts' load='footer' require='jquery' path='themes/greydragon/js/theme.menu.js' order=100}
-  {if isset({$greydragon.p_main_menu})}
-    var p_main_menu = "{$greydragon.p_main_menu}";
+  {if $greydragon.p_main_menu_close == "on"}
+  var p_main_menu = "force_hide";
+  {elseif isset({$greydragon.p_main_menu})}
+  var p_main_menu = "{$greydragon.p_main_menu}";
   {else}
-    var p_main_menu = "hidden";
+  var p_main_menu = "hidden";
   {/if}
   var p_animated_menu = "{$greydragon.p_animated_menu}";
@@ -100 +102 @@
 
 {get_combined_scripts load='header'}
+
 <!--[if lt IE 7]>
 <script type="text/javascript" src="{$ROOT_URL}themes/default/js/pngfix.js"></script>

extensions/greydragon/template/picture.tpl

@@ -147 +147 @@
 <div id="image-metadata-ico" {if $DISPLAY_NAV_THUMB}class="nav-thumb-margin"{/if}>
   <ul class="image-metadata-ico"> 
-    {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}
-    <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>
-    {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}
-    {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}
-    {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}
-    {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}
+    {include file='picture_tab_ico.tpl'}
+    {*GD_META_ICO*}
   </ul>
 </div>
@@ -165 +161 @@
 {if $greydragon.p_pict_tab_mode !== "hide" && $overlay_mode == "off"}
 <ul class="image-metadata"> 
-  {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}
-  <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>
-  {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}
-  {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}
-  {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}
-  {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}
+  {include file='picture_tab_txt.tpl'}
+  {*GD_META_TXT*}
   <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>
 </ul>
@@ -176 +168 @@
 {if $greydragon.p_pict_tab_mode !== "hide"}
 <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}> 
-  {if isset( $COMMENT_IMG )}
-  <div id="tab-desc" class="image-metadata-tab"> 
-    {$COMMENT_IMG}
-  </div>
-  {/if}
-
-  <div id="tab-meta" class="image-metadata-tab"> 
-    <dl id="standard" class="imageInfoTable dl-horizontal">
-    {strip}
-      {if $display_info.author and isset($INFO_AUTHOR)}
-      <dt id="Author" class="imageInfo">{'Author'|@translate}</dt>
-      <dd>{$INFO_AUTHOR}</dd>
-      {/if}
-      {if $display_info.created_on and isset($INFO_CREATION_DATE)}
-      <dt id="datecreate">{'Created on'|@translate}</dt>
-      <dd>{$INFO_CREATION_DATE}</dd>
-      {/if}
-      {if $display_info.posted_on}
-      <dt id="datepost">{'Posted on'|@translate}</dt>
-      <dd>{$INFO_POSTED_DATE}</dd>
-      {/if}
-      {if $display_info.dimensions and isset($INFO_DIMENSIONS)}
-      <dt id="Dimensions">{'Dimensions'|@translate}</dt>
-      <dd>{$INFO_DIMENSIONS}</dd>
-      {/if}
-      {if $display_info.file}
-      <dt id="File">{'File'|@translate}</dt>
-      <dd>{$INFO_FILE}</dd>
-      {/if}
-      {if $display_info.filesize and isset($INFO_FILESIZE)}
-      <dt id="Filesize">{'Filesize'|@translate}</dt>
-      <dd>{$INFO_FILESIZE}</dd>
-      {/if}
-      {if $display_info.categories and isset($related_categories)}
-      <dt id="Categories">{'Albums'|@translate}</dt>
-      <dd>
-        <ul>
-          {foreach from=$related_categories item=cat}
-          <li>{$cat}</li>
-          {/foreach}
-        </ul>
-      </dd>
-      {/if}
-      {if $display_info.visits}
-      <dt id="Visits">{'Visits'|@translate}</dt>
-      <dd>{$INFO_VISITS}</dd>
-      {/if}
-      {if $display_info.rating_score and isset($rate_summary)}
-      <dt id="Average">{'Rating score'|@translate}</dt>
-      <dd>
-        {if $rate_summary.count}
-        <span id="ratingScore">{$rate_summary.score}</span> <span id="ratingCount">({$rate_summary.count|@translate_dec:'%d rate':'%d rates'})</span>
-        {else}
-        <span id="ratingScore">{'no rate'|@translate}</span> <span id="ratingCount"></span>
-        {/if}
-      </dd>
-      {/if}
-
-      {if isset($rating)}
-      <dt id="rating" >
-        <span id="updateRate">{if isset($rating.USER_RATE)}{'Update your rating'|@translate}{else}{'Rate this photo'|@translate}{/if}</span>
-      </dt>
-      <dd>
-        <form action="{$rating.F_ACTION}" method="post" id="rateForm" style="margin:0;">
-          {foreach from=$rating.marks item=mark name=rate_loop}
-            {if isset($rating.USER_RATE) && $mark==$rating.USER_RATE}
-            <input type="button" name="rate" value="{$mark}" class="rateButtonSelected" title="{$mark}">
-            {else}
-            <input type="submit" name="rate" value="{$mark}" class="rateButton" title="{$mark}">
-            {/if}
-          {/foreach}
-          {strip}{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
-            {combine_script id='rating' load='async' require='core.scripts' path='themes/default/js/rating.js'}
-            {footer_script}
-              var _pwgRatingAutoQueue = _pwgRatingAutoQueue||[];
-              _pwgRatingAutoQueue.push( {ldelim}rootUrl: '{$ROOT_URL}', image_id: {$current.id},
-                onSuccess : function(rating) {ldelim}
-                  var e = document.getElementById("updateRate");
-                  if (e) e.innerHTML = "{'Update your rating'|@translate|@escape:'javascript'}";
-                  e = document.getElementById("ratingScore");
-                  if (e) e.innerHTML = rating.score;
-                  e = document.getElementById("ratingCount");
-                  if (e) {ldelim}
-                    if (rating.count == 1) {ldelim}
-                      e.innerHTML = "({'%d rate'|@translate|@escape:'javascript'})".replace( "%d", rating.count);
-                    } else {ldelim}
-                      e.innerHTML = "({'%d rates'|@translate|@escape:'javascript'})".replace( "%d", rating.count);
-                    }
-                  {rdelim}
-              {rdelim}{rdelim} );
-            {/footer_script}
-          {/strip}
-        </form>
-      </dd>
-      {/if}
-
-      {if $display_info.privacy_level and isset($available_permission_levels)}
-      <dt id="Privacy">{'Who can see this photo?'|@translate}</dt>
-      <dd>
-        <a id="privacyLevelLink" href>{$available_permission_levels[$current.level]}</a>
-{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
-{footer_script require='jquery'}{strip}
-  function setPrivacyLevel(id, level){
-    (new PwgWS('{$ROOT_URL}')).callService(
-      "pwg.images.setPrivacyLevel", { image_id:id, level:level},
-        {
-          method: "POST",
-          onFailure: function(num, text) { alert(num + " " + text); },
-          onSuccess: function(result) {
-          jQuery('#privacyLevelBox .switchCheck').css('visibility','hidden');
-          jQuery('#switchLevel'+level).prev('.switchCheck').css('visibility','visible');
-          jQuery('#privacyLevelLink').text(jQuery('#switchLevel'+level).text());
-        }
-      }
-    );
-  }
-  (SwitchBox=window.SwitchBox||[]).push("#privacyLevelLink", "#privacyLevelBox");
-{/strip}{/footer_script}
-        <div id="privacyLevelBox" class="switchBox" style="display:none">
-          {foreach from=$available_permission_levels item=label key=level}
-            <span class="switchCheck"{if $level != $current.level} style="visibility:hidden"{/if}>&#x2714; </span>
-            <a id="switchLevel{$level}" href="javascript:setPrivacyLevel({$current.id},{$level})">{$label}</a><br>
-          {/foreach}
-        </div>
-      </dd>
-      {/if}
-    {/strip}
-    </dl>
-  </div>
-
-  {if isset($metadata)}
-  <div id="tab-exif" class="image-metadata-tab"> 
-    <dl id="Metadata" class="imageInfoTable dl-horizontal">
-    {foreach from=$metadata item=meta}
-      {foreach from=$meta.lines item=value key=label}
-        <dt>{$label}</dt>
-        <dd>{$value}</dd>
-      {/foreach}
-    {/foreach}
-    </dl>
-  </div>
-  {/if}
-
-  {if ($display_info.tags && (isset($related_tags) || ($greydragon.hasUserTags)))}
-  <div id="tab-tags" class="image-metadata-tab"> 
-    {if ($greydragon.hasUserTags)}<table id="TagsTable"><tr id="Tags" ><td class="label"></td><td class="value">{/if}
-    {foreach from=$related_tags item=tag name=tag_loop}{if !$smarty.foreach.tag_loop.first}, {/if}<a href="{$tag.URL}">{$tag.name}</a>{/foreach}
-    {if ($greydragon.hasUserTags)}</td></tr></table>{/if}
-  </div>
-  {/if}
-
-  {if isset($COMMENT_COUNT)}
-  <div id="tab-comment" class="image-metadata-tab"> 
-    <div id="comments" {if (!isset($comment_add) && ($COMMENT_COUNT == 0))}class="noCommentContent"{else}class="commentContent"{/if}>
-      <div id="pictureComments">
-        {if isset($comment_add)}
-        <div id="commentAdd">
-          <h4>{'Add a comment'|@translate}</h4>
-          <form method="post" action="{$comment_add.F_ACTION}" id="addComment">
-            {if $comment_add.SHOW_AUTHOR}
-            <p><label for="author">{'Author'|@translate}{if $comment_add.AUTHOR_MANDATORY} ({'mandatory'|@translate}){/if} :</label></p>
-            <p><input type="text" name="author" id="author" value="{$comment_add.AUTHOR}"></p>
-            {/if}
-            {if $comment_add.SHOW_EMAIL}
-            <p><label for="email">{'Email address'|@translate}{if $comment_add.EMAIL_MANDATORY} ({'mandatory'|@translate}){/if} :</label></p>
-            <p><input type="text" name="email" id="email" value="{$comment_add.EMAIL}"></p>
-            {/if}
-            <p><label for="website_url">{'Website'|@translate} :</label></p>
-            <p><input type="text" name="website_url" id="website_url" value="{$comment_add.WEBSITE_URL}"></p>
-            <p><label for="contentid">{'Comment'|@translate} ({'mandatory'|@translate}) :</label></p>
-            <p><textarea name="content" id="contentid" rows="5" cols="50">{$comment_add.CONTENT}</textarea></p>
-            <p><input type="hidden" name="key" value="{$comment_add.KEY}">
-            <input type="submit" value="{'Submit'|@translate}"></p>
-          </form>
-        </div>
-        {else}
-          {if ($COMMENT_COUNT == 0)}<p>{'No Comments Allowed'|@translate}</p>{/if}
-        {/if}
-        {if isset($comments)}
-        <div id="pictureCommentList">
-          {if (($COMMENT_COUNT > 2) || !empty($navbar))}
-          <div id="pictureCommentNavBar">
-            {if $COMMENT_COUNT > 2}
-            <a href="{$COMMENTS_ORDER_URL}#comments" rel="nofollow" class="commentsOrder">{$COMMENTS_ORDER_TITLE}</a>
-            {/if}
-            {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
-          </div>
-          {/if}
-          {include file='comment_list.tpl'}
-        </div>
-        {/if}
-      </div>
-    </div>
-  </div> 
-  {/if}
-
-  {if isset($ppppp_e_mail)}
-  <div id="tab-cart" class="image-metadata-tab">
-    {if isset($COMMENT_IMG)}
-    {/if}
-  </div>
-  {/if}
+  {include file='picture_tab_content.tpl'}
+  {*GD_META_CONTENT*}
 </div>
 {/if}
 </div>
+{* if isset($greydragon.image_preload)}
+<div id="image_urls" style="display:none;">
+  {foreach from=$U_IMGNEXT item=u_img key=id}
+    {if isset($u_img)}<div class="next{$id} preload">{$u_img}</div>{/if}
+  {/foreach}
+</div>
+{ /if *}
+
 {if !empty($PLUGIN_PICTURE_AFTER)}{$PLUGIN_PICTURE_AFTER}{/if}

extensions/greydragon/themeconf.inc.php

@@ -2 +2 @@
 /*
 Theme Name: GreyDragon
-Version: 1.1.21
+Version: 1.2.22
 Description: GreyDragon Theme
 Theme URI: http://piwigo.org/ext/extension_view.php?eid=775
@@ -11 +11 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-require_once( PHPWG_THEMES_PATH . 'greydragon/include/greydragon.class.php');
-require_once( PHPWG_THEMES_PATH . 'greydragon/admin/upgrade.inc.php');
+define('GDTHEME_ID',   basename(dirname(__FILE__)));
+if (!defined('GDTHEME_PATH')):
+  define('GDTHEME_PATH', PHPWG_THEMES_PATH . GDTHEME_ID . '/');
+endif;
+require_once( GDTHEME_PATH . 'include/greydragon.class.php');
+require_once( GDTHEME_PATH . 'admin/upgrade.inc.php');
 
 $themeCore = greyDragonCore::Instance(GDTHEME_VERSION);
@@ -29 +33 @@
 
   $themeCore = greyDragonCore::Instance();
+
   if ($themeCore->hasCustomFavicon() || $themeCore->hasOption("p_header") || $themeCore->hasOption('page_banner', TRUE)):
     add_event_handler('render_page_banner', 'greydragon_render_header');
   endif;
   if ($themeCore->getOption("p_nocounter") == "on"):
-    add_event_handler('loc_end_index', 'no_breadcrumb_counter');
+    add_event_handler('loc_end_index', 'greydragon_nobreadcrumb_counter');
   endif;
   if ($themeCore->getOption("p_pict_tab_exif") == "off"):
@@ -42 +47 @@
 
   $template->assign('greydragon', $themeCore->getConfig());
+
+  // Allow dynamic addition of metadata tabs content
+  add_event_handler('loc_begin_picture', 'greydragon_picture_handler');
+
+}
+
+function greydragon_picture_handler() {
+  global $template;
+
+  $template->set_prefilter('picture', 'greydragon_prepare_meta');
+}
+
+function greydragon_prepare_meta($tpl_source, &$smarty) {
+  // metadata array
+  // each tab represented by respected sub array
+  // sub array need to include 
+  //   "id"         = unique id of the tab
+  //   "icon_class" = class to be used to render icon tabs
+  //   "title"      = tab or menu block title
+  //   "content"    = block content
+  //   "target"     = optional, rendering target - "left", "top", "right", "bottom", not supported, reserved for future use
+  //   "combine"    = combine_css or combine_js reference block
+  //
+  // prior to rendering, each element would be processed and converted into tab content in picture.tpl
+
+  $metadata = array();
+  $metadata = trigger_change('gd_get_metadata', $metadata);
+
+  $meta_icon = "";
+  $meta_text = "";
+  $meta_content = "";
+
+  foreach ($metadata as $item):
+
+    $id            = $item["id"];
+    $icon_class    = $item["icon_class"];
+    $title         = $item["title"];
+    $block_content = $item["content"];
+    $combine       = $item["combine"];
+    $no_overlay    = $item["no_overlay"];
+
+    if ($no_overlay):
+      $meta_icon .= '<li class="ico-btn btn-' . $id . '">' . $block_content . '</li>';
+    else:
+      $meta_icon .= '<li class="meta-' . $id . '{if $ico_mode=="on"} ' . $icon_class . '{/if}{if $def_tab == "' . $id . '"} active{/if}" >{if $ico_mode=="off"}' . $title . '{/if}</li>';
+    endif;
+
+    $meta_text .= '<li class="{if $ico_mode=="on"}' . $icon_class . '{/if}{if $def_tab == "' . $id . '"} active{/if}" rel="tab-' . $id . '">{if $ico_mode=="off"}' . $title . '{/if}</li>';
+    if (isset($combine)):
+      $meta_content .= '{strip}' . $combine . '{strip}';
+    endif;
+    $meta_content .= '<div id="tab-' . $id . '" class="image-metadata-tab">' . $block_content . '</div>';
+  endforeach;
+
+  $content  = $tpl_source;
+  if ($meta_icon):
+    $pattern  = '#{\*GD_META_ICO\*}#';
+    $replace  = $meta_icon . "{*GD_META_ICO*}";
+    $content  = preg_replace($pattern, $replace, $content, 1);
+  endif;
+  if ($meta_text):
+    $pattern  = '#{\*GD_META_TXT\*}#';
+    $replace  = $meta_text . "{*GD_META_TXT*}";
+    $content  = preg_replace($pattern, $replace, $content, 1);
+  endif;
+  if ($meta_content):
+    $pattern  = '#{\*GD_META_CONTENT\*}#';
+    $replace  = $meta_content . "{*GD_META_CONTENT*}";
+    $content  = preg_replace($pattern, $replace, $content, 1);
+  endif;
+  return $content;
 }
 
@@ -49 +125 @@
 }
 
-function no_breadcrumb_counter() {
+function greydragon_nobreadcrumb_counter() {
   global $template;