2 files changed, 33 insertions, 1 deletions
diff --git a/admin/themes/default/default-layout.css b/admin/themes/default/default-layout.css
index 35de67694..3950825a3 100644
--- a/admin/themes/default/default-layout.css
+++ b/admin/themes/default/default-layout.css
@@ -293,6 +293,10 @@ FORM P {
 	margin-bottom: 2em;
 }
 
+form p.field {
+  text-align: left;
+}
+
 FORM FIELDSET P {
 	margin-top: 1em;
 	margin-bottom: 0;
diff --git a/admin/themes/default/template/element_set_ranks.tpl b/admin/themes/default/template/element_set_ranks.tpl
index b45ca5d19..804d053ff 100644
--- a/admin/themes/default/template/element_set_ranks.tpl
+++ b/admin/themes/default/template/element_set_ranks.tpl
@@ -1,7 +1,7 @@
 {known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
 {known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js" }
 {known_script id="jquery.ui.sortable" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.sortable.packed.js" }
-
+{html_head}
 {literal}
 <script type="text/javascript">
   $(function() {
@@ -15,12 +15,14 @@
   $(this).find("input[name^=rank_of_image]")
   .each(function() { $(this).attr('value', (i+1)*10)});
   });
+  $('#image_order_rank').attr('checked', true);
   }
   });
   });
 
 </script>
 {/literal}
+{/html_head}
 
 <h2>{'Manage image ranks'|@translate}</h2>
 
@@ -46,9 +48,35 @@
     </ul>
     {/if}
   </fieldset>
+
+  <fieldset>
+    <legend>{'Sort order'|@translate}</legend>
+    <p class="field">
+      <input type="radio" name="image_order_choice" id="image_order_default" value="default"{if $image_order_choice=='default'} checked="checked"{/if}>
+      <label for="image_order_default">{'Use the default image sort order (defined in the configuration file)'|@translate}</label>
+    </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>
+    </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>
+      {foreach from=$image_orders item=order}
+      <p class="field">
+        <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>      
+      </p>
+      {/foreach}
+  </fieldset>
   <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}></p>
 </form>
 
+
 {else}
 <div class="infos"><p>{'No element in this category'|@translate}</p></div>
 {/if}