merge r24982 from branch 2.5 to trunk

bug 2967 fixed: avoid display changes when album list is long to load. Replace input text for position to input hidden. It was a fallback when javascript is deactivated, but nowadays Piwigo administration can't work without javascript. git-svn-id: http://piwigo.org/svn/trunk@24983 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Oct 18, 2013 · 27e000f · 27e000f
1 parent 965ec8b
commit 27e000f
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/admin/themes/default/template/cat_list.tpl b/admin/themes/default/template/cat_list.tpl
@@ -1,8 +1,6 @@
 {footer_script require='jquery.ui.sortable'}{literal}
 jQuery(document).ready(function(){
-  jQuery(".catPos").hide();
   jQuery(".drag_button").show();
-  jQuery("#manualOrder").hide();
   jQuery(".categoryLi").css("cursor","move");
   jQuery(".categoryUl").sortable({
     axis: "y",
@@ -104,7 +102,7 @@ jQuery(document).ready(function(){
 
 <form id="categoryOrdering" action="{$F_ACTION}" method="post">
   <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
-  <p id="manualOrder">
+  <p 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>
   </p>
@@ -119,12 +117,7 @@ jQuery(document).ready(function(){
         <strong><a href="{$category.U_CHILDREN}" title="{'manage sub-albums'|@translate}">{$category.NAME}</a></strong>
       </p>
 
-      <p class="catPos">
-        <label>
-          {'Position'|@translate} :
-          <input type="text" size="4" name="catOrd[{$category.ID}]" maxlength="4" value="{$category.RANK}">
-        </label>
-      </p>
+      <input type="hidden" name="catOrd[{$category.ID}]" value="{$category.RANK}">
 
       <p class="albumActions">
         <a href="{$category.U_EDIT}"><span class="icon-pencil"></span>{'Edit'|@translate}</a>