From c81093b0e943d3625554c808ecb072ef20615d6f Mon Sep 17 00:00:00 2001 From: mistic100 Date: Sat, 10 Nov 2012 20:10:01 +0000 Subject: feature:2718 Add batch manager filters for photo dimensions, redesign with sliders git-svn-id: http://piwigo.org/svn/trunk@18988 68402e56-0260-453c-a942-63ccdbb3a9ee --- .../default/template/batch_manager_global.tpl | 116 +++++++++++++++------ 1 file changed, 86 insertions(+), 30 deletions(-) (limited to 'admin/themes/default') diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl index 154a19f20..7059c6e24 100644 --- a/admin/themes/default/template/batch_manager_global.tpl +++ b/admin/themes/default/template/batch_manager_global.tpl @@ -2,6 +2,8 @@ {include file='include/datepicker.inc.tpl'} {include file='include/colorbox.inc.tpl'} {include file='include/add_album.inc.tpl'} +{combine_script id='jquery.ui.slider' require='jquery.ui' load='footer' path='themes/default/js/ui/minified/jquery.ui.slider.min.js'} +{combine_css path="themes/default/js/ui/theme/jquery.ui.slider.css"} {footer_script}{literal} pwg_initialization_datepicker("#date_creation_day", "#date_creation_month", "#date_creation_year", "#date_creation_linked_date", "#date_creation_action_set"); @@ -387,16 +389,6 @@ $(document).ready(function() { filter_enable(filter); $(this).attr("value", -1); }); - - $("select[name='filter_dimension']").change(function () { - $("span[id^='filter_dimension_']").hide(); - $("span#filter_dimension_"+ $(this).attr("value")).show(); - }); - - $("a.ratio-choice").click(function() { - $("input[name='filter_ratio_min']").val($(this).data("min")); - $("input[name='filter_ratio_max']").val($(this).data("max")); - }); function filter_disable(filter) { /* hide the filter line */ @@ -493,11 +485,67 @@ $(document).ready(function() { } ); } - checkPermitAction() + checkPermitAction(); +{/literal} + + /* dimensions sliders */ + $("#filter_dimension_width_slider").slider({ldelim} + range: true, + min: {$dimensions.bounds.min_width}, + max: {$dimensions.bounds.max_width}, + values: [{$dimensions.selected.min_width}, {$dimensions.selected.max_width}], + slide: function(event, ui) {ldelim} + $("input[name='filter_dimension_min_width']").val(ui.values[0]); + $("input[name='filter_dimension_max_width']").val(ui.values[1]); + $("#filter_dimension_width_info").html(sprintf("{'between %d and %d pixels'|@translate}", ui.values[0], ui.values[1])); + }, + change: function(event, ui) {ldelim} + $("input[name='filter_dimension_min_width']").val(ui.values[0]); + $("input[name='filter_dimension_max_width']").val(ui.values[1]); + $("#filter_dimension_width_info").html(sprintf("{'between %d and %d pixels'|@translate}", ui.values[0], ui.values[1])); + } + }); + $("#filter_dimension_height_slider").slider({ldelim} + range: true, + min: {$dimensions.bounds.min_height}, + max: {$dimensions.bounds.max_height}, + values: [{$dimensions.selected.min_height}, {$dimensions.selected.max_height}], + slide: function(event, ui) {ldelim} + $("input[name='filter_dimension_min_height']").val(ui.values[0]); + $("input[name='filter_dimension_max_height']").val(ui.values[1]); + $("#filter_dimension_height_info").html(sprintf("{'between %d and %d pixels'|@translate}", ui.values[0], ui.values[1])); + }, + change: function(event, ui) {ldelim} + $("input[name='filter_dimension_min_height']").val(ui.values[0]); + $("input[name='filter_dimension_max_height']").val(ui.values[1]); + $("#filter_dimension_height_info").html(sprintf("{'between %d and %d pixels'|@translate}", ui.values[0], ui.values[1])); + } + }); + $("#filter_dimension_ratio_slider").slider({ldelim} + range: true, + step: 0.01, + min: {$dimensions.bounds.min_ratio}, + max: {$dimensions.bounds.max_ratio}, + values: [{$dimensions.selected.min_ratio}, {$dimensions.selected.max_ratio}], + slide: function(event, ui) {ldelim} + $("input[name='filter_dimension_min_ratio']").val(ui.values[0]); + $("input[name='filter_dimension_max_ratio']").val(ui.values[1]); + $("#filter_dimension_ratio_info").html(sprintf("{'between %.2f and %.2f'|@translate}", ui.values[0], ui.values[1])); + }, + change: function(event, ui) {ldelim} + $("input[name='filter_dimension_min_ratio']").val(ui.values[0]); + $("input[name='filter_dimension_max_ratio']").val(ui.values[1]); + $("#filter_dimension_ratio_info").html(sprintf("{'between %.2f and %.2f'|@translate}", ui.values[0], ui.values[1])); + } + }); + + $("a.dimensions-choice").click(function() {ldelim} + $("#filter_dimension_"+ $(this).data("type") +"_slider").slider("values", 0, $(this).data("min")); + $("#filter_dimension_"+ $(this).data("type") +"_slider").slider("values", 1, $(this).data("max")); + }); }); - -{/literal}{/footer_script} +{/footer_script}
@@ -558,22 +606,31 @@ $(document).ready(function() { [x] {'Dimensions'|@translate} : - — - — - — - - - -
  • - [x] - - {'Ratio'|@translate} : - — - — - {'Portrait'|@translate} | - {'square'|@translate} | - {'Landscape'|@translate} | - {'Panorama'|@translate} + +
    + {'Width'|@translate} : {'between %d and %d pixels'|@translate|sprintf:$dimensions.selected.min_width:$dimensions.selected.max_width} + | {'Reset'|@translate} +
    + + {'Height'|@translate} : {'between %d and %d pixels'|@translate|sprintf:$dimensions.selected.min_height:$dimensions.selected.max_height} + | {'Reset'|@translate} +
    + + {'Ratio'|@translate} : {'between %.2f and %.2f'|@translate|sprintf:$dimensions.selected.min_ratio:$dimensions.selected.max_ratio} + | {'Portrait'|@translate} + | {'square'|@translate} + | {'Landscape'|@translate} + | {'Panorama'|@translate} + | {'Reset'|@translate} +
    +
    + + + + + + +
  • @@ -586,7 +643,6 @@ $(document).ready(function() { - {'Remove all filters'|@translate}

    -- cgit v1.2.3