aboutsummaryrefslogtreecommitdiffstats
path: root/themes/default
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-11-06 20:46:56 +0000
committerrvelices <rv-github@modusoptimus.com>2012-11-06 20:46:56 +0000
commit0251c5122ed92522577834566fc365449b5a7425 (patch)
treeb14b4b8e2b2520701c92c7b38cc964a00e176786 /themes/default
parent67748f5ccb5e8972076e479f41091b004b8e88ea (diff)
- 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
Diffstat (limited to '')
-rw-r--r--themes/default/template/index.tpl6
-rw-r--r--themes/default/template/picture.tpl2
2 files changed, 3 insertions, 5 deletions
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() {
</ul>
{/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}
-<div id="content" {if isset($MENUBAR)}class="contentWithMenu"{/if}>
+<div id="content"{if isset($MENUBAR)} class="contentWithMenu"{/if}>
{if isset($errors) or not empty($infos)}
{include file='infos_errors.tpl'}
{/if}