merge r11062 from trunk

git-svn-id: http://piwigo.org/svn/branches/2.2@11063 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100
2011-05-26 11:37:50 +00:00
parent 1d3caa2ced
commit b06f2a641c
2 changed files with 2 additions and 2 deletions

View File

@@ -95,7 +95,7 @@ y.callService(
{$ELEMENT_CONTENT}
{if isset($COMMENT_IMG)}
<p>{$COMMENT_IMG}</p>
<p class="imageComment">{$COMMENT_IMG}</p>
{/if}
{if isset($U_SLIDESHOW_STOP)}

View File

@@ -2,7 +2,7 @@
{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
<a href="javascript:phpWGOpenWindow('{$high.U_HIGH}','{$high.UUID}','scrollbars=yes,toolbar=no,status=no,resizable=yes')">
{/if}
<img src="{$SRC_IMG}" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;" alt="{$ALT_IMG}"
<img src="{$SRC_IMG}" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;" alt="{$ALT_IMG}" id="theMainImage"
{if isset($COMMENT_IMG)}
title="{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}" {else} title="{$current.TITLE|@replace:'"':' '} - {$ALT_IMG}"
{/if}>