Changeset 30485

Timestamp:

Nov 14, 2014, 5:30:23 AM (9 years ago)

Author:

SergeD

Message:

version 1.0.13 - please refer to changelog for details

Location:

extensions/GDThumb

Files:

• admin.php (modified) (3 diffs)
• changelog.php (added)
• changelog.txt (modified) (1 diff)
• css/admin.css (modified) (1 diff)
• main.inc.php (modified) (3 diffs)
• template/admin.tpl (modified) (3 diffs)
• template/gdthumb_thumb.tpl (modified) (2 diffs)

extensions/GDThumb/admin.php

@@ -86 +86 @@
     $method = $_POST['method'];
   endif;
+  if (empty($_POST['normalize_title'])):
+    $normalize = "off";
+  else:
+    $normalize = $_POST['normalize_title'];
+  endif;
 
   $big_thumb = !empty($_POST['big_thumb']);
@@ -95 +100 @@
     'big_thumb_noinpw'=> !empty($_POST['big_thumb_noinpw']),
     'cache_big_thumb' => !empty($_POST['cache_big_thumb']),
-    'normalize_title' => !empty($_POST['normalize_title']),
+    'normalize_title' => $normalize,
     'method'          => $method,
     'thumb_mode_album'=> $_POST['thumb_mode_album'],
@@ -142 +147 @@
 if (!isset($params['normalize_title'])):
   $params['normalize_title'] = "off";
+elseif ($params['normalize_title'] == "1"):
+  $params['normalize_title'] = "on";
 endif;
 

extensions/GDThumb/changelog.txt

@@ -26 +26 @@
 
 === Changelog ===
+version 1.0.13
++ ADMIN: Added ChangeLog link in toolbar
++ ADMIN: New option for Normalize Photo Title
+
 version 1.0.12
 + ADMIN: New thumb mode: Overlay Ex (only available with GD theme)

extensions/GDThumb/css/admin.css

@@ -14 +14 @@
 .content label { display: inline-block; }
 
+.titrePage .left-links li       { line-height: 2em !important; }
 .titrePage .left-links.no-gd    { float: right; }
 .titrePage .left-links.no-gd ul { margin-top: 0; margin-bottom: 0; padding-right: 0.7em; }

extensions/GDThumb/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: gdThumb
-Version: 1.0.12
+Version: 1.0.13
 Description: Display thumbnails as patchwork
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=771
@@ -19 +19 @@
 // | Plugin constants                                               |
 // +-----------------------------------------------------------------------+
-define('GDTHUMB_VERSION', '1.0.12');
+define('GDTHUMB_VERSION', '1.0.13');
 define('GDTHUMB_ID',      basename(dirname(__FILE__)));
 define('GDTHEME_PATH' ,   PHPWG_THEMES_PATH . 'greydragon/');
@@ -70 +70 @@
   $confTemp['GDTHUMB_ROOT'] = 'plugins/' . GDTHUMB_ID;
   $confTemp['big_thumb_noinpw'] = (isset($confTemp['big_thumb_noinpw']) && ($confTemp['big_thumb_noinpw']))? 1 : 0;
+  if ($confTemp['normalize_title'] == "1"):
+    $confTemp['normalize_title'] = "on";
+  endif;    
 
   $template->set_filename( 'index_thumbnails', dirname(__FILE__) . '/template/gdthumb_thumb.tpl');

extensions/GDThumb/template/admin.tpl

@@ -3 +3 @@
   <div class="left-links{if $CUSTOM_CSS!=="yes"} no-gd{/if}">
     <ul><li><a href="http://blog.dragonsoft.us/piwigo/" target="_blank">{'Home'|@translate}</a>&nbsp;|&nbsp;</li>
+      {if $CUSTOM_CSS=="yes"}
+      <li><a class="ajax cboxElement" href="{$GDTHUMB_PATH|cat:"/changelog.php"}?version={$GDTHUMB_VERSION}">{'Changelog'|@translate}</a>&nbsp;|&nbsp;</li>
+      {/if}
       <li><a href="http://piwigo.org/forum/viewtopic.php?id=24413" target="_blank">{'Support'|@translate}</a>&nbsp;|&nbsp;</li>
       <li><a title="Follow me on Twitter" href="http://twitter.com/greydragon_th" target="_blank">{'Follow'|@translate}</a>&nbsp;|&nbsp;</li>
@@ -28 +31 @@
     <li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<label><span class="graphicalCheckbox {if $BIG_THUMB_NOINPW}icon-check{else}icon-check-empty{/if}">&nbsp;</span><input name="big_thumb_noinpw" id="big_thumb_noinpw" type="checkbox" value="1" {if $BIG_THUMB_NOINPW}checked="checked"{/if}>{'Block for Panoramic Photo Page'|@translate} (x2.2+)</label></li>
     <li><label><span class="graphicalCheckbox {if $CACHE_BIG_THUMB}icon-check{else}icon-check-empty{/if}">&nbsp;</span><input name="cache_big_thumb" id="cache_big_thumb" type="checkbox" value="1" {if $CACHE_BIG_THUMB}checked="checked"{/if}>{'Cache the big thumbnails (recommended)'|@translate}</label></li>
-    <li><label><span class="graphicalCheckbox {if $NORMALIZE_TITLE}icon-check{else}icon-check-empty{/if}">&nbsp;</span><input name="normalize_title" id="normalize_title" type="checkbox" value="1" {if $NORMALIZE_TITLE}checked="checked"{/if}>{'Normalize Photo Title'|@translate}</label></li>
+    <li>
+      <select id="normalize_title" name="normalize_title" >
+        <option {if $NORMALIZE_TITLE == 'off'}selected="selected"{/if} value="off">{'Do not Normalize (Default)'|@translate}</option>
+        <option {if $NORMALIZE_TITLE == 'on'}selected="selected"{/if} value="on">{'Photo # if FileName Detected'|@translate}</option>
+        <option {if $NORMALIZE_TITLE == 'desc'}selected="selected"{/if} value="desc">{'Use Description if Set'|@translate}</option>
+      </select>
+      <label for="normalize_title">{'Normalize Photo Title'|@translate}</label>
+    </li>
     <li><label><span class="graphicalCheckbox {if $NO_WORDWRAP}icon-check{else}icon-check-empty{/if}">&nbsp;</span><input name="no_wordwrap" id="no_wordwrap" type="checkbox" value="1" {if $NO_WORDWRAP}checked="checked"{/if}>{'Prevent word wrap'|@translate}</label></li>
     <li>
@@ -110 +120 @@
 
 {if $CUSTOM_CSS=="yes"}
+  {combine_css path="themes/default/js/plugins/colorbox/style2/colorbox.css"}
   {combine_css path=$GDTHEME_PATH|cat:"admin/css/styles.css"}
+  {combine_script id='jquery.colorbox' load='footer' require='jquery' path='themes/default/js/plugins/jquery.colorbox.min.js' }
   {combine_script id='greydragon.admin' load='footer' require='jquery,jquery.ui.button.js' path=$GDTHEME_PATH|cat:"admin/js/admin.js" }
 {else}

extensions/GDThumb/template/gdthumb_thumb.tpl

@@ -7 +7 @@
   <span class="thumbLegend {$GDThumb.thumb_mode_photo}">
     <span class="thumbName thumbTitle">
-    {if $GDThumb.normalize_title == "on"}
+    {if $GDThumb.normalize_title == "desc" && $thumbnail.DESCRIPTION}
+      {$thumbnail.DESCRIPTION}
+    {elseif $GDThumb.normalize_title == "off"}
+      {$thumbnail.NAME}
+    {else}
       {assign var="file_title" value=$thumbnail.NAME|cat:"."}
       {assign var="file_name" value=$thumbnail.file|replace:"_":" "}
@@ -15 +19 @@
       {$thumbnail.NAME}
       {/if}
-    {else}
-      {$thumbnail.NAME}
     {/if}
       {if !empty($thumbnail.icon_ts)}