From b874181e8bb006ae12eeb48aec8dbe1b601a9f2e Mon Sep 17 00:00:00 2001
From: flop25 <flop25@piwigo.org>
Date: Wed, 18 Jul 2012 16:37:15 +0000
Subject: merge r16829 from trunk to 2.4 bug:2698 at the bottom!

git-svn-id: http://piwigo.org/svn/branches/2.4@16830 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/themes/default/template/cat_list.tpl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'admin')

diff --git a/admin/themes/default/template/cat_list.tpl b/admin/themes/default/template/cat_list.tpl
index f76e6b8bc..440a432ab 100644
--- a/admin/themes/default/template/cat_list.tpl
+++ b/admin/themes/default/template/cat_list.tpl
@@ -58,10 +58,14 @@ jQuery(document).ready(function(){
 {/literal}{/footer_script}
 
 <h2><span style="letter-spacing:0">{$CATEGORIES_NAV}</span> &#8250; {'Album list management'|@translate}</h2>
-
-
+<p class="showCreateAlbum">
+  <span id="notManualOrder">
+    <a href="#" id="addAlbumOpen">{'create a new album'|@translate}</a>
+    {if count($categories) }| <a href="#" id="autoOrderOpen">{'apply automatic sort order'|@translate}</a>{/if}
+  </span>
+</p>
 <form id="formCreateAlbum" action="{$F_ACTION}" method="post">
-  <p class="showCreateAlbum">
+  <p>
   <fieldset id="createAlbum" style="display:none;">
       <legend>{'create a new album'|@translate}</legend>
       <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
@@ -96,10 +100,6 @@ jQuery(document).ready(function(){
   </fieldset>
 {/if}
 <p>
-  <span id="notManualOrder">
-    <a href="#" id="addAlbumOpen">{'create a new album'|@translate}</a>
-    {if count($categories) }| <a href="#" id="autoOrderOpen">{'apply automatic sort order'|@translate}</a>{/if}
-  </span>
   <span id="manualOrder" style="display:none;">
     <input class="submit" name="submitManualOrder" type="submit" value="{'Save manual order'|@translate}">
     {'... or '|@translate} <a href="#" id="cancelManualOrder">{'cancel manual order'|@translate}</a>
-- 
cgit v1.2.3