Changeset 12106 for trunk

Timestamp:

Sep 8, 2011, 4:04:25 PM (13 years ago)

Author:

plg

Message:

bug 2435 fixed: on the upload form, when no album available, hide the album
selection listbox and if no album is selected, trigger an error before starting
any upload.

Location:

trunk

Files:

• admin/themes/default/template/photos_add_direct.tpl (modified) (5 diffs)
• language/en_UK/admin.lang.php (modified) (1 diff)
• language/fr_FR/admin.lang.php (modified) (2 diffs)

trunk/admin/themes/default/template/photos_add_direct.tpl

@@ -15 +15 @@
     jQuery("#formErrors").hide();
     jQuery("#formErrors li").hide();
+
+    if (jQuery("#albumSelect option:selected").length == 0) {
+      jQuery("#formErrors #noAlbum").show();
+      nbErrors++;
+    }
 
     var nbFiles = 0;
@@ -97 +102 @@
   fillCategoryListbox("category_parent");
 */
-  
+
   jQuery(".addAlbumOpen").colorbox({inline:true, href:"#addAlbumForm"});
 
@@ -123 +128 @@
           /* we refresh the album creation form, in case the user wants to create another album */
           jQuery("#category_parent").find("option").remove();
+
+          jQuery("<option/>")
+            .attr("value", 0)
+            .text("------------")
+            .appendTo("#category_parent")
+          ;
+
           fillCategoryListbox("category_parent", newAlbum);
 
           jQuery("#addAlbumForm form input[name=category_name]").val('');
+
+          jQuery("#albumSelection").show();
 
           return true;
@@ -331 +345 @@
 <div id="formErrors" class="errors" style="display:none">
   <ul>
+    <li id="noAlbum">{'Select an album'|@translate}</li>
     <li id="noPhoto">{'Select at least one photo'|@translate}</li>
   </ul>
@@ -359 +374 @@
       <legend>{'Drop into album'|@translate}</legend>
 
+      <span id="albumSelection"{if count($category_options) == 0} style="display:none"{/if}>
       <select id="albumSelect" name="category">
         {html_options options=$category_options selected=$category_options_selected}
       </select>
-      <br>{'... or '|@translate}<a href="#" class="addAlbumOpen" title="{'create a new album'|@translate}">{'create a new album'|@translate}</a>
+      <br>{'... or '|@translate}</span><a href="#" class="addAlbumOpen" title="{'create a new album'|@translate}">{'create a new album'|@translate}</a>
       
     </fieldset>

trunk/language/en_UK/admin.lang.php

@@ -859 +859 @@
 $lang['Select at least two tags for merging'] = 'Select at least two tags for merging';
 $lang['Learn more'] = 'Learn more';
+$lang['Select an album'] = 'Select an album';
 ?>

trunk/language/fr_FR/admin.lang.php

@@ -150 +150 @@
 $lang['Save order'] = "Sauvegarder l'ordre";
 $lang['Save to permalink history'] = "Sauvegarder dans l'historique des liens permanents";
-$lang['Select at least one album'] = 'Sélectionner au moins un album';
-$lang['Select at least one photo'] = "Sélectionner au moins une photo";
-$lang['Select at least one user'] = "Sélectionner au moins un utilisateur";
+$lang['Select at least one album'] = 'Sélectionnez au moins un album';
+$lang['Select at least one photo'] = "Sélectionnez au moins une photo";
+$lang['Select at least one user'] = "Sélectionnez au moins un utilisateur";
 $lang['Show info'] = "Montrer les informations";
 $lang['Site manager'] = "Gestionnaire des sites";
@@ -870 +870 @@
 $lang['Rate'] = 'Note';
 $lang['Learn more'] = 'En savoir plus';
+$lang['Select an album'] = 'Selectionnez un album';
 ?>