From 6ee66d829b5508e4f9a98e33164d32aedfeb9ec9 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Wed, 2 Feb 2011 09:35:48 +0000
Subject: bug 2172 fixed: the "sort order" options are removed from the album
 administration main page.

bug 2173 fixed: rename "manual order" into "automatic order" and "by rank" into "manual order"

bug 2174 fixed: only show the automatic order options when it's relevant

new icon for the "manage photo order" screen

hide the numeric rank below the thumbnail (it is confusing for users)

tell users that you can drag'n drop to reorder photos

bug fixed: the "apply to sub-albums" options for photo orders was not working


git-svn-id: http://piwigo.org/svn/trunk@9051 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/themes/clear/icon/ranks.png                  | Bin 423 -> 682 bytes
 admin/themes/clear/theme.css                       |   4 ++++
 admin/themes/default/template/cat_modify.tpl       |  22 +----------------
 .../themes/default/template/element_set_ranks.tpl  |  26 ++++++++++++---------
 admin/themes/default/thumbnails.css                |  13 ++++-------
 5 files changed, 24 insertions(+), 41 deletions(-)

(limited to 'admin/themes')

diff --git a/admin/themes/clear/icon/ranks.png b/admin/themes/clear/icon/ranks.png
index f48b394aa..e0a308f2b 100644
Binary files a/admin/themes/clear/icon/ranks.png and b/admin/themes/clear/icon/ranks.png differ
diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css
index f9454346c..37502efba 100644
--- a/admin/themes/clear/theme.css
+++ b/admin/themes/clear/theme.css
@@ -261,3 +261,7 @@ display:block; height:85px; left:225px; position:relative; top:-42px; width:313p
 .languageBox {background-color:#ddd;}
 .languageName {color:black;}
 .languageDefault {background-color:#dbe8f3;}
+
+UL.thumbnails li.rank-of-image { 
+  background-color: #ddd;
+}
\ No newline at end of file
diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl
index 4c6ebe7fb..8c51785e2 100644
--- a/admin/themes/default/template/cat_modify.tpl
+++ b/admin/themes/default/template/cat_modify.tpl
@@ -14,8 +14,8 @@
   {/if}
   {if isset($U_MANAGE_ELEMENTS) }
   <li><a href="{$U_MANAGE_ELEMENTS}" title="{'manage album photos'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'Photos'|@translate}"></a></li>
-  <li><a href="{$U_MANAGE_RANKS}" title="{'manage photo ranks'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/ranks.png" class="button" alt="{'ranks'|@translate}"></a></li>
   {/if}
+  <li><a href="{$U_MANAGE_RANKS}" title="{'manage photo ranks'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/ranks.png" class="button" alt="{'ranks'|@translate}"></a></li>
   <li><a href="{$U_CHILDREN}" title="{'manage sub-albums'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_children.png" class="button" alt="{'sub-albums'|@translate}"></a></li>
   {if isset($U_MANAGE_PERMISSIONS) }
   <li><a href="{$U_MANAGE_PERMISSIONS}" title="{'edit album permissions'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_permissions.png" class="button" alt="{'Permissions'|@translate}"></a></li>
@@ -88,26 +88,6 @@
   </table>
 </fieldset>
 
-<fieldset id="image_order">
-  <legend>{'Sort order'|@translate}</legend>
-  <input type="checkbox" name="image_order_default" id="image_order_default" {$IMG_ORDER_DEFAULT}>
-  <label for="image_order_default">{'Use the default photo sort order (defined in the configuration file)'|@translate}</label>
-  <br>
-  <input type="checkbox" name="image_order_subcats" id="image_order_subcats">
-  <label for="image_order_subcats">{'Apply to sub-albums'|@translate}</label>
-  <br>
-  
-  {foreach from=$image_orders item=order}
-    <select name="order_field_{$order.ID}">
-      {html_options options=$image_order_field_options selected=$order.FIELD }
-    </select>
-    <select name="order_direction_{$order.ID}">
-      {html_options options=$image_order_direction_options selected=$order.DIRECTION }
-    </select><br>
-  {/foreach}
-  
-</fieldset>
-
 <p style="text-align:center;">
   <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit">
   <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset">
diff --git a/admin/themes/default/template/element_set_ranks.tpl b/admin/themes/default/template/element_set_ranks.tpl
index 84fc33b40..808f35531 100644
--- a/admin/themes/default/template/element_set_ranks.tpl
+++ b/admin/themes/default/template/element_set_ranks.tpl
@@ -36,12 +36,13 @@ jQuery(document).ready(function() {
 
 <h3>{$CATEGORIES_NAV}</h3>
 
-{if !empty($thumbnails)}
 <form action="{$F_ACTION}" method="post">
+{if !empty($thumbnails)}
   <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit"></p>
   <fieldset>
-    <legend>{'Edit ranks'|@translate}</legend>
+    <legend>{'Manual order'|@translate}</legend>
     {if !empty($thumbnails)}
+    <p>{'Drag to re-order'|@translate}</p>
     <ul class="thumbnails">
       {foreach from=$thumbnails item=thumbnail}
       <li class="rank-of-image">
@@ -50,12 +51,13 @@ jQuery(document).ready(function() {
 	    <img src="{$thumbnail.TN_SRC}" class="thumbnail" alt="">
 	  </div>
 	</div>
-        <input type="text" name="rank_of_image[{$thumbnail.ID}]" value="{$thumbnail.RANK}">
+        <input type="text" name="rank_of_image[{$thumbnail.ID}]" value="{$thumbnail.RANK}" style="display:none">
       </li>
       {/foreach}
     </ul>
     {/if}
   </fieldset>
+{/if}
 
   <fieldset>
     <legend>{'Sort order'|@translate}</legend>
@@ -65,11 +67,11 @@ jQuery(document).ready(function() {
     </p>
     <p class="field">
       <input type="radio" name="image_order_choice" id="image_order_rank" value="rank"{if $image_order_choice=='rank'} checked="checked"{/if}>
-      <label for="image_order_rank">{'By rank'|@translate}</label>
+      <label for="image_order_rank">{'manual order'|@translate}</label>
     </p>
     <p class="field">
       <input type="radio" name="image_order_choice" id="image_order_user_define" value="user_define"{if $image_order_choice=='user_define'} checked="checked"{/if}>
-      <label for="image_order_user_define">{'Manual order'|@translate}</label>
+      <label for="image_order_user_define">{'automatic order'|@translate}</label>
       <div id="image_order_user_define_options">
       {foreach from=$image_orders item=order}
       <p class="field">
@@ -83,10 +85,12 @@ jQuery(document).ready(function() {
       {/foreach}
       </div>
   </fieldset>
-  <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit"></p>
-</form>
-
+  <p>
+    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit">
 
-{else}
-<div class="infos"><p>{'No photo in this album'|@translate}</p></div>
-{/if}
+    <label>
+      <input type="checkbox" name="image_order_subcats" id="image_order_subcats">
+      {'Apply to sub-albums'|@translate}
+    </label>
+  </p>
+</form>
diff --git a/admin/themes/default/thumbnails.css b/admin/themes/default/thumbnails.css
index 993c21535..b43edd752 100644
--- a/admin/themes/default/thumbnails.css
+++ b/admin/themes/default/thumbnails.css
@@ -6,19 +6,18 @@ UL.thumbnails {
 UL.thumbnails LI { display: inline }
 UL.thumbnails li.rank-of-image { 
   float: left;
-  background-color: #111;
-  border: 1px solid #666;
+  background-color: #333;
   color: #666;
-  -moz-border-radius: 4px;
+  -moz-border-radius: 5px;
   display: block;
   width: 104px;
-  height: 128px;
+  height: 104px;
   cursor: move;
   margin: 10px;
 }
 UL.thumbnails li.rank-of-image img {
   margin: 0 20px;
-  padding: 4px 2px;
+  padding: 8px 2px;
   float: left;
 }
 .clipwrapper {
@@ -30,10 +29,6 @@ UL.thumbnails li.rank-of-image img {
   position:absolute;
 }
 UL.thumbnails li.rank-of-image input {
-  height: 12px; 
-  width: 50px;
-  position: relative;
-  top: 4px;  
 }
 UL.thumbnails SPAN.wrap1 {
   margin: 0 5px 5px 5px;
-- 
cgit v1.2.3