Index: /trunk/admin/batch_manager.php =================================================================== --- /trunk/admin/batch_manager.php (revision 17288) +++ /trunk/admin/batch_manager.php (revision 17289) @@ -51,5 +51,5 @@ { // echo '
'; print_r($_POST); echo ''; - + unset($_REQUEST['start']); // new photo set must reset the page $_SESSION['bulk_manager_filter'] = array(); @@ -336,8 +336,8 @@ // and $page['nb_images'] next elements -if (!isset($_GET['start']) - or !is_numeric($_GET['start']) - or $_GET['start'] < 0 - or (isset($_GET['display']) and 'all' == $_GET['display'])) +if (!isset($_REQUEST['start']) + or !is_numeric($_REQUEST['start']) + or $_REQUEST['start'] < 0 + or (isset($_REQUEST['display']) and 'all' == $_REQUEST['display'])) { $page['start'] = 0; @@ -345,5 +345,5 @@ else { - $page['start'] = $_GET['start']; + $page['start'] = $_REQUEST['start']; } Index: /trunk/admin/batch_manager_global.php =================================================================== --- /trunk/admin/batch_manager_global.php (revision 17288) +++ /trunk/admin/batch_manager_global.php (revision 17289) @@ -473,6 +473,7 @@ 'selection' => $collection, 'all_elements' => $page['cat_elements_id'], + 'START' => $page['start'], 'U_DISPLAY'=>$base_url.get_query_string_diff(array('display')), - 'F_ACTION'=>$base_url.get_query_string_diff(array('cat')), + 'F_ACTION'=>$base_url.get_query_string_diff(array('cat','start')), ) ); @@ -733,5 +734,4 @@ } - $query = ' SELECT id,path,representative_ext,file,filesize,level,name,width,height,rotation @@ -767,4 +767,5 @@ $result = pwg_query($query); + $thumb_params = ImageStdParams::get_by_type(IMG_THUMB); // template thumbnail initialization while ($row = pwg_db_fetch_assoc($result)) @@ -773,23 +774,21 @@ $src_image = new SrcImage($row); - $title = render_element_name($row); - if ($title != get_name_from_file($row['file'])) - { - $title.= ' ('.$row['file'].')'; + $ttitle = render_element_name($row); + if ($ttitle != get_name_from_file($row['file'])) + { + $ttitle.= ' ('.$row['file'].')'; } $template->append( - 'thumbnails', + 'thumbnails', array_merge($row, array( - 'ID' => $row['id'], - 'TN_SRC' => DerivativeImage::url(IMG_THUMB, $src_image), - 'FILE' => $row['file'], - 'TITLE' => $title, - 'LEVEL' => $row['level'], + 'thumb' => new DerivativeImage($thumb_params, $src_image), + 'TITLE' => $ttitle, 'FILE_SRC' => DerivativeImage::url(IMG_LARGE, $src_image), 'U_EDIT' => get_root_url().'admin.php?page=photo-'.$row['id'], ) - ); - } + )); + } + $template->assign('thumb_params', $thumb_params); } Index: /trunk/admin/element_set_ranks.php =================================================================== --- /trunk/admin/element_set_ranks.php (revision 17288) +++ /trunk/admin/element_set_ranks.php (revision 17289) @@ -238,19 +238,19 @@ $sort_fields = array( '' => '', - 'file' => l10n('file name, A → Z'), - 'file DESC' => l10n('file name, Z → A'), - 'name' => l10n('photo title, A → Z'), - 'name DESC' => l10n('photo title, Z → A'), - 'date_creation DESC' => l10n('date created, new → old'), - 'date_creation' => l10n('date created, old → new'), - 'date_available DESC' => l10n('date posted, new → old'), - 'date_available' => l10n('date posted, old → new'), - 'rating_score DESC' => l10n('rating score, high → low'), - 'rating_score' => l10n('rating score, low → high'), - 'hit DESC' => l10n('visits, high → low'), - 'hit' => l10n('visits, low → high'), - 'id' => l10n('numeric identifier, 1 → 9'), - 'id DESC' => l10n('numeric identifier, 9 → 1'), - 'rank' => l10n('manual sort order'), + 'file' => l10n('File name, A → Z'), + 'file DESC' => l10n('File name, Z → A'), + 'name' => l10n('Photo title, A → Z'), + 'name DESC' => l10n('Photo title, Z → A'), + 'date_creation DESC' => l10n('Date created, new → old'), + 'date_creation' => l10n('Date created, old → new'), + 'date_available DESC' => l10n('Date posted, new → old'), + 'date_available' => l10n('Date posted, old → new'), + 'rating_score DESC' => l10n('Rating score, high → low'), + 'rating_score' => l10n('Rating score, low → high'), + 'hit DESC' => l10n('Visits, high → low'), + 'hit' => l10n('Visits, low → high'), + 'id' => l10n('Numeric identifier, 1 → 9'), + 'id DESC' => l10n('Numeric identifier, 9 → 1'), + 'rank' => l10n('Manual sort order'), ); Index: /trunk/admin/themes/clear/theme.css =================================================================== --- /trunk/admin/themes/clear/theme.css (revision 17288) +++ /trunk/admin/themes/clear/theme.css (revision 17289) @@ -98,6 +98,4 @@ UL.thumbnails span.wrap2:hover { background-color:#7CBA0F; color:#999; } UL.thumbnails span.wrap2 { - padding: 4px; - border-radius: 4px; background-color:#ddd; } @@ -112,5 +110,5 @@ .content ul.categoryActions a img { margin-left: 10px; } -ul.thumbnails input { border:3px double #666; color:#666; font-size:10px; margin:0; background-color:#bbb; text-align: center;} +ul.thumbnails input { color:#666; font-size:10px; margin:0; background-color:#bbb; text-align: center;} INPUT.bigbutton:hover { background-color: #ddd; color:#0cc; border: 0; } .throw { font-size: 120%; line-height: 26px; padding-top: 10px; font-weight: bold; } Index: /trunk/admin/themes/default/template/batch_manager_global.tpl =================================================================== --- /trunk/admin/themes/default/template/batch_manager_global.tpl (revision 17288) +++ /trunk/admin/themes/default/template/batch_manager_global.tpl (revision 17289) @@ -51,4 +51,5 @@ }); } + $('ul.thumbnails').enableShiftClick(); }); {/literal}{/footer_script} @@ -482,15 +483,5 @@ }); -jQuery(window).load(function() { - var max_w=0, max_h=0; - $(".thumbnails img").each(function () { - max_w = Math.max(max_w, $(this).width() ); - max_h = Math.max(max_h, $(this).height() ); - }); - max_w += 10; - max_h += 35; - $("ul.thumbnails span, ul.thumbnails label").css('width', max_w+'px').css('height', max_h+'px'); - $('ul.thumbnails').enableShiftClick(); -}); + {/literal}{/footer_script} @@ -500,4 +491,5 @@