Changeset 13683 for trunk/themes

Timestamp:

Mar 23, 2012, 10:58:12 PM (12 years ago)

Author:

plg

Message:

feature 2598: add sizes XXS and XS

new label for sizes

On picture.php, the current size is "checked" and javascript refreshed when switched (with jQuery)

jQuery loaded by default on header.tpl (already loaded by thumbnails.tpl)

Location:

trunk/themes

Files:

• Sylvia/theme.css (modified) (1 diff)
• default/template/header.tpl (modified) (1 diff)
• default/template/index.tpl (modified) (2 diffs)
• default/template/picture.tpl (modified) (2 diffs)
• default/theme.css (modified) (1 diff)
• elegant/theme.css (modified) (1 diff)

trunk/themes/Sylvia/theme.css

@@ -464 +464 @@
   background-color:#666;
 }
+
+#derivativeSwitchBox, #sortOrderBox {
+    background-color: #222222;
+    border: 1px solid #FF3363;
+    border-radius: 0 15px 0 15px;
+}
+
+.switchBoxTitle {
+  border-color:#666;
+}

trunk/themes/default/template/header.tpl

@@ -50 +50 @@
 <![endif]-->
 
+{combine_script id="jquery"}
+
 {if not empty($head_elements)}
         {foreach from=$head_elements item=elt}{$elt}

trunk/themes/default/template/index.tpl

@@ -9 +9 @@
                 </a>
                 <div id="sortOrderBox" style="display:none; text-align:left" onclick="toggleSortOrderBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleSortOrderBox()">
-                        {'Sort order'|@translate}<hr>
+                        <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}
-                        <span>{$image_order.DISPLAY}</span>
+                        <span>&#x2714; {$image_order.DISPLAY}</span>
                         {else}
                         <a href="{$image_order.URL}" rel="nofollow">{$image_order.DISPLAY}</a>
@@ -40 +40 @@
                 </a>
                 <div id="derivativeSwitchBox" style="display:none; text-align:left" onclick="toggleImageDerivativesBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleImageDerivativesBox()">
-                        {'Photo sizes'|@translate}<hr>
+                        <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}
-                        <span>{$image_derivative.DISPLAY}</span>
+                        <span>&#x2714; {$image_derivative.DISPLAY}</span>
                         {else}
                         <a href="{$image_derivative.URL}" rel="nofollow">{$image_derivative.DISPLAY}</a>

trunk/themes/default/template/picture.tpl

@@ -30 +30 @@
                 theImg.useMap = "#map"+typeMap;
         }
+  jQuery('.derivativeChecked').hide();
+  jQuery('#derivativeChecked'+typeSave).show();
         document.cookie = 'picture_deriv='+typeSave+';path={/literal}{$COOKIE_PATH}{literal}';
 }
@@ -51 +53 @@
 <span class="pwg-icon pwg-icon-sizes">&nbsp;</span><span class="pwg-button-text">{'Photo sizes'|@translate}</span></a>
 <div id="derivativeSwitchBox" onclick="toggleDerivativeSwitchBox()" style="display:none">
+<div class="switchBoxTitle">{'Photo sizes'|@translate}</div>
 {foreach from=$current.unique_derivatives item=derivative key=derivative_type}
-<a href="javascript:changeImgSrc('{$derivative->get_url()|@escape:javascript}','{$derivative_type}','{$derivative->get_type()}')">{$derivative->get_type()|@translate} ({$derivative->get_size_hr()})</a><br>
+<span class="derivativeChecked" id="derivativeChecked{$derivative->get_type()}" {if $derivative->get_type() ne $current.selected_derivative->get_type()}style="display:none"{/if}>&#x2714;</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>
 {/foreach}
 {if isset($U_ORIGINAL)}

trunk/themes/default/theme.css

@@ -342 +342 @@
 
 #derivativeSwitchBox, #sortOrderBox {
-        padding: 0.5em 1em;
+        padding: 0.5em 10px;
         border-radius: 4px;
         z-index: 100;
+  text-align:left;
+}
+
+.switchBoxTitle {
+  border-bottom:1px solid #000;
+  padding-bottom:5px;
+  margin-bottom:5px;
 }
 

trunk/themes/elegant/theme.css

@@ -107 +107 @@
 
 /* borders */
-#derivativeSwitchBox, #sortOrderBox{
-        border: 1px solid #000;
+#derivativeSwitchBox, #sortOrderBox {
+        border: 2px solid #444;
 }
+
+.switchBoxTitle {
+  border-bottom:2px solid #444;
+}
+
+.derivativeSizeDetails {display:none}
 
 FIELDSET, INPUT, SELECT, TEXTAREA {