aboutsummaryrefslogtreecommitdiffstats
path: root/themes/default/template
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-03-26 04:07:03 +0000
committerrvelices <rv-github@modusoptimus.com>2012-03-26 04:07:03 +0000
commit9d66c18541edd35e69e0acb739d9c4def2b4bf5e (patch)
tree94b35a512999e1783d52ed9b4a1071b4dc015990 /themes/default/template
parentc537b5144f2f0b8be300dd76d3388a4232d85951 (diff)
- small js fixes on index/picture
- i.php does not use derivatives.dat file anymore (obsolete file) - better selection of derivatives in picture.php - larger sharpen real range in image.class.php git-svn-id: http://piwigo.org/svn/trunk@13736 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--themes/default/template/index.tpl12
-rw-r--r--themes/default/template/picture.tpl2
2 files changed, 7 insertions, 7 deletions
diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl
index c1f9d42a9..a78281aa5 100644
--- a/themes/default/template/index.tpl
+++ b/themes/default/template/index.tpl
@@ -7,7 +7,7 @@
<li>{strip}<a href="javascript:toggleSortOrderBox()" id="sortOrderLink" title="{'Sort order'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
<span class="pwg-icon pwg-icon-sort">&nbsp;</span><span class="pwg-button-text">{'Sort order'|@translate}</span>
</a>
- <div id="sortOrderBox" class="switchBox" style="display:none; text-align:left" onclick="toggleSortOrderBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleSortOrderBox()">
+ <div id="sortOrderBox" class="switchBox" style="display:none; text-align:left" onclick="toggleSortOrderBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleSortOrderBox(1)">
<div class="switchBoxTitle">{'Sort order'|@translate}</div>
{foreach from=$image_orders item=image_order name=loop}{if !$smarty.foreach.loop.first}<br>{/if}
{if $image_order.SELECTED}
@@ -18,10 +18,10 @@
{/foreach}
</div>
{footer_script}{literal}
-function toggleSortOrderBox() {
+function toggleSortOrderBox(forceHide) {
var elt = document.getElementById("sortOrderBox"),
ePos = document.getElementById("sortOrderLink");
- if (elt.style.display==="none") {
+ if (!forceHide && elt.style.display==="none") {
elt.style.position = "absolute";
elt.style.left = ePos.offsetLeft+"px";
elt.style.top = (ePos.offsetTop+ePos.offsetHeight)+"px";
@@ -38,7 +38,7 @@ function toggleSortOrderBox() {
<li>{strip}<a href="javascript:toggleImageDerivativesBox()" id="derivativeChooseLink" 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>
</a>
- <div id="derivativeSwitchBox" class="switchBox" style="display:none; text-align:left" onclick="toggleImageDerivativesBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleImageDerivativesBox()">
+ <div id="derivativeSwitchBox" class="switchBox" style="display:none; text-align:left" onclick="toggleImageDerivativesBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleImageDerivativesBox(1)">
<div class="switchBoxTitle">{'Photo sizes'|@translate}</div>
{foreach from=$image_derivatives item=image_derivative name=loop}{if !$smarty.foreach.loop.first}<br>{/if}
{if $image_derivative.SELECTED}
@@ -49,10 +49,10 @@ function toggleSortOrderBox() {
{/foreach}
</div>
{footer_script}{literal}
-function toggleImageDerivativesBox() {
+function toggleImageDerivativesBox(forceHide) {
var elt = document.getElementById("derivativeSwitchBox"),
ePos = document.getElementById("derivativeChooseLink");
- if (elt.style.display==="none") {
+ if (!forceHide && elt.style.display==="none") {
elt.style.position = "absolute";
elt.style.left = ePos.offsetLeft+"px";
elt.style.top = (ePos.offsetTop+ePos.offsetHeight)+"px";
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index da8309baa..ee4ec5f85 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -53,7 +53,7 @@ function toggleDerivativeSwitchBox()
{/literal}{/footer_script}
{strip}<a id="derivativeSwitchLink" href="javascript:toggleDerivativeSwitchBox()" 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></a>
-<div id="derivativeSwitchBox" class="switchBox" onclick="toggleDerivativeSwitchBox()" style="display:none" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleDerivativeSwitchBox()">
+<div id="derivativeSwitchBox" class="switchBox" onclick="toggleDerivativeSwitchBox()" style="display:none" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e.parentNode.parentNode==this||e==this||toggleDerivativeSwitchBox()">
<div class="switchBoxTitle">{'Photo sizes'|@translate}</div>
{foreach from=$current.unique_derivatives item=derivative key=derivative_type}
<span class="derivativeChecked switchCheck"