aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2011-07-01 13:54:56 +0000
committermistic100 <mistic@piwigo.org>2011-07-01 13:54:56 +0000
commita8954c34a1ea60dc52cb5a995e35c575b03a802e (patch)
tree082b56c7a84b11ce1ab999d71f42b1499475a38e
parent5c545444cb52b95a4062e69d012c1f5203672532 (diff)
feature:2317 move order config to Admin->Config->Options
limit to 6 criterias (very uncommon case so no message displayed) git-svn-id: http://piwigo.org/svn/trunk@11589 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--admin/configuration.php1
-rw-r--r--admin/themes/default/template/configuration.tpl2
2 files changed, 2 insertions, 1 deletions
diff --git a/admin/configuration.php b/admin/configuration.php
index 98e07c9bf..82c16b8e7 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -136,6 +136,7 @@ if (isset($_POST['submit']))
$order_by_inside_category = array();
for ($i=0; $i<count($_POST['order_by_field']); $i++)
{
+ if ($i>5) continue;
if ($_POST['order_by_field'][$i] == '')
{
array_push($page['errors'], l10n('No field selected'));
diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl
index fc5f42b26..85574ed4b 100644
--- a/admin/themes/default/template/configuration.tpl
+++ b/admin/themes/default/template/configuration.tpl
@@ -96,7 +96,7 @@
</span>
</li>
- <li style="margin-top:20px;">
+ <li>
&nbsp;
<span class="property">
{'Default photos order'|@translate}