aboutsummaryrefslogtreecommitdiffstats
path: root/themes
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2010-12-30 19:47:17 +0000
committerrvelices <rv-github@modusoptimus.com>2010-12-30 19:47:17 +0000
commitff36bf3b70b58a117b7ccfe72d0f3faf58d97f34 (patch)
tree5ee59ce55e533f17b3791885538b10fa9ed9c7ce /themes
parent2ca0da39fbf476dd144dba440f94f1ffb045f117 (diff)
index.tpl and thumbnails change: category description above thumbs and enclosing ul moved to index.tpl
fix some combine_xxx git-svn-id: http://piwigo.org/svn/trunk@8401 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--themes/default/template/index.tpl59
-rw-r--r--themes/default/template/thumbnails.tpl4
2 files changed, 31 insertions, 32 deletions
diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl
index 8c68cfd8b..14d63ab18 100644
--- a/themes/default/template/index.tpl
+++ b/themes/default/template/index.tpl
@@ -3,11 +3,11 @@
<div id="content" class="content">
<div class="titrePage">
<ul class="categoryActions">
- {if !empty($image_orders) }
+ {if !empty($image_orders)}
<li>
{'Sort order'|@translate}:
<select onchange="document.location = this.options[this.selectedIndex].value;">
- {foreach from=$image_orders item=image_order }
+ {foreach from=$image_orders item=image_order}
<option value="{$image_order.URL}"{if $image_order.SELECTED} selected="selected"{/if}>{$image_order.DISPLAY}</option>
{/foreach}
</select>
@@ -75,52 +75,55 @@
</div>
{/if}
-{if isset($chronology.TITLE) }
+{if isset($chronology.TITLE)}
<h2>{$chronology.TITLE}</h2>
{/if}
-</div> <!-- titrePage -->
+</div><!-- titrePage -->
{if !empty($PLUGIN_INDEX_CONTENT_BEGIN)}{$PLUGIN_INDEX_CONTENT_BEGIN}{/if}
-{if !empty($category_search_results) }
+{if !empty($category_search_results)}
<div style="font-size:16px;margin:10px 16px">{'Album results for'|@translate} <strong>{$QUERY_SEARCH}</strong> :
- <em><strong>
- {foreach from=$category_search_results item=res name=res_loop}
- {if !$smarty.foreach.res_loop.first} &mdash; {/if}
- {$res}
- {/foreach}
- </strong></em>
+ <em><strong>
+ {foreach from=$category_search_results item=res name=res_loop}
+ {if !$smarty.foreach.res_loop.first} &mdash; {/if}
+ {$res}
+ {/foreach}
+ </strong></em>
</div>
{/if}
-{if !empty($tag_search_results) }
+{if !empty($tag_search_results)}
<div style="font-size:16px;margin:10px 16px">{'Tag results for'|@translate} <strong>{$QUERY_SEARCH}</strong> :
- <em><strong>
- {foreach from=$tag_search_results item=res name=res_loop}
- {if !$smarty.foreach.res_loop.first} &mdash; {/if}
- {$res}
- {/foreach}
- </strong></em>
+ <em><strong>
+ {foreach from=$tag_search_results item=res name=res_loop}
+ {if !$smarty.foreach.res_loop.first} &mdash; {/if}
+ {$res}
+ {/foreach}
+ </strong></em>
</div>
{/if}
-{if isset($FILE_CHRONOLOGY_VIEW) }
+{if isset($FILE_CHRONOLOGY_VIEW)}
{include file=$FILE_CHRONOLOGY_VIEW}
{/if}
-{if !empty($CATEGORIES) }{$CATEGORIES}{/if}
-{if !empty($THUMBNAILS) }{$THUMBNAILS}{/if}
-
-{if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
-
-{if !empty($CONTENT_DESCRIPTION) }
+{if !empty($CONTENT_DESCRIPTION)}
<div class="additional_info">
- {$CONTENT_DESCRIPTION}
+ {$CONTENT_DESCRIPTION}
</div>
{/if}
-{if !empty($PLUGIN_INDEX_CONTENT_END) }{$PLUGIN_INDEX_CONTENT_END}{/if}
-</div> <!-- content -->
+{if !empty($CATEGORIES)}{$CATEGORIES}{/if}
+{if !empty($THUMBNAILS)}
+<ul class="thumbnails" id="thumbnails">
+{$THUMBNAILS}
+</ul>
+{/if}
+
+{if !empty($navbar)}{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
+{if !empty($PLUGIN_INDEX_CONTENT_END)}{$PLUGIN_INDEX_CONTENT_END}{/if}
+</div><!-- content -->
{if !empty($PLUGIN_INDEX_CONTENT_AFTER)}{$PLUGIN_INDEX_CONTENT_AFTER}{/if}
diff --git a/themes/default/template/thumbnails.tpl b/themes/default/template/thumbnails.tpl
index cb00e915b..fab6f23c3 100644
--- a/themes/default/template/thumbnails.tpl
+++ b/themes/default/template/thumbnails.tpl
@@ -1,6 +1,5 @@
{if !empty($thumbnails)}
-<ul class="thumbnails">
{foreach from=$thumbnails item=thumbnail}
<li>
<span class="wrap1">
@@ -31,7 +30,4 @@
</span>
</li>
{/foreach}
-</ul>
{/if}
-
-