aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2012-07-25 10:58:25 +0000
committerplegall <plg@piwigo.org>2012-07-25 10:58:25 +0000
commitab924a14bd64f4fd2ede3febd76007ea43b9d91a (patch)
tree476946b5e676b097e1d884cfbb2b44e745fbb192
parentb6329cb062dc3b793931e97eeb2bfd918e2b04e3 (diff)
merge r17006 from branch 2.4 to trunk
bug 2655 fixed: maximum length for album name is 255 chars git-svn-id: http://piwigo.org/svn/trunk@17007 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--admin/themes/default/template/cat_list.tpl2
-rw-r--r--admin/themes/default/template/cat_modify.tpl2
-rw-r--r--admin/themes/default/template/include/add_album.inc.tpl2
3 files changed, 3 insertions, 3 deletions
diff --git a/admin/themes/default/template/cat_list.tpl b/admin/themes/default/template/cat_list.tpl
index 440a432ab..b1c46bb13 100644
--- a/admin/themes/default/template/cat_list.tpl
+++ b/admin/themes/default/template/cat_list.tpl
@@ -70,7 +70,7 @@ jQuery(document).ready(function(){
<legend>{'create a new album'|@translate}</legend>
<input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
<p><strong>{'Album name'|@translate}</strong>
- <br><input type="text" name="virtual_name">
+ <br><input type="text" name="virtual_name" maxlength="255">
</p>
<span class="actionButtons">
<input class="submit" type="submit" value="{'Create'|@translate}" name="submitAdd">
diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl
index 2047de0cf..e953ea322 100644
--- a/admin/themes/default/template/cat_modify.tpl
+++ b/admin/themes/default/template/cat_modify.tpl
@@ -60,7 +60,7 @@
<p>
<strong>{'Name'|@translate}</strong>
<br>
- <input type="text" class="large" name="name" value="{$CAT_NAME}" maxlength="60">
+ <input type="text" class="large" name="name" value="{$CAT_NAME}" maxlength="255">
</p>
<p>
diff --git a/admin/themes/default/template/include/add_album.inc.tpl b/admin/themes/default/template/include/add_album.inc.tpl
index 82178ab11..1fe8cea21 100644
--- a/admin/themes/default/template/include/add_album.inc.tpl
+++ b/admin/themes/default/template/include/add_album.inc.tpl
@@ -95,7 +95,7 @@ jQuery(document).ready(function(){
{html_options options=$category_parent_options selected=$category_parent_options_selected}
</select>
- <br><br>{'Album name'|@translate}<br><input name="category_name" type="text"> <span id="categoryNameError"></span>
+ <br><br>{'Album name'|@translate}<br><input name="category_name" type="text" maxlength="255"> <span id="categoryNameError"></span>
<br><br><br><input type="submit" value="{'Create'|@translate}"> <span id="albumCreationLoading" style="display:none"><img src="themes/default/images/ajax-loader-small.gif"></span>
</form>
</div>