From ff36bf3b70b58a117b7ccfe72d0f3faf58d97f34 Mon Sep 17 00:00:00 2001 From: rvelices Date: Thu, 30 Dec 2010 19:47:17 +0000 Subject: 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 --- themes/default/template/index.tpl | 59 ++++++++++++++++++---------------- themes/default/template/thumbnails.tpl | 4 --- 2 files changed, 31 insertions(+), 32 deletions(-) (limited to 'themes/default/template') 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 @@
    - {if !empty($image_orders) } + {if !empty($image_orders)}
  • {'Sort order'|@translate}: @@ -75,52 +75,55 @@
{/if} -{if isset($chronology.TITLE) } +{if isset($chronology.TITLE)}

{$chronology.TITLE}

{/if} -
+ {if !empty($PLUGIN_INDEX_CONTENT_BEGIN)}{$PLUGIN_INDEX_CONTENT_BEGIN}{/if} -{if !empty($category_search_results) } +{if !empty($category_search_results)}
{'Album results for'|@translate} {$QUERY_SEARCH} : - - {foreach from=$category_search_results item=res name=res_loop} - {if !$smarty.foreach.res_loop.first} — {/if} - {$res} - {/foreach} - + + {foreach from=$category_search_results item=res name=res_loop} + {if !$smarty.foreach.res_loop.first} — {/if} + {$res} + {/foreach} +
{/if} -{if !empty($tag_search_results) } +{if !empty($tag_search_results)}
{'Tag results for'|@translate} {$QUERY_SEARCH} : - - {foreach from=$tag_search_results item=res name=res_loop} - {if !$smarty.foreach.res_loop.first} — {/if} - {$res} - {/foreach} - + + {foreach from=$tag_search_results item=res name=res_loop} + {if !$smarty.foreach.res_loop.first} — {/if} + {$res} + {/foreach} +
{/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)}
- {$CONTENT_DESCRIPTION} + {$CONTENT_DESCRIPTION}
{/if} -{if !empty($PLUGIN_INDEX_CONTENT_END) }{$PLUGIN_INDEX_CONTENT_END}{/if} - +{if !empty($CATEGORIES)}{$CATEGORIES}{/if} +{if !empty($THUMBNAILS)} + +{/if} + +{if !empty($navbar)}{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if} +{if !empty($PLUGIN_INDEX_CONTENT_END)}{$PLUGIN_INDEX_CONTENT_END}{/if} + {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)} - {/if} - - -- cgit v1.2.3