Changeset 17962

Timestamp:

Sep 16, 2012, 11:34:26 PM (12 years ago)

Author:

Zaphod

Message:

version 1.4.2

Location:

extensions/stripped-galleria

Files:

• readme.txt (modified) (1 diff)
• template/thumbnails.tpl (modified) (2 diffs)
• themeconf.inc.php (modified) (1 diff)

extensions/stripped-galleria/readme.txt

@@ -13 +13 @@
 Changelog
 ---------
+
+*** version 1.4.2
+- download link is available again
+- stripped size options are taken into account
 
 *** version 1.4.1

extensions/stripped-galleria/template/thumbnails.tpl

@@ -16 +16 @@
         var data = [
                 {/literal}{foreach from=$thumbnails item=thumbnail name=thumb}
-                {assign var=derivative value=$pwg->derivative($derivative_params, $thumbnail.src_image)}
-                {assign var=my value=$pwg->derivative('xlarge', $thumbnail.src_image)}{literal}
+                {assign var=d_thumb value=$pwg->derivative($stripped.thumbSize, $thumbnail.src_image)}
+                {assign var=d_image value=$pwg->derivative($stripped.imageSize, $thumbnail.src_image)}
+                {if ($stripped.hdSize == 'original')}
+                        {assign var=d_hd value=$thumbnail.src_image}
+                {else}
+                        {assign var=d_hd value=$pwg->derivative($stripped.hdSize, $thumbnail.src_image)}
+                {/if}
+                {literal}
                 {
-                        thumb: '{/literal}{$derivative->get_url()}{literal}',
-                        image: '{/literal}{$my->get_url()}{literal}',
+                        thumb: '{/literal}{$d_thumb->get_url()}{literal}',
+                        image: '{/literal}{$d_image->get_url()}{literal}',
+                        big: '{/literal}{if (($thumbnail.HD_ACCESS) && ($strippedgalleria.lightbox == 'hd'))}{$d_hd->get_url()}{else}{$d_image->get_url()}{/if}{literal}',
                         title: '{/literal}{$thumbnail.NAME|strip_tags:false|replace:'\'':'''|replace:'"':'"'|nl2br|regex_replace:"/[\r\n]/":""}{literal}',
                         description: '{/literal}{$thumbnail.FILE_DESC|strip_tags:false|replace:'\'':'''|replace:'"':'"'|nl2br|regex_replace:"/[\r\n]/":""}{literal}',
-                        piwigo_id: {/literal}{$thumbnail.id}{literal}
+                        piwigo_id: {/literal}{$thumbnail.id}{literal},
+                        hd_access: {/literal}{if ($thumbnail.HD_ACCESS)}true{else}false{/if}{literal}
                 }{/literal}{if (!$smarty.foreach.thumb.last)},{/if}
                 {/foreach}{literal}
@@ -48 +56 @@
                                                 var gid = e.index;
                                                 var pid = this.getData(gid).piwigo_id;
-                                                jQuery("#downloadlink").hide();
+                                                var hdaccess = this.getData(gid).hd_access;
+                                                if (hdaccess) {
+                                                        jQuery("#downloadlink").show();
+                                                        jQuery("#downloadlink").prop("href","action.php?id="+pid+"&part=e&download");
+                                                } else {
+                                                        jQuery("#downloadlink").hide();
+                                                }
                                                 jQuery.post("{/literal}{$get_root_url}{literal}themes/stripped-galleria/save_history.php", {
                                                         imgid: "img-"+pid,

extensions/stripped-galleria/themeconf.inc.php

@@ -35 +35 @@
 if (!isset($strippedgalleria['lightbox'])) $strippedgalleria['lightbox']='none';
 
-// adresse image HD depuis thumbs
-/*
-add_event_handler('loc_end_index_thumbnails', 'add_thumbnails_high_url', 50, 2);
-function add_thumbnails_high_url($tpl_var, $pictures)
+// Access to HD and link to original
+
+add_event_handler('loc_end_index_thumbnails', 'add_thumbnails_hd_url', 50, 2);
+function add_thumbnails_hd_url($tpl_vars, $pictures)
 {
-  include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
-  foreach($tpl_var as $key => $value)
-  {
-    if ($value['FILE_HAS_HD'])
-    {
-      $tpl_var[$key]['HD_PATH'] = get_high_path($pictures[$key]);
-    }
-  }
-  return $tpl_var;
+        global $user;
+        foreach($tpl_vars as &$x)
+        {
+                if ($user['enabled_high']) $x['HD_ACCESS'] = true;
+                else $x['HD_ACCESS'] = false;
+        }
+        unset($x);
+        return $tpl_vars;
 }
-
-*/
 ?>