Changeset 17858 for extensions/stripped_black_bloc

Timestamp:

Sep 11, 2012, 2:59:30 PM (12 years ago)

Author:

flop25

Message:

new value and name change of parameter : Display big thumbnails for landscape pictures (thumbnails.tpl&mainpage_categories.tpl)
all the parameters are applied to stuff thumbnails
mistake corrected in mainpage_categories.tpl

Location:

extensions/stripped_black_bloc

Files:

• admin/admin.inc.php (modified) (1 diff)
• admin/admin.tpl (modified) (1 diff)
• admin/maintain.inc.php (modified) (1 diff)
• admin/upgrade.inc.php (modified) (2 diffs)
• template/mainpage_categories.tpl (modified) (2 diffs)
• template/stuffs_thumbnails.tpl (modified) (1 diff)
• template/thumbnails.tpl (modified) (2 diffs)

extensions/stripped_black_bloc/admin/admin.inc.php

@@ -33 +33 @@
         $config_send['starting_to']=(isset($_POST['f_starting_to'])) ? $_POST['f_starting_to'] : 1;
         $config_send['catthumb']=(isset($_POST['f_catthumb'])) ? $_POST['f_catthumb'] : 'none';
-        $config_send['portrait_limitation']=(isset($_POST['f_portrait_limitation'])) ? $_POST['f_portrait_limitation'] : 'none';
+        $config_send['orientation_option']=(isset($_POST['f_orientation_option'])) ? $_POST['f_orientation_option'] : 'none';
         conf_update_param('stripped_black_bloc', pwg_db_real_escape_string(serialize($config_send)));
 

extensions/stripped_black_bloc/admin/admin.tpl

@@ -45 +45 @@
     <li>
       <br><br>
-      <label>{'About portrait pictures :'|@translate}</label>
+      <label>{'About portrait/landscape pictures :'|@translate}</label>
       <br><br>
      <label>
-        <input type="radio" name="f_portrait_limitation" id="portrait_limitation" value="none"  {if $options.portrait_limitation=="none"}checked{/if}>
-        &nbsp;{'No Maximum Height, the width is the one set above'|@translate}</label>
+        <input type="radio" name="f_orientation_option" id="orientation_option" value="none"  {if $options.orientation_option=="none"}checked{/if}>
+        &nbsp;{'No Maximum Height and the width is the one set above'|@translate}</label>
       <br>
       <label>
-        <input type="radio" name="f_portrait_limitation" id="portrait_limitation" value="yes" {if $options.portrait_limitation=="yes"}checked{/if}>
+        <input type="radio" name="f_orientation_option" id="orientation_option" value="max_heigth" {if $options.orientation_option=="max_heigth"}checked{/if}>
         &nbsp;{'Use the width parameter above as a maximum heigth'|@translate}</label>
+      <br>
+      <label>
+        <input type="radio" name="f_orientation_option" id="orientation_option" value="big_landscape" {if $options.orientation_option=="max_heigth"}checked{/if}>
+        &nbsp;{'Display big thumbnails for landscape pictures'|@translate}</label>
       <br>
     </li>

extensions/stripped_black_bloc/admin/maintain.inc.php

@@ -14 +14 @@
         'starting_to'                                           => 1,
   'catthumb'         => 'none', //none - same - all
-  'portrait_limitation'         => 'none' //none - yes
+  'orientation_option'         => 'none' //none - max_heigth - big_landscape
       );
       

extensions/stripped_black_bloc/admin/upgrade.inc.php

@@ -14 +14 @@
   'starting_to'           => 1,
   'catthumb'         => 'none', //none - same - all
-  'portrait_limitation'         => 'none' //none - yes
+  'orientation_option'         => 'none' //none - max_heigth -big_landscape
   );
   $query = "
@@ -32 +32 @@
   'starting_to'           => (isset($conff['starting_to'])) ? $conff['starting_to'] :1,
   'catthumb'         => (isset($conff['catthumb'])) ? $conff['catthumb'] :'none', //none - same - all
-  'portrait_limitation'         => (isset($conff['portrait_limitation'])) ? $conff['portrait_limitation'] :'none' //none - yes
+  'orientation_option'         => (isset($conff['orientation_option'])) ? $conff['orientation_option'] :'none' //none - max_heigth -big_landscape
   );
   conf_update_param('stripped_black_bloc', pwg_db_real_escape_string(serialize($config)));

extensions/stripped_black_bloc/template/mainpage_categories.tpl

@@ -13 +13 @@
     {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_wide, $cat.representative.src_image)}
     {assign var=TN_CLASS value="twocol"}
-  {elseif $cat.representative.width < $cat.representative.height and $stripped_black_bloc.catthumb=="yes"}
+  {elseif $stripped_black_bloc.catthumb=="all"}
+    {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big_vert, $cat.representative.src_image)}
+    {assign var=TN_CLASS value="twocol"}
+  {elseif $cat.representative.width < $cat.representative.height and $stripped_black_bloc.orientation_option=="max_heigth"}
       {if $cat.TN_CLASS=="twocol" and $stripped_black_bloc.catthumb=="same"}
-        {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big_vert, $cat.representative.src_image)}
-        {assign var=TN_CLASS value="twocol"}
-      {elseif $stripped_black_bloc.catthumb=="all"}
         {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big_vert, $cat.representative.src_image)}
         {assign var=TN_CLASS value="twocol"}
@@ -24 +24 @@
         {assign var=TN_CLASS value="onecol"}
       {/if}
+  {elseif $stripped_black_bloc.orientation_option=="big_landscape"}
+    {if (($cat.representative.TN_CLASS=="twocol" and $stripped_black_bloc.catthumb=="same") or $cat.representative.width > $cat.representative.height) and ($cat.representative.width>$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width)}
+      {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big, $cat.representative.src_image)}
+      {assign var=TN_CLASS value='twocol'}
+    {else}
+      {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc, $cat.representative.src_image)}
+      {assign var=TN_CLASS value='onecol'}
+    {/if}
   {else}
     {if $cat.TN_CLASS=="twocol" and $stripped_black_bloc.catthumb=="same"}
       {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big, $cat.representative.src_image)}
-      {assign var=TN_CLASS value="twocol"}
-    {elseif $stripped_black_bloc.catthumb=="all"}
-      {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big, $cat.representative.src_image)}{assign var=TN_CLASS value="twocol"}
       {assign var=TN_CLASS value="twocol"}
     {else}

extensions/stripped_black_bloc/template/stuffs_thumbnails.tpl

@@ -5 +5 @@
 {if !empty($thumbnails)}
   {foreach from=$thumbnails item=thumbnail}
-    {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc, $thumbnail.src_image)}
-    {assign var='size' value=$derivative->get_size()}
-<div class="bloc {$thumbnail.TN_CLASS}">
+    {assign var=triplehigh value=$thumbnail.height+$thumbnail.height+$thumbnail.height}
+    {if ($thumbnail.width > $triplehigh) and ($thumbnail.width>$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width+$stripped_black_bloc.column_width)}
+      {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_wide, $thumbnail.src_image)}
+      {assign var=TN_CLASS value='threecol'}
+    {elseif ($thumbnail.width > $triplehigh) and ($thumbnail.width>$stripped_black_bloc.column_width+$stripped_black_bloc.column_width)}
+      {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big, $thumbnail.src_image)}
+      {assign var=TN_CLASS value='twocol'}
+    {elseif (($thumbnail.width < $thumbnail.height) and $stripped_black_bloc.orientation_option=="max_heigth")}
+      {if $thumbnail.TN_CLASS=="twocol" and $thumbnail.width>$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width}
+        {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big_vert, $thumbnail.src_image)}
+        {assign var=TN_CLASS value='twocol'}
+      {else}
+        {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_vert, $thumbnail.src_image)}
+        {assign var=TN_CLASS value='onecol'}
+      {/if}
+    {elseif $stripped_black_bloc.orientation_option=="big_landscape"}
+      {if ($thumbnail.TN_CLASS=="twocol" or $thumbnail.width > $thumbnail.height) and ($thumbnail.width>$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width)}
+        {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big, $thumbnail.src_image)}
+        {assign var=TN_CLASS value='twocol'}
+      {else}
+        {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc, $thumbnail.src_image)}
+        {assign var=TN_CLASS value='onecol'}
+      {/if}
+    {else}
+      {if $thumbnail.TN_CLASS=="twocol" and $thumbnail.width>$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width}
+        {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big, $thumbnail.src_image)}
+        {assign var=TN_CLASS value='twocol'}
+      {else}
+        {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc, $thumbnail.src_image)}
+        {assign var=TN_CLASS value='onecol'}
+      {/if}
+    {/if}
+     {assign var='size' value=$derivative->get_size()}
+<div class="bloc {$TN_CLASS}">
   <a href="{$thumbnail.URL}" style="background: url({if $derivative->is_cached()}{$derivative->get_url()}{else}{$ROOT_URL}{$themeconf.img_dir}/loading.gif{/if}) no-repeat scroll center center transparent; height: {$size[1]}px; width: {$size[0]}px; opacity: 0.75;" {if !$derivative->is_cached()}data-src="{$derivative->get_url()}"{/if}>
     {if isset($thumbnail.NAME)}{$thumbnail.NAME}{else}{$thumbnail.TN_TITLE}{/if}

extensions/stripped_black_bloc/template/thumbnails.tpl

@@ -15 +15 @@
       {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big, $thumbnail.src_image)}
       {assign var=TN_CLASS value='twocol'}
-    {elseif (($thumbnail.width < $thumbnail.height) and $stripped_black_bloc.portrait_limitation=="yes")}
+    {elseif (($thumbnail.width < $thumbnail.height) and $stripped_black_bloc.orientation_option=="max_heigth")}
       {if $thumbnail.TN_CLASS=="twocol" and $thumbnail.width>$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width}
         {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big_vert, $thumbnail.src_image)}
@@ -21 +21 @@
       {else}
         {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_vert, $thumbnail.src_image)}
+        {assign var=TN_CLASS value='onecol'}
+      {/if}
+    {elseif $stripped_black_bloc.orientation_option=="big_landscape"}
+      {if ($thumbnail.TN_CLASS=="twocol" or $thumbnail.width > $thumbnail.height) and ($thumbnail.width>$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width)}
+        {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big, $thumbnail.src_image)}
+        {assign var=TN_CLASS value='twocol'}
+      {else}
+        {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc, $thumbnail.src_image)}
         {assign var=TN_CLASS value='onecol'}
       {/if}