Changeset 13736 for trunk/themes

Timestamp:

Mar 26, 2012, 6:07:03 AM (12 years ago)

Author:

rvelices

Message:

• 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

Location:

trunk/themes/default/template

Files:

• index.tpl (modified) (4 diffs)
• picture.tpl (modified) (1 diff)

trunk/themes/default/template/index.tpl

@@ -8 +8 @@
                         <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}
@@ -19 +19 @@
                 </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";
@@ -39 +39 @@
                         <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}
@@ -50 +50 @@
                 </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";

trunk/themes/default/template/picture.tpl

@@ -54 +54 @@
 {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}