Index: /extensions/stripped_black_bloc/admin/admin.inc.php
===================================================================
--- /extensions/stripped_black_bloc/admin/admin.inc.php (revision 17827)
+++ /extensions/stripped_black_bloc/admin/admin.inc.php (revision 17828)
@@ -33,4 +33,5 @@
$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';
conf_update_param('stripped_black_bloc', pwg_db_real_escape_string(serialize($config_send)));
Index: /extensions/stripped_black_bloc/admin/admin.tpl
===================================================================
--- /extensions/stripped_black_bloc/admin/admin.tpl (revision 17827)
+++ /extensions/stripped_black_bloc/admin/admin.tpl (revision 17828)
@@ -45,4 +45,17 @@
+
+
+
+
+
+
+
+
+
Index: /extensions/stripped_black_bloc/admin/maintain.inc.php
===================================================================
--- /extensions/stripped_black_bloc/admin/maintain.inc.php (revision 17827)
+++ /extensions/stripped_black_bloc/admin/maintain.inc.php (revision 17828)
@@ -13,5 +13,6 @@
'every_x' => 20,
'starting_to' => 1,
- 'catthumb' => 'none' //none - same - all
+ 'catthumb' => 'none', //none - same - all
+ 'portrait_limitation' => 'none' //none - yes
);
Index: /extensions/stripped_black_bloc/admin/upgrade.inc.php
===================================================================
--- /extensions/stripped_black_bloc/admin/upgrade.inc.php (revision 17827)
+++ /extensions/stripped_black_bloc/admin/upgrade.inc.php (revision 17828)
@@ -13,5 +13,6 @@
'every_x' => 20,
'starting_to' => 1,
- 'catthumb' => 'none' //none - same - all
+ 'catthumb' => 'none', //none - same - all
+ 'portrait_limitation' => 'none' //none - yes
);
$query = "
@@ -21,26 +22,15 @@
load_conf_from_db();
}
-elseif (count(unserialize( $conf['stripped_black_bloc'] ))!=6)
+elseif (count(unserialize( $conf['stripped_black_bloc'] ))!=7)
{
+ $conff=unserialize($conf['stripped_black_bloc']);
$config = array(
- 'color_main' => 'E6554F',
- 'column_width' => 170,
- 'thumbnail_width' => 150,
- 'every_x' => 20,
- 'starting_to' => 1,
- 'catthumb' => 'none' //none - same - all
- );
- conf_update_param('stripped_black_bloc', pwg_db_real_escape_string(serialize($config)));
- load_conf_from_db();
-}
-elseif ($conff=unserialize($conf['stripped_black_bloc']) and ( !isset($conff['catthumb']) or empty($conff['catthumb'])) )
-{
- $config = array(
- 'color_main' => $conff['color_main'],
- 'column_width' => $conff['column_width'],
- 'thumbnail_width' => $conff['thumbnail_width'],
- 'every_x' => $conff['every_x'],
- 'starting_to' => $conff['starting_to'],
- 'catthumb' => 'none' //none - same - all
+ 'color_main' => (isset($conff['color_main'])) ? $conff['color_main'] :'E6554F',
+ 'column_width' => (isset($conff['column_width'])) ? $conff['column_width'] :170,
+ 'thumbnail_width' => (isset($conff['thumbnail_width'])) ? $conff['thumbnail_width'] :150,
+ 'every_x' => (isset($conff['every_x'])) ? $conff['every_x'] : 20,
+ '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
);
conf_update_param('stripped_black_bloc', pwg_db_real_escape_string(serialize($config)));
Index: /extensions/stripped_black_bloc/local_head.tpl
===================================================================
--- /extensions/stripped_black_bloc/local_head.tpl (revision 17827)
+++ /extensions/stripped_black_bloc/local_head.tpl (revision 17828)
@@ -9,5 +9,5 @@
max-width: {/literal}{if $stripped_black_bloc.thumbnail_width}{$stripped_black_bloc.thumbnail_width}{/if}{literal}px;
}
-.bloc a{
+.bloc a {
max-width:{/literal}{if $stripped_black_bloc.thumbnail_width}{$stripped_black_bloc.thumbnail_width}{/if}{literal}px;
}
@@ -17,4 +17,10 @@
.bloc_big a {
max-width:{/literal}{if $stripped_black_bloc.thumbnail_width}{$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width}{/if}{literal}px;
+}
+.bloc_wide {
+ max-width: {/literal}{if $stripped_black_bloc.thumbnail_width}{$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width+$stripped_black_bloc.column_width}{/if}{literal}px;
+}
+.bloc_wide a {
+ max-width:{/literal}{if $stripped_black_bloc.thumbnail_width}{$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width+$stripped_black_bloc.column_width}{/if}{literal}px;
}
.content_block, .bloc_stuff, .two_columns {
Index: /extensions/stripped_black_bloc/template/mainpage_categories.tpl
===================================================================
--- /extensions/stripped_black_bloc/template/mainpage_categories.tpl (revision 17827)
+++ /extensions/stripped_black_bloc/template/mainpage_categories.tpl (revision 17828)
@@ -1,13 +1,38 @@
{define_derivative name='derivative_stripped_black_bloc' width=$stripped_black_bloc.thumbnail_width height=9999 crop=false}
{define_derivative name='derivative_stripped_black_bloc_big' width=$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width height=9999 crop=false}
+{define_derivative name='derivative_stripped_black_bloc_wide' width=$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width+$stripped_black_bloc.column_width height=9999 crop=false}
+{define_derivative name='derivative_stripped_black_bloc_vert' width=$stripped_black_bloc.thumbnail_width height=$stripped_black_bloc.thumbnail_width crop=false}
+{define_derivative name='derivative_stripped_black_bloc_big_vert' width=$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width height=$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width crop=false}
+
{foreach from=$category_thumbnails item=cat}
- {if $cat.TN_CLASS=="bloc_big" and $stripped_black_bloc.catthumb=="same"}
- {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big, $cat.representative.src_image)}
- {elseif $stripped_black_bloc.catthumb=="all"}
- {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big, $cat.representative.src_image)}
+{assign var=triplehigh value= $cat.representative.height+$cat.representative.height+$cat.representative.height}
+ {if $cat.representative.width gt $triplehigh}
+ {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_wide, $cat.representative.src_image)}
+ {assign var='size' value=$derivative->get_size()}
+
{else}
- {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc, $cat.representative.src_image)}
- {/if}
- {assign var='size' value=$derivative->get_size()}
+ {if $cat.representative.width < $cat.representative.height and $stripped_black_bloc.catthumb=="yes"}
+ {if $cat.TN_CLASS=="bloc_big" and $stripped_black_bloc.catthumb=="same"}
+ {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big_vert, $cat.representative.src_image)}
+ {elseif $stripped_black_bloc.catthumb=="all"}
+ {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big_vert, $cat.representative.src_image)}
+ {else}
+ {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_vert, $cat.representative.src_image)}
+ {/if}
+ {else}
+ {if $cat.TN_CLASS=="bloc_big" and $stripped_black_bloc.catthumb=="same"}
+ {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big, $cat.representative.src_image)}
+ {elseif $stripped_black_bloc.catthumb=="all"}
+ {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big, $cat.representative.src_image)}
+ {else}
+ {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc, $cat.representative.src_image)}
+ {/if}
+ {/if}
+ {assign var='size' value=$derivative->get_size()}
+ {/if}
{/foreach}
Index: /extensions/stripped_black_bloc/template/thumbnails.tpl
===================================================================
--- /extensions/stripped_black_bloc/template/thumbnails.tpl (revision 17827)
+++ /extensions/stripped_black_bloc/template/thumbnails.tpl (revision 17828)
@@ -3,20 +3,45 @@
{define_derivative name='derivative_stripped_black_bloc' width=$stripped_black_bloc.thumbnail_width height=9999 crop=false}
{define_derivative name='derivative_stripped_black_bloc_big' width=$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width height=9999 crop=false}
+{define_derivative name='derivative_stripped_black_bloc_wide' width=$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width+$stripped_black_bloc.column_width height=9999 crop=false}
+{define_derivative name='derivative_stripped_black_bloc_vert' width=$stripped_black_bloc.thumbnail_width height=$stripped_black_bloc.thumbnail_width crop=false}
+{define_derivative name='derivative_stripped_black_bloc_big_vert' width=$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width height=$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width crop=false}
{if !empty($thumbnails)}
{foreach from=$thumbnails item=thumbnail}
- {if $thumbnail.TN_CLASS=="bloc"}
- {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc, $thumbnail.src_image)}
+ {assign var=triplehigh value=$thumbnail.height+$thumbnail.height+$thumbnail.height}
+ {if ($thumbnail.width > $triplehigh) }
+ {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_wide, $thumbnail.src_image)}
+ {assign var='size' value=$derivative->get_size()}
+
+ {else}
+ {if (($thumbnail.width < $thumbnail.height) and $stripped_black_bloc.portrait_limitation=="yes")}
+ {if $thumbnail.TN_CLASS=="bloc"}
+ {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_vert, $thumbnail.src_image)}
+ {else}
+ {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big_vert, $thumbnail.src_image)}
+ {/if}
{else}
- {assign var=derivative value=$pwg->derivative($derivative_stripped_black_bloc_big, $thumbnail.src_image)}
- {/if}
- {assign var='size' value=$derivative->get_size()}
-
+ {/if}
{/foreach}
{/if}