diff options
Diffstat (limited to '')
-rw-r--r-- | themes/default/template/comment_list.tpl | 12 | ||||
-rw-r--r-- | themes/default/template/picture.tpl | 34 | ||||
-rw-r--r-- | themes/default/template/picture_nav_buttons.tpl | 8 |
3 files changed, 24 insertions, 30 deletions
diff --git a/themes/default/template/comment_list.tpl b/themes/default/template/comment_list.tpl index 315cbfe07..b73cc39e2 100644 --- a/themes/default/template/comment_list.tpl +++ b/themes/default/template/comment_list.tpl @@ -1,18 +1,17 @@ {if isset($comment_derivative_params)} {strip}{html_style} -.commentElement DIV.illustration{ldelim} - width: {$comment_derivative_params->max_width()+5}px; +.commentElement .illustration{ldelim} + width: {$comment_derivative_params->max_width()+5}px } .content .commentElement .description{ldelim} - height: {$comment_derivative_params->max_height()+5}px; + height: {$comment_derivative_params->max_height()+5}px } {/html_style}{/strip} {/if} <ul class="commentsList"> {foreach from=$comments item=comment name=comment_loop} -<li> - <div class="commentElement {if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}"> +<li class="commentElement {if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}"> {if isset($comment.src_image)} <div class="illustration"> <a href="{$comment.U_PICTURE}"> @@ -41,7 +40,7 @@ </div> {/if} - <span class="author">{$comment.AUTHOR}</span> - <span class="date">{$comment.DATE}</span> + <span class="commentAuthor">{$comment.AUTHOR}</span> - <span class="commentDate">{$comment.DATE}</span> {if isset($comment.IN_EDIT)} <a name="edit_comment"></a> <form method="post" action="{$comment.U_EDIT}" class="filter" id="editComment"> @@ -57,7 +56,6 @@ <blockquote><div>{$comment.CONTENT}</div></blockquote> {/if} </div> - </div> </li> {/foreach} </ul> diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl index 723c0bc8c..ee96dac63 100644 --- a/themes/default/template/picture.tpl +++ b/themes/default/template/picture.tpl @@ -58,7 +58,7 @@ jQuery("#derivativeSwitchBox").on('mouseleave click', function() { <div id="derivativeSwitchBox" class="switchBox" style="display:none"> <div class="switchBoxTitle">{'Photo sizes'|@translate}</div> {foreach from=$current.unique_derivatives item=derivative key=derivative_type} -<span class="switchCheck" id="derivativeChecked{$derivative_type}"{if $derivative->get_type() ne $current.selected_derivative->get_type()} style="visibility:hidden"{/if}>✔ </span> +<span class="switchCheck" id="derivativeChecked{$derivative_type}"{if $derivative->get_type() ne $current.selected_derivative->get_type()} style="visibility:hidden"{/if}>✔ </span> <a href="javascript:changeImgSrc('{$derivative->get_url()|@escape:javascript}','{$derivative_type}','{$derivative->get_type()}')"> {$derivative->get_type()|@translate}<span class="derivativeSizeDetails"> ({$derivative->get_size_hr()})</span> </a><br> @@ -138,10 +138,10 @@ y.callService( </p> {/if} -</div><!-- +</div> ---><div id="infoSwitcher"></div><!-- ---><div id="imageInfos"> +<div id="infoSwitcher"></div> +<div id="imageInfos"> {if $DISPLAY_NAV_THUMB} <div class="navThumbs"> {if isset($previous)} @@ -159,7 +159,7 @@ y.callService( </div> {/if} -<dl id="standard" class="imageInfoTable infoTable"> +<dl id="standard" class="imageInfoTable"> {strip} {if $display_info.author and isset($INFO_AUTHOR)} <div id="Author" class="imageInfo"> @@ -277,8 +277,8 @@ y.callService( <div id="Privacy" class="imageInfo"><div class="relSwitchBox"> <dt><a id="privacyLevelLink" href="javascript:togglePrivacyLevelBox()">{'Who can see this photo?'|@translate}</a></dt> <dd> -{combine_script id='core.scripts' require='jquery' load='async' path='themes/default/js/scripts.js'} -{footer_script} +{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'} +{footer_script require='jquery'} {literal}function setPrivacyLevel(rootUrl, id, level) { var y = new PwgWS(rootUrl); @@ -309,7 +309,7 @@ function togglePrivacyLevelBox() } {/literal} {/footer_script} - + <div id="privacyLevelBox" class="switchBox" onclick="togglePrivacyLevelBox()" style="display:none" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||togglePrivacyLevelBox()"> {foreach from=$available_permission_levels item=label key=level} <span id="levelCheck{$level}" class="switchCheck" {if $level != $current.level} style="visibility:hidden"{/if}>✔ </span> @@ -324,7 +324,7 @@ function togglePrivacyLevelBox() </dl> {if isset($metadata)} -<dl id="Metadata" class="imageInfoTable infoTable2"> +<dl id="Metadata" class="imageInfoTable"> {foreach from=$metadata item=meta} <h3>{$meta.TITLE}</h3> {foreach from=$meta.lines item=value key=label} @@ -341,25 +341,21 @@ function togglePrivacyLevelBox() {if isset($COMMENT_COUNT)} <div id="comments" {if (!isset($comment_add) && ($COMMENT_COUNT == 0))}class="noCommentContent"{else}class="commentContent"{/if}><div id="commentsSwitcher"></div> - {if $COMMENT_COUNT > 0} - <h3>{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}</h3> - {else} - <h3><span class="noCommentText">{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}</span></h3> - {/if} - + <h3>{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}</h3> + <div id="pictureComments"> {if isset($comment_add)} <div id="commentAdd"> <h4>{'Add a comment'|@translate}</h4> - <form method="post" action="{$comment_add.F_ACTION}" class="filter" id="addComment" > + <form method="post" action="{$comment_add.F_ACTION}" id="addComment" > {if $comment_add.SHOW_AUTHOR} <p><label>{'Author'|@translate} :</label></p> <p><input type="text" name="author" /></p> + <p><label>{'Comment'|@translate} :</label></p> {/if} - <p><label>{'Comment'|@translate} :</label></p> - <p><textarea name="content" id="contentid" rows="10" cols="50">{$comment_add.CONTENT}</textarea></p> + <p><textarea name="content" id="contentid" rows="5" cols="50">{$comment_add.CONTENT}</textarea></p> <p><input type="hidden" name="key" value="{$comment_add.KEY}" /> - <input class="submit" type="submit" value="{'Submit'|@translate}"></p> + <input class="submit" type="submit" value="{'Submit'|@translate}"></p> </form> </div> {/if} diff --git a/themes/default/template/picture_nav_buttons.tpl b/themes/default/template/picture_nav_buttons.tpl index 921a1de81..e6b2a1e1f 100644 --- a/themes/default/template/picture_nav_buttons.tpl +++ b/themes/default/template/picture_nav_buttons.tpl @@ -30,7 +30,7 @@ <span class="pwg-icon pwg-icon-repeat-stop"> </span><span class="pwg-button-text">{'Not repeat the slideshow'|@translate}</span> </a> {/if} -<!--{strip}{if isset($first)} +{*<!--{strip}{if isset($first)} <a href="{$first.U_IMG}" title="{'First'|@translate} : {$first.TITLE}" class="pwg-state-default pwg-button"> <span class="pwg-icon pwg-icon-arrowstop-w"> </span><span class="pwg-button-text">{'First'|@translate}</span> </a> @@ -38,7 +38,7 @@ <span class="pwg-state-disabled pwg-button"> <span class="pwg-icon pwg-icon-arrowstop-w"> </span><span class="pwg-button-text">{'First'|@translate}</span> </span> -{/if}{/strip}--> +{/if}{/strip}-->*} {strip}{if isset($previous)} <a href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" class="pwg-state-default pwg-button"> <span class="pwg-icon pwg-icon-arrow-w"> </span><span class="pwg-button-text">{'Previous'|@translate}</span> @@ -72,7 +72,7 @@ <span class="pwg-icon pwg-icon-arrow-e"> </span><span class="pwg-button-text">{'Next'|@translate}</span> </span> {/if}{/strip} -<!--{strip}{if isset($last)} +{*<!--{strip}{if isset($last)} <a href="{$last.U_IMG}" title="{'Last'|@translate} : {$last.TITLE}" class="pwg-state-default pwg-button pwg-button-icon-right"> <span class="pwg-icon pwg-icon-arrowstop-e"></span><span class="pwg-button-text">{'Last'|@translate}</span> </a> @@ -80,7 +80,7 @@ <span class="pwg-state-disabled pwg-button pwg-button-icon-right"> <span class="pwg-icon pwg-icon-arrowstop-e"> </span><span class="pwg-button-text">{'Last'|@translate}</span> </span> -{/if}{/strip}--> +{/if}{/strip}-->*} {/if} </div> {strip} |