From f1a7d6b66e9405b56a73691947e7d042c1fd96f6 Mon Sep 17 00:00:00 2001
From: mistic100 <mistic@piwigo.org>
Date: Sun, 30 Nov 2014 12:47:59 +0000
Subject: bug 3183: Improve album creation update popup selectize with new
 album init popup selectize with main selectize value

git-svn-id: http://piwigo.org/svn/trunk@30630 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/themes/default/template/include/add_album.inc.tpl | 3 ++-
 admin/themes/default/template/photos_add_direct.tpl     | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'admin/themes/default/template')

diff --git a/admin/themes/default/template/include/add_album.inc.tpl b/admin/themes/default/template/include/add_album.inc.tpl
index 988dc1907..ebda5d2cc 100644
--- a/admin/themes/default/template/include/add_album.inc.tpl
+++ b/admin/themes/default/template/include/add_album.inc.tpl
@@ -14,7 +14,8 @@
       <br><br>
       
       {'Album name'|@translate}<br>
-      <input name="category_name" type="text" maxlength="255"> <span id="categoryNameError"></span>
+      <input name="category_name" type="text" maxlength="255">
+      <span id="categoryNameError" style="color:red;">{'The name of an album must not be empty'|translate}</span>
       <br><br><br>
       
       <input type="submit" value="{'Create'|@translate}">
diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl
index 705f07265..07a2c4495 100644
--- a/admin/themes/default/template/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -38,7 +38,11 @@ categoriesCache.selectize(jQuery('[data-selectize=categories]'), {
   }
 });
 
-jQuery('[data-add-album]').pwgAddAlbum({ cache: categoriesCache });
+jQuery('[data-add-album]').pwgAddAlbum({
+  afterSelect: function() {
+    jQuery("#albumSelection, .selectFiles, .showFieldset").show();
+  }
+});
 
 var pwg_token = '{$pwg_token}';
 var photosUploaded_label = "{'%d photos uploaded'|translate}";
-- 
cgit v1.2.3