aboutsummaryrefslogtreecommitdiffstats
path: root/admin/themes/default/template
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2014-11-30 17:42:18 +0000
committermistic100 <mistic@piwigo.org>2014-11-30 17:42:18 +0000
commitbd4ff9fe713ed0b9ee122cf7812939f794c601d8 (patch)
tree9222fabf6bdcecde47a1c507862e10bd45a7de6e /admin/themes/default/template
parent966b6e6ac1b708e4d81def52e83197ba50a0cfc3 (diff)
Merged revision(s) 30630 from trunk:
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/branches/2.7@30633 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/themes/default/template')
-rw-r--r--admin/themes/default/template/include/add_album.inc.tpl3
-rw-r--r--admin/themes/default/template/photos_add_direct.tpl6
2 files changed, 7 insertions, 2 deletions
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 a276b689c..850cb2277 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}";