- Timestamp:
- Nov 21, 2012, 3:28:55 PM (11 years ago)
- Location:
- trunk/admin
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/batch_manager.php
r19069 r19121 371 371 if (isset($_SESSION['bulk_manager_filter']['dimension']['max_ratio'])) 372 372 { 373 $where_clause[] = 'width/height <= '.sprintf('%.2f99', $_SESSION['bulk_manager_filter']['dimension']['max_ratio']); 373 // max_ratio is a floor value, so must be a bit increased 374 $where_clause[] = 'width/height < '.($_SESSION['bulk_manager_filter']['dimension']['max_ratio']+0.01); 374 375 } 375 376 … … 447 448 $ratios = array(); 448 449 450 // get all width, height and ratios 449 451 $query = ' 450 452 SELECT … … 455 457 ;'; 456 458 $result = pwg_query($query); 459 457 460 while ($row = pwg_db_fetch_assoc($result)) 458 461 { … … 474 477 $dimensions['heights'] = implode(',', $heights); 475 478 $dimensions['ratios'] = implode(',', $ratios); 476 477 $dimensions['bounds'] = pwg_db_fetch_assoc(pwg_query($query));478 479 479 480 $dimensions['bounds'] = array( … … 486 487 ); 487 488 489 // find ratio categories 488 490 $ratio_categories = array( 489 491 'portrait' => array(), … … 499 501 $ratio_categories['portrait'][] = $ratio; 500 502 } 501 502 if ($ratio >= 0.95 and $ratio < 1.05) 503 else if ($ratio >= 0.95 and $ratio <= 1.05) 503 504 { 504 505 $ratio_categories['square'][] = $ratio; 505 506 } 506 507 if ($ratio > 1.05 and $ratio <= 2.5) 507 else if ($ratio > 1.05 and $ratio < 2) 508 508 { 509 509 $ratio_categories['landscape'][] = $ratio; 510 510 } 511 512 if ($ratio > 2.5) 511 else if ($ratio >= 2) 513 512 { 514 513 $ratio_categories['panorama'][] = $ratio; … … 527 526 } 528 527 528 // selected=bound if nothing selected 529 529 foreach (array_keys($dimensions['bounds']) as $type) 530 530 { -
trunk/admin/themes/default/template/batch_manager_global.tpl
r19069 r19121 490 490 /* dimensions sliders */ 491 491 /** 492 * find the key from a value in the startStopValues array , for the hour slider492 * find the key from a value in the startStopValues array 493 493 */ 494 494 function getSliderKeyFromValue(value, values) { … … 604 604 var max = jQuery(this).data("max"); 605 605 606 $("#filter_dimension_"+ type +"_slider").slider( 607 "values", 608 0, 606 $("#filter_dimension_"+ type +"_slider").slider("values", 0, 609 607 getSliderKeyFromValue(min, dimension_values[type]) 610 608 ); 611 609 612 $("#filter_dimension_"+type+"_slider").slider("values", 1, getSliderKeyFromValue(max, dimension_values[type])); 610 $("#filter_dimension_"+type+"_slider").slider("values", 1, 611 getSliderKeyFromValue(max, dimension_values[type]) 612 ); 613 613 }); 614 614 }); … … 686 686 687 687 {'Ratio'|@translate} ({'Width'|@translate}/{'Height'|@translate}) <span id="filter_dimension_ratio_info">{'between %.2f and %.2f'|@translate|sprintf:$dimensions.selected.min_ratio:$dimensions.selected.max_ratio}</span> 688 {if isset($dimensions.ratio_portrait .min)}688 {if isset($dimensions.ratio_portrait)} 689 689 | <a class="dimensions-choice" data-type="ratio" data-min="{$dimensions.ratio_portrait.min}" data-max="{$dimensions.ratio_portrait.max}">{'Portrait'|@translate}</a> 690 690 {/if} 691 {if isset($dimensions.ratio_square .min)}691 {if isset($dimensions.ratio_square)} 692 692 | <a class="dimensions-choice" data-type="ratio" data-min="{$dimensions.ratio_square.min}" data-max="{$dimensions.ratio_square.max}">{'square'|@translate}</a> 693 693 {/if} 694 {if isset($dimensions.ratio_landscape .min)}694 {if isset($dimensions.ratio_landscape)} 695 695 | <a class="dimensions-choice" data-type="ratio" data-min="{$dimensions.ratio_landscape.min}" data-max="{$dimensions.ratio_landscape.max}">{'Landscape'|@translate}</a> 696 696 {/if} 697 {if isset($dimensions.ratio_panorama .min)}697 {if isset($dimensions.ratio_panorama)} 698 698 | <a class="dimensions-choice" data-type="ratio" data-min="{$dimensions.ratio_panorama.min}" data-max="{$dimensions.ratio_panorama.max}">{'Panorama'|@translate}</a> 699 699 {/if}
Note: See TracChangeset
for help on using the changeset viewer.