From 4b181b746fa3660f63de96373caf66686cc470b4 Mon Sep 17 00:00:00 2001 From: rvelices Date: Wed, 1 Aug 2012 17:00:07 +0000 Subject: merge -r17289 from trunk to 2.4: batch manager improvements/fixes: - when refreshing photo set, start is set to 0 (otherwise if the new set is smaller that start, it looks like it is empty) - correct positioning of thumbnails (width/height) is done in template instead of javascript (immediate instead on ready + no reflows) - less space lost on batch manager page - fix wrong page title in batch manager because of global variable $title overriden - fix language keys in element_set_ranks (capital/lowercase issue) git-svn-id: http://piwigo.org/svn/branches/2.4@17290 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/element_set_ranks.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'admin/element_set_ranks.php') diff --git a/admin/element_set_ranks.php b/admin/element_set_ranks.php index cba101022..38b168bec 100644 --- a/admin/element_set_ranks.php +++ b/admin/element_set_ranks.php @@ -239,21 +239,21 @@ if (pwg_db_num_rows($result) > 0) // image order management $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'), ); $template->assign('image_order_options', $sort_fields); -- cgit v1.2.3