diff options
| author | rvelices <rv-github@modusoptimus.com> | 2012-01-17 21:58:18 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2012-01-17 21:58:18 +0000 |
| commit | cc01941ed97f6c8f6790931bfc167ba45c5a8f91 (patch) | |
| tree | fe465d457c034efba03cfe26d65b5467d88bfca2 /themes | |
| parent | e1bd64fdfc50f3ef50c0b4391c4586bbaeacb287 (diff) | |
feature 2548 multisize - code cleanup + better usage in category_cats + i.php logs memory usage peak
git-svn-id: http://piwigo.org/svn/trunk@12920 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/default/template/mainpage_categories.tpl | 10 | ||||
| -rw-r--r-- | themes/default/template/thumbnails.tpl | 16 | ||||
| -rw-r--r-- | themes/default/theme.css | 1 |
3 files changed, 20 insertions, 7 deletions
diff --git a/themes/default/template/mainpage_categories.tpl b/themes/default/template/mainpage_categories.tpl index 016c95558..15e8802d9 100644 --- a/themes/default/template/mainpage_categories.tpl +++ b/themes/default/template/mainpage_categories.tpl @@ -1,11 +1,19 @@ +{strip}{html_style} +.thumbnailCategory DIV.illustration{ldelim} + width: {$derivative_params->max_width()+5}px; +} +.content .thumbnailCategory .description{ldelim} + height: {$derivative_params->max_height()+5}px; +} +{/html_style}{/strip} <ul class="thumbnailCategories"> {foreach from=$category_thumbnails item=cat} <li> <div class="thumbnailCategory"> <div class="illustration"> <a href="{$cat.URL}"> - <img src="{$cat.TN_SRC}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '|@strip_tags:false} - {'display this album'|@translate}"> + <img src="{$pwg->derivative_url($derivative_params, $cat.representative.src_image)}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '|@strip_tags:false} - {'display this album'|@translate}"> </a> </div> <div class="description"> diff --git a/themes/default/template/thumbnails.tpl b/themes/default/template/thumbnails.tpl index fec76214e..e2d1e88c4 100644 --- a/themes/default/template/thumbnails.tpl +++ b/themes/default/template/thumbnails.tpl @@ -1,6 +1,5 @@ {if !empty($thumbnails)}{strip} -{html_head} -<style type="text/css"> +{html_style} {*Set some sizes according to maximum thumbnail width and height*} .thumbnails SPAN, .thumbnails .wrap2 A, @@ -11,9 +10,16 @@ .thumbnails .wrap2{ldelim} height: {$derivative_params->max_height()+2}px; } - -</style> -{/html_head} +{if $derivative_params->max_width() > 600} +.thumbLegend {ldelim}font-size: 130%} +{else} +{if $derivative_params->max_width() > 400} +.thumbLegend {ldelim}font-size: 110%} +{else} +.thumbLegend {ldelim}font-size: 90%} +{/if} +{/if} +{/html_style} {foreach from=$thumbnails item=thumbnail} <li> <span class="wrap1"> diff --git a/themes/default/theme.css b/themes/default/theme.css index b8f919c43..0477d5a7d 100644 --- a/themes/default/theme.css +++ b/themes/default/theme.css @@ -263,7 +263,6 @@ TD.calDayHead { /* Thumbnails */ .thumbnails SPAN.thumbLegend { - font-size: 90%; overflow: hidden;/* oversized legend is clipped */ } |