mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-05-14 14:21:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

"home url" is not always absolute with host name + html compaction - through removal of unused attributes, some white spaces ...

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@14180 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2012-04-16 03:11:43 +00:00
parent c63d6a36e7
commit 28255b81a0
4 changed files with 30 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/functions_url.inc.php
View file

@ -135,7 +135,7 @@ function make_index_url($params = array())
if ($url == $url_before_params) if ($url == $url_before_params)
{ {
$url = get_absolute_root_url(); $url = get_absolute_root_url( url_is_remote($url) );
} }
return $url; return $url;

3
themes/default/template/index.tpl
View file

@ -30,7 +30,6 @@ jQuery("#sortOrderBox").on("mouseleave", function() {
{/literal}{/footer_script} {/literal}{/footer_script}
{/strip}</li> {/strip}</li>
{/if} {/if}
{if !empty($image_derivatives)} {if !empty($image_derivatives)}
<li>{strip}<a id="derivativeSwitchLink" title="{'Photo sizes'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> <li>{strip}<a id="derivativeSwitchLink" title="{'Photo sizes'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
<span class="pwg-icon pwg-icon-sizes">&nbsp;</span><span class="pwg-button-text">{'Photo sizes'|@translate}</span> <span class="pwg-icon pwg-icon-sizes">&nbsp;</span><span class="pwg-button-text">{'Photo sizes'|@translate}</span>
@ -41,7 +40,7 @@ jQuery("#sortOrderBox").on("mouseleave", function() {
{if $image_derivative.SELECTED} {if $image_derivative.SELECTED}
<span>&#x2714; </span>{$image_derivative.DISPLAY} <span>&#x2714; </span>{$image_derivative.DISPLAY}
{else} {else}
<span style="visibility:hidden">&#x2714; </span><a href="{$image_derivative.URL}" class="switchUnselected" rel="nofollow">{$image_derivative.DISPLAY}</a> <span style="visibility:hidden">&#x2714; </span><a href="{$image_derivative.URL}" rel="nofollow">{$image_derivative.DISPLAY}</a>
{/if} {/if}
{/foreach} {/foreach}
</div> </div>

10
themes/default/template/picture.tpl
View file

@ -18,7 +18,6 @@
<div class="imageNumber">{$PHOTO}</div> <div class="imageNumber">{$PHOTO}</div>
{include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'} {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'}
<div class="actionButtons"> <div class="actionButtons">
{if count($current.unique_derivatives)>1} {if count($current.unique_derivatives)>1}
{footer_script require='jquery'}{literal} {footer_script require='jquery'}{literal}
function changeImgSrc(url,typeSave,typeMap) function changeImgSrc(url,typeSave,typeMap)
@ -34,7 +33,6 @@ function changeImgSrc(url,typeSave,typeMap)
jQuery('#derivativeChecked'+typeSave).css('visibility','visible'); jQuery('#derivativeChecked'+typeSave).css('visibility','visible');
document.cookie = 'picture_deriv='+typeSave+';path={/literal}{$COOKIE_PATH}{literal}'; document.cookie = 'picture_deriv='+typeSave+';path={/literal}{$COOKIE_PATH}{literal}';
} }
jQuery("#derivativeSwitchLink").click(function() { jQuery("#derivativeSwitchLink").click(function() {
var elt = jQuery("#derivativeSwitchBox"); var elt = jQuery("#derivativeSwitchBox");
elt.css("left", Math.min( jQuery(this).offset().left, jQuery(window).width() - elt.outerWidth(true) - 5)) 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> </div>
{/strip} {/strip}
{/if} {/if}
{strip}{if isset($U_SLIDESHOW_START)} {strip}{if isset($U_SLIDESHOW_START)}
<a href="{$U_SLIDESHOW_START}" title="{'slideshow'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> <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> <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)} {if isset($COMMENT_IMG)}
<p class="imageComment">{$COMMENT_IMG}</p> <p class="imageComment">{$COMMENT_IMG}</p>
{/if} {/if}
{if isset($U_SLIDESHOW_STOP)} {if isset($U_SLIDESHOW_STOP)}
<p> <p>
[ <a href="{$U_SLIDESHOW_STOP}">{'stop the slideshow'|@translate}</a> ] [ <a href="{$U_SLIDESHOW_STOP}">{'stop the slideshow'|@translate}</a> ]
@ -342,11 +338,11 @@ function togglePrivacyLevelBox()
<form method="post" action="{$comment_add.F_ACTION}" id="addComment"> <form method="post" action="{$comment_add.F_ACTION}" id="addComment">
{if $comment_add.SHOW_AUTHOR} {if $comment_add.SHOW_AUTHOR}
<p><label>{'Author'|@translate} :</label></p> <p><label>{'Author'|@translate} :</label></p>
<p><input type="text" name="author" /></p> <p><input type="text" name="author"></p>
<p><label>{'Comment'|@translate} :</label></p> <p><label>{'Comment'|@translate} :</label></p>
{/if} {/if}
<p><textarea name="content" id="contentid" rows="5" 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}" /> <p><input type="hidden" name="key" value="{$comment_add.KEY}">
<input type="submit" value="{'Submit'|@translate}"></p> <input type="submit" value="{'Submit'|@translate}"></p>
</form> </form>
</div> </div>
@ -364,7 +360,7 @@ function togglePrivacyLevelBox()
{include file='comment_list.tpl'} {include file='comment_list.tpl'}
</div> </div>
{/if} {/if}
<div style="clear: both;"></div> <div style="clear:both"></div>
</div> </div>
</div> </div>

7
themes/default/template/picture_content.tpl
View file

@ -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()}" <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}">
{if isset($COMMENT_IMG)}
title="{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}" {else} title="{$current.TITLE|@replace:'"':' '} - {$ALT_IMG}"
{/if}>
{foreach from=$current.unique_derivatives item=derivative key=derivative_type}{strip} {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()} {assign var='size' value=$derivative->get_size()}
{if isset($previous)} {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}"> <area shape=rect coords="0,0,{$size[0]/4|@intval},{$size[1]}" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" alt="{$previous.TITLE}">