adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-12 11:43:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@13087 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100
2012-02-10 21:41:08 +00:00
parent b82ddfb655
commit 3c76f29e4f
4 changed files with 66 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/themes/default/template/configuration.tpl
+4 -9
View File
@@ -108,12 +108,9 @@ jQuery(document).ready(function(){
{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>
{/foreach}
@@ -128,7 +125,7 @@ jQuery(document).ready(function(){
{if !$ORDER_BY_IS_CUSTOM}
{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}
function updateAddFilterLink() {
@@ -149,10 +146,8 @@ function updateRemoveFilterTrigger() {
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++;
updateAddFilterLink();
admin/themes/default/template/element_set_ranks.tpl
+3 -6
View File
@@ -78,14 +78,11 @@ jQuery('.clipwrapper').tipTip({
<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">{'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}
</div>