diff --git a/admin/batch_manager.php b/admin/batch_manager.php index 8e7a48e0e..e38d52049 100644 --- a/admin/batch_manager.php +++ b/admin/batch_manager.php @@ -100,15 +100,11 @@ if (isset($_POST['submitFilter'])) $_SESSION['bulk_manager_filter']['dimension'][$type] = $_POST['filter_dimension_'. $type ]; } } - } - - if (isset($_POST['filter_ratio_use'])) - { - foreach (array('min','max') as $type) + foreach (array('min_ratio','max_ratio') as $type) { - if ( preg_match('#^[0-9\.,]+$#', $_POST['filter_ratio_'. $type ]) ) + if ( preg_match('#^[0-9\.]+$#', $_POST['filter_dimension_'. $type ]) ) { - $_SESSION['bulk_manager_filter']['ratio'][$type] = str_replace(',','.',$_POST['filter_ratio_'. $type ]); + $_SESSION['bulk_manager_filter']['dimension'][$type] = $_POST['filter_dimension_'. $type ]; } } } @@ -349,7 +345,7 @@ if (!empty($_SESSION['bulk_manager_filter']['tags'])) ); } -if (isset($_SESSION['bulk_manager_filter']['dimension']) or isset($_SESSION['bulk_manager_filter']['ratio'])) +if (isset($_SESSION['bulk_manager_filter']['dimension'])) { $where_clauses = array(); if (isset($_SESSION['bulk_manager_filter']['dimension']['min_width'])) @@ -368,13 +364,13 @@ if (isset($_SESSION['bulk_manager_filter']['dimension']) or isset($_SESSION['bul { $where_clause[] = 'height <= '.$_SESSION['bulk_manager_filter']['dimension']['max_height']; } - if (isset($_SESSION['bulk_manager_filter']['ratio']['min'])) + if (isset($_SESSION['bulk_manager_filter']['dimension']['min_ratio'])) { - $where_clause[] = 'width/height >= '.$_SESSION['bulk_manager_filter']['ratio']['min']; + $where_clause[] = 'width/height >= '.$_SESSION['bulk_manager_filter']['dimension']['min_ratio']; } - if (isset($_SESSION['bulk_manager_filter']['ratio']['max'])) + if (isset($_SESSION['bulk_manager_filter']['dimension']['max_ratio'])) { - $where_clause[] = 'width/height <= '.$_SESSION['bulk_manager_filter']['ratio']['max']; + $where_clause[] = 'width/height <= '.$_SESSION['bulk_manager_filter']['dimension']['max_ratio']; } $query = ' @@ -442,6 +438,30 @@ SELECT id, name ;'; $template->assign('tags', get_taglist($query, false)); +// +-----------------------------------------------------------------------+ +// | dimensions | +// +-----------------------------------------------------------------------+ +$query = ' +SELECT + MIN(width) as min_width, + MAX(width) as max_width, + MIN(height) as min_height, + MAX(height) as max_height, + MIN(width/height) as min_ratio, + MAX(width/height) as max_ratio + FROM '.IMAGES_TABLE.' +;'; +$dimensions['bounds'] = pwg_db_fetch_assoc(pwg_query($query)); +$dimensions['bounds']['min_ratio'] = floor($dimensions['bounds']['min_ratio']*100)/100; +$dimensions['bounds']['max_ratio'] = ceil($dimensions['bounds']['max_ratio']*100)/100; + +foreach (array_keys($dimensions['bounds']) as $type) +{ + $dimensions['selected'][$type] = isset($_SESSION['bulk_manager_filter']['dimension'][$type]) ? $_SESSION['bulk_manager_filter']['dimension'][$type] : $dimensions['bounds'][$type]; +} +$template->assign('dimensions', $dimensions); + + // +-----------------------------------------------------------------------+ // | open specific mode | // +-----------------------------------------------------------------------+ 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}

    diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index f75cd873a..08cf63117 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -207,6 +207,8 @@ $lang['Average rate'] = "Average rate"; $lang['average time'] = "average time"; $lang['Batch Manager'] = 'Batch Manager'; $lang['between'] = "between"; +$lang['between %d and %d pixels'] = 'between %d and %d pixels'; +$lang['between %.2f and %.2f'] = 'between %.2f and %.2f'; $lang['bottom left corner'] = 'bottom left corner'; $lang['bottom right corner'] = 'bottom right corner'; $lang['Bound Theme'] = 'Bound Theme'; @@ -357,7 +359,6 @@ $lang['Forbid this language to users'] = 'Forbid this language to users'; $lang['Forbid this theme to users'] = "Forbid this theme to users"; $lang['Forbidden'] = "Forbidden"; $lang['Form'] = "Form"; -$lang['Format'] = 'Format'; $lang['FTP + Synchronization'] = 'FTP + Synchronization'; $lang['Gallery title'] = "Gallery title"; $lang['Gallery unlocked'] = 'Gallery unlocked'; @@ -484,7 +485,6 @@ $lang['Manage this set of %d photos'] = 'Manage this set of %d photos'; $lang['Manage'] = "Manage"; $lang['manual order'] = 'manual order'; $lang['Manual order'] = 'Manual order'; -$lang['Maximum'] = 'Maximum'; $lang['Maximum file size: %sB.'] = 'Maximum file size: %sB.'; $lang['Maximum height'] = 'Maximum height'; $lang['Maximum width'] = 'Maximum width'; @@ -495,7 +495,6 @@ $lang['Merge tags'] = 'Merge tags'; $lang['Metadata synchronization results'] = "Metadata synchronization results"; $lang['Metadata synchronized from file'] = "Metadata synchronized from file"; $lang['middle'] = 'middle'; -$lang['Minimum'] = 'Minimum'; $lang['Minimum width'] = 'Minimum width'; $lang['Minimum height'] = 'Minimum height'; $lang['Minimum privacy level'] = "Minimum privacy level"; diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index d827a87cf..a05dd505e 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -930,14 +930,13 @@ $lang['Duplicate selected tags'] = 'Dupliquer les tags sélectionnés'; $lang['Invalid dimension'] = 'Dimension invalide'; $lang['Minimum width'] = 'Largeur minimale'; $lang['Minimum height'] = 'Hauteur minimale'; -$lang['Format'] = 'Format'; $lang['Portrait'] = 'Portrait'; $lang['Landscape'] = 'Paysage'; $lang['Panorama'] = 'Panorama'; $lang['Manage photos'] = 'Gérer les photos'; $lang['View in gallery'] = 'Voir dans la galerie'; $lang['Number of albums per page'] = 'Nombre d\'albums par page'; -$lang['Maximum'] = 'Maximum'; -$lang['Minimum'] = 'Minimum'; $lang['Ratio'] = 'Ratio'; +$lang['between %d and %d pixels'] = 'entre %d et %d pixels'; +$lang['between %.2f and %.2f'] = 'entre %.2f et %.2f'; ?> \ No newline at end of file