Changeset 31060

Timestamp:

Mar 26, 2015, 1:07:18 AM (9 years ago)

Author:

SergeD

Message:

version 1.0.15 - refer to changelog for more details

Location:

extensions/GDThumb

Files:

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

extensions/GDThumb/admin.php

@@ -94 +94 @@
   $big_thumb = !empty($_POST['big_thumb']);
   $params  = array(
-    'height'          => $_POST['height'],
-    'margin'          => $_POST['margin'],
-    'nb_image_page'   => $_POST['nb_image_page'],
-    'big_thumb'       => $big_thumb,
-    'big_thumb_noinpw'=> !empty($_POST['big_thumb_noinpw']),
-    'cache_big_thumb' => !empty($_POST['cache_big_thumb']),
-    'normalize_title' => $normalize,
-    'method'          => $method,
-    'thumb_mode_album'=> $_POST['thumb_mode_album'],
-    'thumb_mode_photo'=> $_POST['thumb_mode_photo'],
-    'thumb_metamode'  => $_POST['thumb_metamode'],
-    'no_wordwrap'     => !empty($_POST['no_wordwrap'])
+      'height'          => $_POST['height']
+    , 'margin'          => $_POST['margin']
+    , 'nb_image_page'   => $_POST['nb_image_page']
+    , 'big_thumb'       => $big_thumb
+    , 'big_thumb_noinpw'=> !empty($_POST['big_thumb_noinpw'])
+    , 'cache_big_thumb' => !empty($_POST['cache_big_thumb'])
+    , 'normalize_title' => $normalize
+    , 'method'          => $method
+    , 'thumb_mode_album'=> $_POST['thumb_mode_album']
+    , 'thumb_mode_photo'=> $_POST['thumb_mode_photo']
+    , 'thumb_metamode'  => $_POST['thumb_metamode']
+    , 'no_wordwrap'     => !empty($_POST['no_wordwrap'])
+    , 'thumb_animate'   => !empty($_POST['thumb_animate'])
   );
 
@@ -158 +159 @@
     'GDTHUMB_VERSION'  => GDTHUMB_VERSION,
     'PHPWG_ROOT_PATH'  => PHPWG_ROOT_PATH,
+
     'HEIGHT'           => $params['height'],
     'MARGIN'           => $params['margin'],
@@ -170 +172 @@
     'THUMB_METAMODE'   => $params['thumb_metamode'],
     'NO_WORDWRAP'      => isset($params['no_wordwrap']) && $params['no_wordwrap'],
+    'THUMB_ANIMATE'    => isset($params['thumb_animate']) && $params['thumb_animate'],
+
     'PWG_TOKEN'        => get_pwg_token(),
     'CUSTOM_CSS'       => $custom_css

extensions/GDThumb/changelog.txt

@@ -26 +26 @@
 
 === Changelog ===
+version 1.0.16
++ ADMIN: Added new option  "Animate thumbnail on hover"
++ Added event integration with RV Thumb Scroller
++ Corrected PayPal link for "Donate" link in admin area
+- Remove reference to jquery.ui.button.js in admin page
+- Added check for shared system variables to prevent conflict with other GD plugins and themes
+
 version 1.0.15
 + In Overlay Ex mode place "New Item" marker is placed in metadata area

extensions/GDThumb/css/gdthumb.css

@@ -5 +5 @@
 
 ul.thumbnails .gdthumb a img.thumbnail, ul.thumbnails .gdthumb a img.thumbnail:hover { border: 0 none; margin: 0; padding: 0; top: 0; border-radius: 0; }
+
+ul.thumbnails .gdthumb.animate img { -webkit-transition: 700ms; -moz-transition: 700ms; -o-transition: 700ms; transition: 700ms; }
+ul.thumbnails .gdthumb.animate:hover img { transform: scale(1.5,1.5) rotate(10deg); -ms-transform: scale(1.5,1.5) rotate(10deg); -webkit-transform: scale(1.5,1.5) rotate(10deg); -o-transform: scale(1.5,1.5) rotate(10deg); -moz-transform: scale(1.5,1.5) rotate(10deg); }
 
 ul.thumbnails .gdthumb .thumbLegend    { position: absolute; z-index: 1; height: 5em; left:0; right:0; padding:5px 0; width:100%; background:rgba(0,0,0,0.7); text-align:center; overflow:hidden; color:#aaa; padding-left: 4px; padding-right: 4px; }
@@ -36 +39 @@
 ul.thumbnails .gdthumb .thumbLegend.overlay-ex       { visibility: hidden;  top: 0; bottom: 0; height: auto; opacity: 0; cursor: pointer; padding: 0; background-color: rgba(6, 6, 6, 0.8); }
 ul.thumbnails .gdthumb:hover .thumbLegend.overlay-ex { visibility: visible; opacity: 1; transition: opacity 200ms linear; -o-transition: opacity 200ms linear; -ms-transition: opacity 200ms linear; -moz-transition: opacity 200ms linear; -webkit-transition: opacity 200ms linear; }
+
 ul.thumbnails .gdthumb .thumbLegend.overlay-ex .thumbName  { position: absolute; bottom: 0px; width: 100%; text-align: left; top: 0; }
 ul.thumbnails .gdthumb .thumbLegend.overlay-ex .thumbTitle { position: absolute; left: 10px; right: 10px; top: 10px;font-size: 1.2em; text-transform: uppercase; }
@@ -43 +47 @@
 ul.thumbnails .gdthumb .overlay-ex.thumbLegend .thumbInfo .hit-num   { background-color: #036FE5; min-width: 15px; height: 16px; display: block; color: #fff; float: left; line-height: 16px; padding: 1px; padding-top: 0px; padding-right: 4px; padding-left: 4px; margin-top: 4px; margin-right: 6px; font-size: 10px; text-align: center; }
 ul.thumbnails .gdthumb .overlay-ex.thumbLegend .thumbInfo .rank-num  { float: right; margin-top: 2px; vertical-align: middle; height: 20px; line-height: 20px; }
-
 ul.thumbnails .gdthumb .overlay-ex.thumbLegend .thumbInfo .glyphicon { padding-top: 3px; font-size: 17px; }
 
+
 ul.thumbnails.nowrap .gdthumb .thumbLegend { white-space: nowrap; overflow: hidden; height: auto; }

extensions/GDThumb/js/gdthumb.js

@@ -10 +10 @@
   method: 'crop',
   t: new Array,
+  do_merge: false,
 
   // Initialize plugin logic, perform necessary steps
@@ -20 +21 @@
     GDThumb.method     = method;
     GDThumb.check_pv   = check_pv;
-
-    if (do_merge) { GDThumb.merge(); }
-
-    GDThumb.big_thumb = big_thumb;
+    GDThumb.do_merge   = do_merge;
+    GDThumb.big_thumb  = big_thumb;
+
+    $(window).bind("RVTS_loaded", function() { GDThumb.init(); });
+    GDThumb.init();
+  },
+
+  init: function() {
+    if (GDThumb.do_merge) { GDThumb.merge(); }
+
     GDThumb.build();
     jQuery(window).bind('RVTS_loaded', GDThumb.build);

extensions/GDThumb/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: gdThumb
-Version: 1.0.15
+Version: 1.0.16
 Description: Apply Masonry style to album or image thumbs
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=771
@@ -19 +19 @@
 // | Plugin constants                                               |
 // +-----------------------------------------------------------------------+
-define('GDTHUMB_VERSION', '1.0.15');
+define('GDTHUMB_VERSION', '1.0.16');
 define('GDTHUMB_ID',      basename(dirname(__FILE__)));
-define('GDTHEME_PATH' ,   PHPWG_THEMES_PATH . 'greydragon/');
 define('GDTHUMB_PATH' ,   PHPWG_PLUGINS_PATH . GDTHUMB_ID . '/');
+if (!defined('GDTHEME_PATH')):
+  define('GDTHEME_PATH' ,   PHPWG_THEMES_PATH . 'greydragon/');
+endif;
 
 if (!isset($conf['gdThumb'])):

extensions/GDThumb/template/admin.tpl

@@ -8 +8 @@
       <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>
-      <li><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=9MWBSVJMWMJEU" target="_blank">{'Coffee Fund'|@translate}</a>&nbsp;|&nbsp;</li>
+      <li><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=GYVNZCNDMSD58" target="_blank">{'Coffee Fund'|@translate}</a>&nbsp;|&nbsp;</li>
       <li><a href="http://piwigo.org/ext/extension_view.php?eid=771" onclick="return false" target="_blank">{'Download'|@translate}</a></li>
     </ul>
@@ -84 +84 @@
       <label for="thumb_metamode">{'Metadata Display Mode'|@translate}</label>
     </li>
+    <li><label><span class="graphicalCheckbox {if $THUMB_ANIMATE}icon-check{else}icon-check-empty{/if}">&nbsp;</span><input name="thumb_animate" id="thumb_animate" type="checkbox" value="1" {if $THUMB_ANIMATE}checked="checked"{/if}>{'Animate thumbnail on hover'|@translate}</label></li>
   </ul>
 </fieldset>
@@ -123 +124 @@
   {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" }
+  {combine_script id='greydragon.admin' load='footer' require='jquery' path=$GDTHEME_PATH|cat:"admin/js/admin.js" }
 {else}
 {html_head}{literal}

extensions/GDThumb/template/gdthumb_cat.tpl

@@ -10 +10 @@
 {combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'}
 {/if}
-  <li class="gdthumb">
+  <li class="gdthumb{if $GDThumb.thumb_animate} animate{/if}">
     {if $GDThumb.thumb_mode_album !== "hide" }
     <span class="thumbLegend {$GDThumb.thumb_mode_album}">

extensions/GDThumb/template/gdthumb_thumb.tpl

@@ -6 +6 @@
 {assign var=derivative value=$pwg->derivative($GDThumb_derivative_params, $thumbnail.src_image)}
 {assign var=media_type value={media_type file=$thumbnail.file}}
+{assign var=media_type_name value={$media_type|capitalize:false:true}}
 
-<li class="gdthumb">
+<li class="gdthumb{if $GDThumb.thumb_animate} animate{/if}">
   {if $GDThumb.thumb_mode_photo !== "hide" }
   <span class="thumbLegend {$GDThumb.thumb_mode_photo}">
@@ -19 +20 @@
       {assign var="file_name" value=$thumbnail.file|replace:"_":" "}
       {if $file_name|strstr:$file_title}
-      Photo {$thumbnail.id}
+      {$media_type_name|@translate} {$thumbnail.id}
       {else}
       {$thumbnail.NAME}
@@ -38 +39 @@
         {/if}
         {if $thumbnail.rating_score > 0}
-        <span class="rank-num glyphicon glyphicon-star">{$thumbnail.rating_score|string_format:"%d"}</span>
+        <span class="rank-num"><i class="glyphicon glyphicon-star"></i>{$thumbnail.rating_score|string_format:"%d"}</span>
         {/if}
       </span>