diff options
| -rw-r--r-- | include/functions_url.inc.php | 2 | ||||
| -rw-r--r-- | themes/default/template/index.tpl | 3 | ||||
| -rw-r--r-- | themes/default/template/picture.tpl | 54 | ||||
| -rw-r--r-- | themes/default/template/picture_content.tpl | 9 |
4 files changed, 30 insertions, 38 deletions
diff --git a/include/functions_url.inc.php b/include/functions_url.inc.php index 5f86495e4..34c9bbfbd 100644 --- a/include/functions_url.inc.php +++ b/include/functions_url.inc.php @@ -135,7 +135,7 @@ function make_index_url($params = array()) if ($url == $url_before_params) { - $url = get_absolute_root_url(); + $url = get_absolute_root_url( url_is_remote($url) ); } return $url; diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl index 394add583..14045342a 100644 --- a/themes/default/template/index.tpl +++ b/themes/default/template/index.tpl @@ -30,7 +30,6 @@ jQuery("#sortOrderBox").on("mouseleave", function() { {/literal}{/footer_script} {/strip}</li> {/if} - {if !empty($image_derivatives)} <li>{strip}<a id="derivativeSwitchLink" title="{'Photo sizes'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> <span class="pwg-icon pwg-icon-sizes"> </span><span class="pwg-button-text">{'Photo sizes'|@translate}</span> @@ -41,7 +40,7 @@ jQuery("#sortOrderBox").on("mouseleave", function() { {if $image_derivative.SELECTED} <span>✔ </span>{$image_derivative.DISPLAY} {else} - <span style="visibility:hidden">✔ </span><a href="{$image_derivative.URL}" class="switchUnselected" rel="nofollow">{$image_derivative.DISPLAY}</a> + <span style="visibility:hidden">✔ </span><a href="{$image_derivative.URL}" rel="nofollow">{$image_derivative.DISPLAY}</a> {/if} {/foreach} </div> diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl index 6d1a6aba9..cddabf26e 100644 --- a/themes/default/template/picture.tpl +++ b/themes/default/template/picture.tpl @@ -18,7 +18,6 @@ <div class="imageNumber">{$PHOTO}</div> {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'} <div class="actionButtons"> - {if count($current.unique_derivatives)>1} {footer_script require='jquery'}{literal} function changeImgSrc(url,typeSave,typeMap) @@ -34,7 +33,6 @@ function changeImgSrc(url,typeSave,typeMap) jQuery('#derivativeChecked'+typeSave).css('visibility','visible'); document.cookie = 'picture_deriv='+typeSave+';path={/literal}{$COOKIE_PATH}{literal}'; } - jQuery("#derivativeSwitchLink").click(function() { var elt = jQuery("#derivativeSwitchBox"); elt.css("left", Math.min( jQuery(this).offset().left, jQuery(window).width() - elt.outerWidth(true) - 5)) @@ -62,7 +60,6 @@ jQuery("#derivativeSwitchBox").on("mouseleave click", function() { </div> {/strip} {/if} - {strip}{if isset($U_SLIDESHOW_START)} <a href="{$U_SLIDESHOW_START}" title="{'slideshow'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> <span class="pwg-icon pwg-icon-slideshow"> </span><span class="pwg-button-text">{'slideshow'|@translate}</span> @@ -124,7 +121,6 @@ y.callService( {if isset($COMMENT_IMG)} <p class="imageComment">{$COMMENT_IMG}</p> {/if} - {if isset($U_SLIDESHOW_STOP)} <p> [ <a href="{$U_SLIDESHOW_STOP}">{'stop the slideshow'|@translate}</a> ] @@ -337,34 +333,34 @@ function togglePrivacyLevelBox() <div id="pictureComments"> {if isset($comment_add)} - <div id="commentAdd"> - <h4>{'Add a comment'|@translate}</h4> - <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><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 type="submit" value="{'Submit'|@translate}"></p> - </form> - </div> + <div id="commentAdd"> + <h4>{'Add a comment'|@translate}</h4> + <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><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 type="submit" value="{'Submit'|@translate}"></p> + </form> + </div> {/if} {if isset($comments)} - <div id="pictureCommentList"> - {if (($COMMENT_COUNT > 2) || !empty($navbar))} - <div id="pictureCommentNavBar"> - {if $COMMENT_COUNT > 2} - <a href="{$COMMENTS_ORDER_URL}#comments" rel="nofollow" class="commentsOrder">{$COMMENTS_ORDER_TITLE}</a> - {/if} - {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if} - </div> - {/if} - {include file='comment_list.tpl'} - </div> + <div id="pictureCommentList"> + {if (($COMMENT_COUNT > 2) || !empty($navbar))} + <div id="pictureCommentNavBar"> + {if $COMMENT_COUNT > 2} + <a href="{$COMMENTS_ORDER_URL}#comments" rel="nofollow" class="commentsOrder">{$COMMENTS_ORDER_TITLE}</a> + {/if} + {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if} + </div> + {/if} + {include file='comment_list.tpl'} + </div> {/if} - <div style="clear: both;"></div> + <div style="clear:both"></div> </div> </div> diff --git a/themes/default/template/picture_content.tpl b/themes/default/template/picture_content.tpl index abf3766c6..d0fb1e178 100644 --- a/themes/default/template/picture_content.tpl +++ b/themes/default/template/picture_content.tpl @@ -1,10 +1,7 @@ -<img src="{$current.selected_derivative->get_url()}" {$current.selected_derivative->get_size_htm()} alt="{$ALT_IMG}" id="theMainImage" usemap="#map{$current.selected_derivative->get_type()}" -{if isset($COMMENT_IMG)} - title="{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}" {else} title="{$current.TITLE|@replace:'"':' '} - {$ALT_IMG}" -{/if}> +<img src="{$current.selected_derivative->get_url()}" {$current.selected_derivative->get_size_htm()} alt="{$ALT_IMG}" id="theMainImage" usemap="#map{$current.selected_derivative->get_type()}" title="{if isset($COMMENT_IMG)}{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}{else}{$current.TITLE|@replace:'"':' '} - {$ALT_IMG}{/if}"> {foreach from=$current.unique_derivatives item=derivative key=derivative_type}{strip} -<map name="map{$derivative->get_type()}" id="map{$derivative->get_type()}"> +<map name="map{$derivative->get_type()}"> {assign var='size' value=$derivative->get_size()} {if isset($previous)} <area shape=rect coords="0,0,{$size[0]/4|@intval},{$size[1]}" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" alt="{$previous.TITLE}"> @@ -14,4 +11,4 @@ <area shape=rect coords="{$size[0]/1.33|@intval},0,{$size[0]},{$size[1]}" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE}" alt="{$next.TITLE}"> {/if} </map> -{/strip}{/foreach} +{/strip}{/foreach}
\ No newline at end of file |