aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2015-09-11 14:02:15 +0200
committerChristian Ruppert <idl0r@gentoo.org>2015-09-11 14:02:15 +0200
commitbe0849ea2a1695a95b521a00318cfba364777ee9 (patch)
tree5255fc2818d84ddbd7dc92fbafc83d1b435da8f2 /template/en/default/global
parentMerge tag 'release-5.0' into bugstest (diff)
parentBumped version to 5.0.1 (diff)
downloadbugzilla-be0849ea2a1695a95b521a00318cfba364777ee9.tar.gz
bugzilla-be0849ea2a1695a95b521a00318cfba364777ee9.tar.bz2
bugzilla-be0849ea2a1695a95b521a00318cfba364777ee9.zip
Merge tag 'release-5.0.1' into bugstest
Diffstat (limited to 'template/en/default/global')
-rw-r--r--template/en/default/global/header.html.tmpl1
-rw-r--r--template/en/default/global/textarea.html.tmpl4
-rw-r--r--template/en/default/global/user-error.html.tmpl2
3 files changed, 5 insertions, 2 deletions
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index f91c55626..3b8dc3a3b 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -32,6 +32,7 @@
header_addl_info = ""
onload = ""
style_urls = []
+ javascript_urls = []
yui = []
generate_api_token = 0
%]
diff --git a/template/en/default/global/textarea.html.tmpl b/template/en/default/global/textarea.html.tmpl
index f3e23dd3f..313329579 100644
--- a/template/en/default/global/textarea.html.tmpl
+++ b/template/en/default/global/textarea.html.tmpl
@@ -27,6 +27,8 @@
# defaultcontent: (optional) Default content for the textarea.
# mandatory: (optional) Boolean specifying whether or not the textarea
# is mandatory.
+ # field_hidden: (optional) True if the field is hidden. Only useful if
+ # the field is mandatory.
#%]
<textarea [% IF name %]name="[% name FILTER html %]"[% END %]
@@ -46,7 +48,7 @@
onFocus="this.rows=[% maxrows FILTER html %]"
[% END %]
[% IF mandatory %]
- aria-required="true" required
+ data-required="true" [% 'aria-required="true" required' UNLESS field_hidden %]
[% END %]
[% IF onchange %]
onchange="[% onchange FILTER html %]"
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index df864790e..ada7e4fb8 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -94,7 +94,7 @@
[% ELSIF error == "alias_too_long" %]
[% title = "Alias Too Long" %]
- [% terms.Bug %] aliases cannot be longer than 20 characters.
+ [% terms.Bug %] aliases cannot be longer than 40 characters.
Please choose a shorter alias.
[% ELSIF error == "api_key_not_valid" %]