From 0251c5122ed92522577834566fc365449b5a7425 Mon Sep 17 00:00:00 2001 From: rvelices Date: Tue, 6 Nov 2012 20:46:56 +0000 Subject: - fill add comment form fields only if the input comment has been rejected - simplify templates git-svn-id: http://piwigo.org/svn/trunk@18950 68402e56-0260-453c-a942-63ccdbb3a9ee --- themes/default/template/index.tpl | 6 ++---- themes/default/template/picture.tpl | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'themes') diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl index 2f8e5c3aa..f9b286d5f 100644 --- a/themes/default/template/index.tpl +++ b/themes/default/template/index.tpl @@ -167,8 +167,7 @@ jQuery("#derivativeSwitchBox").on("mouseleave", function() { {if !empty($CATEGORIES)}{$CATEGORIES}{/if} {if !empty($cats_navbar)} - {assign var=navbar value=$cats_navbar} - {include file='navigation_bar.tpl'|@get_extent:'navbar'} + {include file='navigation_bar.tpl'|@get_extent:'navbar' navbar=$cats_navbar} {/if} {if !empty($THUMBNAILS)} @@ -177,8 +176,7 @@ jQuery("#derivativeSwitchBox").on("mouseleave", function() { {/if} {if !empty($thumb_navbar)} - {assign var=navbar value=$thumb_navbar} - {include file='navigation_bar.tpl'|@get_extent:'navbar'} + {include file='navigation_bar.tpl'|@get_extent:'navbar' navbar=$thumb_navbar} {/if} {if !empty($PLUGIN_INDEX_CONTENT_END)}{$PLUGIN_INDEX_CONTENT_END}{/if} diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl index d393f5b89..7713c7555 100644 --- a/themes/default/template/picture.tpl +++ b/themes/default/template/picture.tpl @@ -2,7 +2,7 @@ {include file='include/autosize.inc.tpl'} *} {if isset($MENUBAR)}{$MENUBAR}{/if} -
+
{if isset($errors) or not empty($infos)} {include file='infos_errors.tpl'} {/if} -- cgit v1.2.3