Changeset 13087 for trunk/admin/themes

Timestamp:

Feb 10, 2012, 10:41:08 PM (12 years ago)

Author:

mistic100

Message:

feature 2568: redesigned order_by fields in Admin->Config->Options

Location:

trunk/admin/themes/default/template

Files:

• configuration.tpl (modified) (3 diffs)
• element_set_ranks.tpl (modified) (1 diff)

trunk/admin/themes/default/template/configuration.tpl

@@ -109 +109 @@
         {foreach from=$main.order_by item=order}
         <span class="filter {if $ORDER_BY_IS_CUSTOM}transparent{/if}">          
-          <select name="order_by_field[]" {if $ORDER_BY_IS_CUSTOM}disabled{/if}>
-            {html_options options=$main.order_field_options selected=$order.FIELD }
+          <select name="order_by[]" {if $ORDER_BY_IS_CUSTOM}disabled{/if}>
+            {html_options options=$main.order_by_options selected=$order}
           </select>
-          <select name="order_by_direction[]" {if $ORDER_BY_IS_CUSTOM}disabled{/if}>
-            {html_options options=$main.order_direction_options selected=$order.DIRECTION }
-          </select>  
           <a class="removeFilter">{'delete'|@translate}</a>
         </span>
@@ -129 +126 @@
 {footer_script require='jquery'}
 // counters for displaying of addFilter link
-fields = {$main.order_by|@count}; max_fields = {$main.order_field_options|@count}; max_fields--;
+fields = {$main.order_by|@count}; max_fields = Math.ceil({$main.order_by_options|@count}/2);
 
 {literal}
@@ -150 +147 @@
 jQuery(document).ready(function () {
   $('.addFilter').click(function() {
-    rel = $(this).attr('rel');
     $(this).prev('span.filter').clone().insertBefore($(this));
-    $(this).prev('span.filter').children('select[name="order_by_field[]"]').val('');
-    $(this).prev('span.filter').children('select[name="order_by_direction[]"]').val('ASC');
+    $(this).prev('span.filter').children('select[name="order_by[]"]').val('');
     
     fields++;

trunk/admin/themes/default/template/element_set_ranks.tpl

@@ -79 +79 @@
       <label for="image_order_user_define">{'automatic order'|@translate}</label>
       <div id="image_order_user_define_options">
-      {foreach from=$image_orders item=order}
+      {foreach from=$image_order item=order}
       <p class="field">
-        <select name="order_field_{$order.ID}">
-          {html_options options=$image_order_field_options selected=$order.FIELD }
+        <select name="image_order[]">
+          {html_options options=$image_order_options selected=$order}
         </select>
-        <select name="order_direction_{$order.ID}">
-          {html_options options=$image_order_direction_options selected=$order.DIRECTION }
-        </select>      
       </p>
       {/foreach}