Changeset 32472

Timestamp:

Mar 4, 2021, 10:43:07 PM (3 years ago)

Author:

SergeD

Message:

Version 1.3.5 - see changelog for details

Location:

extensions/greydragon

Files:

• admin/admin.inc.php (modified) (1 diff)
• admin/admin.tpl (modified) (2 diffs)
• admin/css/styles.css (modified) (1 diff)
• changelog.txt (modified) (1 diff)
• css/styles.css (modified) (1 diff)
• include/greydragon.class.php (modified) (1 diff)
• template/picture_tab_content.tpl (modified) (1 diff)
• template/picture_tab_ico.tpl (modified) (1 diff)
• template/picture_tab_txt.tpl (modified) (1 diff)
• themeconf.inc.php (modified) (1 diff)

extensions/greydragon/admin/admin.inc.php

@@ -44 +44 @@
 endif;
 
-$template->set_filenames(array('theme_admin_content' => dirname(__FILE__) . '/admin.tpl'));
-
-foreach ($template->smarty->tpl_vars['plugin_menu_items']->value as $key => $value):
-  if ($value["NAME"] == "Additional Pages"):
-    $themeCore->setSetting("hasAP", "yes");
-  endif;
-  if ($value["NAME"] == "Extended Description"):
-    $themeCore->setSetting("hasED", "yes");
-  endif;
-  if ($value["NAME"] == "gdThumb"):
-    $themeCore->setSetting("hasGT", "yes");
-  endif;
-  if ($value["NAME"] == "Admin Tools"):
-    $themeCore->setSetting("hasAT", "yes");
-  endif;
-endforeach;
-
 $themeCore->setSetting("pwgVer", PHPWG_VERSION);
 $ver_parts = explode('.', PHPWG_VERSION);
 $ver_int = intval($ver_parts[0]) * 100 + intval($ver_parts[1]);
 
+
 if ($ver_int > 207):
   $themeCore->setSetting("hasMinVer", "yes");
+endif;
+
+$template->set_filenames(array('theme_admin_content' => dirname(__FILE__) . '/admin.tpl'));
+
+if ($ver_int > 1100):
+        global $pwg_loaded_plugins;
+
+  if (isset($pwg_loaded_plugins['AdditionalPages'])):
+    $themeCore->setSetting("hasAP", "yes");
+  endif;
+  if (isset($pwg_loaded_plugins['ExtendedDescription'])):
+    $themeCore->setSetting("hasED", "yes");
+  endif;
+  if (isset($pwg_loaded_plugins['GDThumb'])):
+    $themeCore->setSetting("hasGT", "yes");
+  endif;
+  if (isset($pwg_loaded_plugins['AdminTools'])):
+    $themeCore->setSetting("hasAT", "yes");
+  endif;
+else:
+        if (array_key_exists('plugin_menu_items', $template->smarty->tpl_vars)):
+                foreach ($template->smarty->tpl_vars['plugin_menu_items']->value as $key => $value):
+                  if ($value["NAME"] == "Additional Pages"):
+                    $themeCore->setSetting("hasAP", "yes");
+                  endif;
+                  if ($value["NAME"] == "Extended Description"):
+                    $themeCore->setSetting("hasED", "yes");
+                  endif;
+                  if ($value["NAME"] == "gdThumb"):
+                    $themeCore->setSetting("hasGT", "yes");
+                  endif;
+                  if ($value["NAME"] == "Admin Tools"):
+                    $themeCore->setSetting("hasAT", "yes");
+                  endif;
+                endforeach;
+        endif;
 endif;
 

extensions/greydragon/admin/admin.tpl

@@ -51 +51 @@
       <li>
         <label>
-          <i class="gd-checkbox fas {if $options.hasGT=="yes"}fa-check-square success{else}fa-square error{/if}"></i>&nbsp;
+          <i class="gd-checkbox fas {if $options.hasGT=="yes"}fa-check-square success{else}fa-ban error{/if}"></i>&nbsp;
           <input name="vercheck" disabled="1" type="checkbox" checked="checked" value="1"><a href="http://piwigo.org/ext/extension_view.php?eid=771" target=_blank>{'gdThumb'|@translate}</a> {'Installed'|@translate}
         </label>
@@ -57 +57 @@
       <li>
         <label>
-          <i class="gd-checkbox fas {if $options.hasAT=="yes"}fa-check-square success{else}fa-square error{/if}"></i>&nbsp;
+          <i class="gd-checkbox fas {if $options.hasAT=="yes"}fa-check-square success{else}fa-ban error{/if}"></i>&nbsp;
           <input name="vercheck" disabled="1" type="checkbox" checked="checked" value="1"><a href="http://piwigo.org/ext/extension_view.php?eid=720" target=_blank>{'Admin Tools'|@translate}</a> {'Installed'|@translate}
         </label>

extensions/greydragon/admin/css/styles.css

@@ -40 +40 @@
 
 .content fieldset { position: relative; overflow: hidden; padding: 0 1em 0 1em; background: #FFF; }
-.content legend   { position: absolute; left: 0px; width: 100%; padding: 0.4em 0.8em; background: #D5E6F2; }
+.content legend   { position: absolute; left: 0px; width: 100%; padding: 0.4em 0.8em; background: #D5E6F2; margin-top: 0; }
 
-.content fieldset ul { margin-top: 34px; padding-left: 0; }
+.content fieldset ul { margin-top: 3.5em; padding-left: 0; }
 
 .content fieldset, #configContent fieldset, #configContent fieldset:not(.no-border) { border: 1px solid #ccc; }

extensions/greydragon/changelog.txt

@@ -18 +18 @@
 
 === Changelog ===
+version 1.3.5
++ Verified compatability with PIWIGO 11.x
++ Translation files synced from repo
+- Fix misalignment of admin section header for PW 11+
+- Fix issue with plugin detection
+
+version 1.3.4
+- Fix issue with incorrest styling when "hide counter" is requested in PIWIGO 2.10.x+
+
 version 1.3.3
 + Verified for PHP 7.3

extensions/greydragon/css/styles.css

@@ -111 +111 @@
 #menubar #menuTagCloud { font-size: 92%; text-align: left; }
 #menubar #mbCategories li { margin-right: 0.3em; }
-.no-b-counter #menubar #mbCategories .menuInfoCatByChild, .no-b-counter #menubar #mbCategories .menuInfoCat, .no-b-counter #menubar #mbCategories .totalImages { display: none; }
+.no-b-counter #menubar #mbCategories .menuInfoCatByChild, .no-b-counter #menubar #mbCategories .menuInfoCat, .no-b-counter #menubar #mbCategories .totalImages, .no-b-counter #content .badge { display: none; }
 
 /* Menu Styles */

extensions/greydragon/include/greydragon.class.php

@@ -3 +3 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-define('GDTHEME_VERSION', '1.3.3');
+define('GDTHEME_VERSION', '1.3.5');
 
 define("QUOTES_NONE",   FALSE);

extensions/greydragon/template/picture_tab_content.tpl

@@ -142 +142 @@
   {/if}
 
+  {if isset($OSMJS)}
+  <div id="tab-map" class="image-metadata-tab">
+    <dt {$OSMNAMECSS}>{$OSMNAME}</dt>
+    <dd>
+      <div id="map"></div>
+      <script type="text/javascript">{$OSMJS}</script>
+      <div id="osm_attrib" style="visibility: hidden; display: none;">
+        <ul>
+          <li>{"PLUGIN_BY"|@translate}</li>
+          <li><a href="http://leafletjs.com/" target="_blank">Leaflet</a></li>
+          <li>&copy; {"OSM_CONTRIBUTORS"|@translate}</li>
+        </ul>
+      </div>
+      {if $SHOWOSM}
+      <a href="{$OSMLINK}" target="_blank">{"VIEW_OSM"|@translate}</a>
+      {/if}
+    </dd>
+  </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)}<div class="tags-edit-marker"><span class="fas fa-edit"></span> {'Edit'|@translate}</div></td></tr></table>{/if}
+    {if ($greydragon.hasUserTags)}<span class="tags-edit-marker"><span class="fas fa-edit"></span> {'Edit'|@translate}</span></td></tr></table>{/if}
   </div>
   {/if}

extensions/greydragon/template/picture_tab_ico.tpl

@@ -2 +2 @@
   <li class="meta-info {if $ico_mode=="on"} fas fa-info-circle{/if}{if $def_tab == "info"} active{/if}"{if $ico_mode=="on"} title="{"Info"|@translate}"{/if}>{if $ico_mode=="off"}{"Info"|@translate}{/if}</li>
   {if isset($metadata)}<li class="meta-exif{if $ico_mode=="on"} fas fa-camera{/if}{if $def_tab == "exif"} active{/if}"{if $ico_mode=="on"} title="{"Exif"|@translate}"{/if}>{if $ico_mode=="off"}{"Exif"|@translate}{/if}</li>{/if}
+<!--  {if isset($OSMJS)}<li class="meta-map{if $ico_mode=="on"} fas fa-map-marked{/if}{if $def_tab == "map"} active{/if}"{if $ico_mode=="on"} title="{"Map"|@translate}"{/if}>{if $ico_mode=="off"}{"Map"|@translate}{/if}</li>{/if}
+-->
   {if ($display_info.tags && (isset($related_tags) || ($greydragon.hasUserTags)))}<li class="meta-tags{if $ico_mode=="on"} fas fa-tags{/if}{if $def_tab == "tags"} active{/if}"{if $ico_mode=="on"} title="{"Tags"|@translate}"{/if}>{if $ico_mode=="off"}{"Tags"|@translate}{/if}</li>{/if}
   {if isset($COMMENT_COUNT)}<li class="meta-comment{if $ico_mode=="on"} fas fa-comment{/if}{if $def_tab == "comments"} active{/if}"{if $ico_mode=="on"} title="{"Comments"|@translate}"{/if}>{if $ico_mode=="off"}{$COMMENT_COUNT|@translate_dec:'%d comment':'%d comments'}{else}&nbsp;{$COMMENT_COUNT}{/if}</li>{/if}

extensions/greydragon/template/picture_tab_txt.tpl

@@ -2 +2 @@
   <li class="{if $ico_mode=="on"}fas fa-info-circle{/if}{if $def_tab == "info"} active{/if}" rel="tab-meta"{if $ico_mode=="on"} title="{"Info"|@translate}"{/if}>{if $ico_mode=="off"}{"Info"|@translate}{/if}</li>
   {if isset($metadata)}<li class="{if $ico_mode=="on"}fas fa-camera{/if}{if $def_tab == "exif"} active{/if}" rel="tab-exif"{if $ico_mode=="on"} title="{"Exif"|@translate}"{/if}>{if $ico_mode=="off"}{"Exif"|@translate}{/if}</li>{/if}
+<!--  {if isset($OSMJS)}<li class="{if $ico_mode=="on"}fas fa-map-marked{/if}{if $def_tab == "map"} active{/if}" rel="tab-map"{if $ico_mode=="on"} title="{"Map"|@translate}"{/if}>{if $ico_mode=="off"}{"Map"|@translate}{/if}</li>{/if}
+-->
   {if ($display_info.tags && (isset($related_tags) || ($greydragon.hasUserTags)))}<li class="{if $ico_mode=="on"}fas fa-tags{/if}{if $def_tab == "tags"} active{/if}" rel="tab-tags"{if $ico_mode=="on"} title="{"Tags"|@translate}"{/if}>{if $ico_mode=="off"}{"Tags"|@translate}{/if}</li>{/if}
   {if isset($COMMENT_COUNT)}<li class="{if $ico_mode=="on"}fas fa-comment{/if}{if $def_tab == "comments"} active{/if}" rel="tab-comment"{if $ico_mode=="on"} title="{"Comments"|@translate}"{/if}>{if $ico_mode=="off"}{$COMMENT_COUNT|@translate_dec:'%d comment':'%d comments'}{else}&nbsp;{$COMMENT_COUNT}{/if}</li>{/if}

extensions/greydragon/themeconf.inc.php

@@ -2 +2 @@
 /*
 Theme Name: GreyDragon
-Version: 1.3.3
+Version: 1.3.5
 Description: GreyDragon Theme
 Theme URI: http://piwigo.org/ext/extension_view.php?eid=775