aboutsummaryrefslogtreecommitdiffstats
path: root/template/yoga
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2008-10-16 00:53:15 +0000
committerrvelices <rv-github@modusoptimus.com>2008-10-16 00:53:15 +0000
commite9c0f98e1477434eec4e8b74c1ba1ca972dec2da (patch)
tree1fc5fd2343a88386ac0fd584fafc1bd4d14c4666 /template/yoga
parentebc3c2e2f7d9408db7e5335d63fdd2a003c3d79a (diff)
merge r 2758 from branch 2.0 to trunk
git-svn-id: http://piwigo.org/svn/trunk@2759 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'template/yoga')
-rw-r--r--template/yoga/picture.tpl6
-rw-r--r--template/yoga/slideshow.tpl2
2 files changed, 4 insertions, 4 deletions
diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl
index 6b5468fff..d6a99decf 100644
--- a/template/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -28,7 +28,7 @@
<div id="imageHeaderBar">
<div class="browsePath">
<a href="{$U_HOME}" rel="home">{'home'|@translate}</a>
- {if $SECTION_TITLE != 'no_category'|@translate}{$LEVEL_SEPARATOR}{$SECTION_TITLE}{/if}
+ {if !$IS_HOME}{$LEVEL_SEPARATOR}{$SECTION_TITLE}{/if}
{$LEVEL_SEPARATOR}{$current.TITLE}
</div>
<div class="imageNumber">{$PHOTO}</div>
@@ -80,7 +80,7 @@ y.callService(
<a href="{$U_CADDIE}" onclick="addToCadie(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}); return false;" title="{'add to caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"></a>
{/if}{*caddie management END*}
</div>
- {include file=$FILE_PICTURE_NAV_BUTTONS}
+ {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'}
</div> <!-- imageToolBar -->
<div id="theImage">
@@ -251,7 +251,7 @@ y.callService(
{if isset($COMMENT_COUNT)}
<div id="comments">
- <h3>[{$COMMENT_COUNT}] {'comments_title'|@translate}</h3>
+ <h3>{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}</h3>
{if !empty($COMMENT_NAV_BAR)}
<div class="navigationBar">{$COMMENT_NAV_BAR}</div>
diff --git a/template/yoga/slideshow.tpl b/template/yoga/slideshow.tpl
index 1bbc0029f..f429702e6 100644
--- a/template/yoga/slideshow.tpl
+++ b/template/yoga/slideshow.tpl
@@ -12,7 +12,7 @@
</div>
<div id="imageToolBar">
- {include file=$FILE_PICTURE_NAV_BUTTONS}
+ {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'}
</div>
<div id="theImage">