From 35076ee1b9e32618d3c92bdd8aee20f2c4abb694 Mon Sep 17 00:00:00 2001 From: rvelices Date: Sat, 1 Mar 2008 13:12:07 +0000 Subject: - index.tpl, menubar.tpl, mainpage_categories.tpl and month_calendar.tpl go smarty - better template debugging tweak (the smarty console is shown only once at the end) git-svn-id: http://piwigo.org/svn/trunk@2231 68402e56-0260-453c-a942-63ccdbb3a9ee --- template/yoga/footer.tpl | 2 +- template/yoga/index.tpl | 181 +++++++++++----------- template/yoga/mainpage_categories.tpl | 29 ++-- template/yoga/menubar.tpl | 279 ++++++++++++++++++---------------- template/yoga/month_calendar.tpl | 92 +++++++---- 5 files changed, 310 insertions(+), 273 deletions(-) (limited to 'template/yoga') diff --git a/template/yoga/footer.tpl b/template/yoga/footer.tpl index 37aab1fba..68abea4fb 100644 --- a/template/yoga/footer.tpl +++ b/template/yoga/footer.tpl @@ -29,4 +29,4 @@ {if isset($debug.QUERIES_LIST)}{$debug.QUERIES_LIST}{/if} - + \ No newline at end of file diff --git a/template/yoga/index.tpl b/template/yoga/index.tpl index 48c4a7df3..944c5153e 100644 --- a/template/yoga/index.tpl +++ b/template/yoga/index.tpl @@ -1,116 +1,117 @@ - - -{MENUBAR} +{* $Id$ *} +{$MENUBAR}
  •  
    • - + {if !empty($image_orders) }
  • - {lang:Sort order}: + {'Sort order'|@translate}:
    • - - - -
  • {lang:caddie}
    • - - - -
  • {lang:edit}
    • - - - -
  • (?)
    • - - - -
  • {lang:slideshow}
    • - - - -
  • {lang:mode_normal_hint}
    • - - - -
  • {lang:mode_flat_hint}
    • - - - -
  • {lang:mode_posted_hint}
    • - - -
  • {lang:mode_created_hint}
    • - - {PLUGIN_INDEX_ACTIONS} + {/if} + + {if isset($U_CADDIE) } +
  • {'caddie'|@translate}
    • + {/if} + + {if isset($U_EDIT) } +
  • {'edit'|@translate}
    • + {/if} + + {if isset($U_SEARCH_RULES) } +
  • (?)
    • + {/if} + + {if isset($U_SLIDESHOW) } +
  • {'slideshow'|@translate}
    • + {/if} + + {if isset($U_MODE_FLAT) } +
  • {'mode_flat_hint'|@translate}
    • + {/if} + + {if isset($U_MODE_NORMAL) } +
  • {'mode_normal_hint'|@translate}
    • + {/if} + + {if isset($U_MODE_POSTED) } +
  • {'mode_posted_hint'|@translate}
    • + {/if} + + {if isset($U_MODE_CREATED) } +
  • {'mode_created_hint'|@translate}
    • + {/if} + + {if !empty($PLUGIN_INDEX_ACTIONS)}{$PLUGIN_INDEX_ACTIONS}{/if}
-

{TITLE}

- - -
{lang:calendar_view}: +

{$TITLE}

+ + {if isset($chronology_views) } +
{'calendar_view'|@translate}:
- - + {/if} - -

{calendar.TITLE}

- + {if isset($chronology.TITLE) } +

{$chronology.TITLE}

+ {/if}
-{PLUGIN_INDEX_CONTENT_BEGIN} - - -
{lang:Category results for} {QUERY_SEARCH} : {category_search_results.CONTENT}
- - -
{lang:Tag results for} {QUERY_SEARCH} : {tag_search_results.CONTENT}
- - - - - -
- -
« {calendar.navbar.prev.LABEL}
- - -
{calendar.navbar.next.LABEL} »
- - {calendar.navbar.BAR}  +{if !empty($PLUGIN_INDEX_CONTENT_END)}{$PLUGIN_INDEX_CONTENT_BEGIN}{/if} + +{if !empty($category_search_results) } +
{'Category results for'|@translate} {$QUERY_SEARCH} : + + {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) } +
{'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} +
- +{/if} - -
{calendar.calbar.BAR}
- - +{if isset($FILE_CHRONOLOGY_VIEW) } +{include file=$FILE_CHRONOLOGY_VIEW} +{/if} -{MONTH_CALENDAR} -{CATEGORIES} -{THUMBNAILS} +{if !empty($CATEGORIES) }{$CATEGORIES}{/if} +{if !empty($THUMBNAILS) }{$THUMBNAILS}{/if} - - + +{if !empty($NAV_BAR) }
-{cat_infos.navigation.NAV_BAR} + {$NAV_BAR} +
+{/if} + +{if !empty($CONTENT_DESCRIPTION) } +
+ {$CONTENT_DESCRIPTION}
- - -
{cat_infos.comment.COMMENTS}
- - +{/if} -{PLUGIN_INDEX_CONTENT_END} +{if !empty($PLUGIN_INDEX_CONTENT_END) }{$PLUGIN_INDEX_CONTENT_END}{/if}
diff --git a/template/yoga/mainpage_categories.tpl b/template/yoga/mainpage_categories.tpl index dcf589b51..b28c619fb 100644 --- a/template/yoga/mainpage_categories.tpl +++ b/template/yoga/mainpage_categories.tpl @@ -1,28 +1,27 @@ - - - +{* $Id$ *} +
    - + {foreach from=$category_thumbnails item=cat}
  • - - {categories.category.ALT} + + {$cat.ALT}

    - {categories.category.NAME} - {categories.category.ICON} + {$cat.NAME} + {$cat.ICON}

    - -

    {categories.category.dates.INFO}

    - -

    {categories.category.CAPTION_NB_IMAGES} 

    -

    {categories.category.DESCRIPTION} 

    + {if isset($cat.INFO_DATES) } +

    {$cat.INFO_DATES}

    + {/if} +

    {$cat.CAPTION_NB_IMAGES}

    +

    {$cat.DESCRIPTION}

    • - + {/foreach}
- + diff --git a/template/yoga/menubar.tpl b/template/yoga/menubar.tpl index 3fe8ded73..a7e01fcad 100644 --- a/template/yoga/menubar.tpl +++ b/template/yoga/menubar.tpl @@ -1,155 +1,164 @@ - - +{* $Id$ *} +