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
This commit is contained in:
flop25 2012-07-18 16:37:15 +00:00
parent 2b25eee744
commit b874181e8b

View file

@ -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>