summaryrefslogtreecommitdiffstats
path: root/template/en/default/admin/params
diff options
context:
space:
mode:
Diffstat (limited to 'template/en/default/admin/params')
-rw-r--r--template/en/default/admin/params/advanced.html.tmpl31
-rw-r--r--template/en/default/admin/params/attachment.html.tmpl2
-rw-r--r--template/en/default/admin/params/auth.html.tmpl4
-rw-r--r--template/en/default/admin/params/bugchange.html.tmpl10
-rw-r--r--template/en/default/admin/params/bugfields.html.tmpl5
-rw-r--r--template/en/default/admin/params/common.html.tmpl79
-rw-r--r--template/en/default/admin/params/dependencygraph.html.tmpl4
-rw-r--r--template/en/default/admin/params/editparams.html.tmpl2
-rw-r--r--template/en/default/admin/params/general.html.tmpl2
-rw-r--r--template/en/default/admin/params/index.html.tmpl2
-rw-r--r--template/en/default/admin/params/mta.html.tmpl12
-rw-r--r--template/en/default/admin/params/radius.html.tmpl8
-rw-r--r--template/en/default/admin/params/usermatch.html.tmpl3
13 files changed, 92 insertions, 72 deletions
diff --git a/template/en/default/admin/params/advanced.html.tmpl b/template/en/default/admin/params/advanced.html.tmpl
index 4caa2f1..a8e8a29 100644
--- a/template/en/default/admin/params/advanced.html.tmpl
+++ b/template/en/default/admin/params/advanced.html.tmpl
@@ -24,6 +24,35 @@
desc = "Settings for advanced configurations."
%]
+[% sts_desc = BLOCK %]
+ Enables the sending of the
+ <a href="http://en.wikipedia.org/wiki/Strict_Transport_Security">Strict-Transport-Security</a>
+ header along with HTTP responses on SSL connections. This adds greater
+ security to your SSL connections by forcing the browser to always
+ access your domain over SSL and never accept an invalid certificate.
+ However, it should only be used if you have the <code>ssl_redirect</code>
+ parameter turned on, [% terms.Bugzilla %] is the only thing running
+ on its domain (i.e., your <code>urlbase</code> is something like
+ <code>http://bugzilla.example.com/</code>), and you never plan to disable
+ the <code>ssl_redirect</code> parameter.
+ <ul>
+ <li>
+ off - Don't send the Strict-Transport-Security header with requests.
+ </li>
+ <li>
+ this_domain_only - Send the Strict-Transport-Security header with all
+ requests, but only support it for the current domain.
+ </li>
+ <li>
+ include_subdomains - Send the Strict-Transport-Security header along
+ with the <code>includeSubDomains</code> flag, which will apply the
+ security change to all subdomains. This is especially useful when
+ combined with an <code>attachment_base</code> that exists as (a)
+ subdomain(s) under the main [% terms.Bugzilla %] domain.
+ </li>
+ </ul>
+[% END %]
+
[% param_descs = {
cookiedomain =>
"If your website is at 'www.foo.com', setting this to"
@@ -47,4 +76,6 @@
_ " necessary to enter its URL if the web server cannot access the"
_ " HTTP_PROXY environment variable. If you have to authenticate,"
_ " use the <code>http://user:pass@proxy_url/</code> syntax.",
+
+ strict_transport_security => sts_desc,
} %]
diff --git a/template/en/default/admin/params/attachment.html.tmpl b/template/en/default/admin/params/attachment.html.tmpl
index 7d1e29f..12fd491 100644
--- a/template/en/default/admin/params/attachment.html.tmpl
+++ b/template/en/default/admin/params/attachment.html.tmpl
@@ -45,7 +45,7 @@
_ " That is, a different domain name that resolves to this exact"
_ " same $terms.Bugzilla installation.</p>"
_ "<p>Note that if you have set the"
- _ " <a href=\"editparams.cgi?section=advanced#cookiedomain\"><tt>cookiedomain</tt>"
+ _ " <a href=\"editparams.cgi?section=advanced#cookiedomain_desc\"><tt>cookiedomain</tt>"
_" parameter</a>, you should set <tt>attachment_base</tt> to use a"
_ " domain that would <em>not</em> be matched by"
_ " <tt>cookiedomain</tt>.</p>"
diff --git a/template/en/default/admin/params/auth.html.tmpl b/template/en/default/admin/params/auth.html.tmpl
index d2cb3e5..35bddf1 100644
--- a/template/en/default/admin/params/auth.html.tmpl
+++ b/template/en/default/admin/params/auth.html.tmpl
@@ -70,8 +70,8 @@
<dt>RADIUS</dt>
<dd>
RADIUS authentication using a RADIUS server.
- This method is experimental; please see the
- $terms.Bugzilla documentation for more information.
+ Please see the $terms.Bugzilla documentation for
+ more information.
Using this method requires
<a href=\"?section=radius\">additional
parameters</a> to be set.
diff --git a/template/en/default/admin/params/bugchange.html.tmpl b/template/en/default/admin/params/bugchange.html.tmpl
index 9f456ee..15d4f1e 100644
--- a/template/en/default/admin/params/bugchange.html.tmpl
+++ b/template/en/default/admin/params/bugchange.html.tmpl
@@ -23,6 +23,10 @@
desc = "Set up $terms.bug change policies"
%]
+[% PROCESS "global/field-descs.none.tmpl" %]
+
+[% accept_status = display_value('bug_status', 'IN_PROGRESS') FILTER html %]
+
[% param_descs = {
duplicate_or_move_bug_status => "When $terms.abug is marked as a duplicate of another one " _
"or is moved to another installation, use this $terms.bug status."
@@ -37,8 +41,10 @@
"If off, then all $terms.bugs initially have the default " _
"milestone for the product being filed in.",
- musthavemilestoneonaccept => "If you are using Target Milestone, do you want to require that " _
- "the milestone be set in order for a user to ACCEPT a ${terms.bug}?",
+ musthavemilestoneonaccept =>
+ "If you are using ${field_descs.target_milestone}, do you want to require"
+ _ " that the milestone be set in order for a user to set"
+ _ " ${terms.abug}'s status to ${accept_status}?",
commentonchange_resolution => "If this option is on, the user needs to enter a short " _
"comment if the resolution of the $terms.bug changes.",
diff --git a/template/en/default/admin/params/bugfields.html.tmpl b/template/en/default/admin/params/bugfields.html.tmpl
index 794f925..58b08f6 100644
--- a/template/en/default/admin/params/bugfields.html.tmpl
+++ b/template/en/default/admin/params/bugfields.html.tmpl
@@ -34,11 +34,6 @@
usestatuswhiteboard => "Do you wish to use the Status Whiteboard field?",
- usevotes => "Do you wish to allow users to vote for ${terms.bugs}? Note that in order " _
- "for this to be effective, you will have to change the maximum " _
- "votes allowed in a product to be non-zero in " _
- "<a href=\"editproducts.cgi\">the product edit page</a>.",
-
usebugaliases => "Do you wish to use $terms.bug aliases, which allow you to assign " _
"$terms.bugs an easy-to-remember name by which you can refer to them?",
diff --git a/template/en/default/admin/params/common.html.tmpl b/template/en/default/admin/params/common.html.tmpl
index 18aa1fb..d86da0d 100644
--- a/template/en/default/admin/params/common.html.tmpl
+++ b/template/en/default/admin/params/common.html.tmpl
@@ -28,7 +28,7 @@
<dl>
[% FOREACH param = panel.param_list %]
- <dt><a name="[% param.name FILTER html %]">[% param.name FILTER html %]</a></dt>
+ <dt id="[% param.name FILTER html %]_desc">[% param.name FILTER html %]</dt>
<dd>[% panel.param_descs.${param.name} FILTER none %]
<p>
[% IF param.type == "t" %]
@@ -62,55 +62,48 @@
[% END %]
</select>
[% ELSIF param.type == "o" %]
- <script type="text/javascript"><!--
- document.write("<span style=\"display: none\">");
- // -->
- </script>
<input id="input_[% param.name FILTER html %]" size="80"
name="[% param.name FILTER html %]"
value="[% Param(param.name) FILTER html %]"><br>
- <script type="text/javascript"><!--
- document.write("<\/span>");
- // -->
- </script>
[% boxSize = 7 %]
[% boxSize = 3 + param.choices.size IF param.choices.size < 7 %]
[% plist = Param(param.name).split(',') %]
- <script type="text/javascript"><!--
- document.write(
- '<table>' +
- ' <tr>' +
- ' <td rowspan="2">' +
- ' <select id="select_[% param.name FILTER html %]"' +
- ' size="[% boxSize FILTER html %]"' +
- ' name="select_[% param.name FILTER html %]">' +
- [% FOREACH item = plist %]
- ' <option value="[% item FILTER html %]">[% item FILTER html %]<\/option>' +
- [% END %]
- ' <option class="sortlist_separator"' +
- ' disabled="disabled"' +
- ' value="[% sortlist_separator %]">active&uarr;&nbsp;&darr;inactive<\/option>' +
- [% FOREACH item = param.choices %]
- [% IF lsearch(plist, item) == -1 %]
- ' <option value="[% item FILTER html %]">[% item FILTER html %]<\/option>' +
- [% END %]
- [% END %]
- ' <\/select>' +
- ' <\/td>' +
- ' <td style="vertical-align: bottom">' +
- ' <button type="button"' +
- ' onClick="sortedList_moveItem(\'[% param.name FILTER html %]\', -1, \'[% sortlist_separator %]\');">&uarr;<\/button>' +
- ' <\/td>' +
- ' <\/tr>' +
- ' <tr>' +
- ' <td style="vertical-align: top">' +
- ' <button type="button"' +
- ' onClick="sortedList_moveItem(\'[% param.name FILTER html %]\', +1, \'[% sortlist_separator %]\');">&darr;<\/button>' +
- ' <\/td>' +
- ' <\/tr>' +
- '<\/table>');
- // -->
+ <table id="table_[% param.name FILTER html %]" class="bz_default_hidden">
+ <tr>
+ <td rowspan="2">
+ <select id="select_[% param.name FILTER html %]"
+ name="select_[% param.name FILTER html %]"
+ size="[% boxSize FILTER html %]">
+ [% FOREACH item = plist %]
+ <option value="[% item FILTER html %]">[% item FILTER html %]</option>
+ [% END %]
+ <option class="sortlist_separator" disabled="disabled"
+ value="[% sortlist_separator %]">active&uarr;&nbsp;&darr;inactive</option>
+ [% FOREACH item = param.choices %]
+ [% IF lsearch(plist, item) == -1 %]
+ <option value="[% item FILTER html %]">[% item FILTER html %]</option>
+ [% END %]
+ [% END %]
+ </select>
+ </td>
+ <td style="vertical-align: bottom">
+ <button type="button"
+ onClick="sortedList_moveItem('[% param.name FILTER html %]', -1, '[% sortlist_separator %]');">&uarr;</button>
+ </td>
+ </tr>
+
+ <tr>
+ <td style="vertical-align: top">
+ <button type="button"
+ onClick="sortedList_moveItem('[% param.name FILTER html %]', +1, '[% sortlist_separator %]');">&darr;</button>
+ </td>
+ </tr>
+ </table>
+
+ <script type="text/javascript">
+ bz_toggleClass("input_[% param.name FILTER html %]", "bz_default_hidden");
+ bz_toggleClass("table_[% param.name FILTER html %]", "bz_default_hidden");
</script>
[% ELSIF param.type == "s" %]
<select name="[% param.name FILTER html %]" id="[% param.name FILTER html %]">
diff --git a/template/en/default/admin/params/dependencygraph.html.tmpl b/template/en/default/admin/params/dependencygraph.html.tmpl
index 181cced..4cf22d5 100644
--- a/template/en/default/admin/params/dependencygraph.html.tmpl
+++ b/template/en/default/admin/params/dependencygraph.html.tmpl
@@ -44,6 +44,6 @@
The default value is a publicly-accessible webdot server. If you change
this value, make certain that the webdot server can read files from your
webdot directory. On Apache you do this by editing the .htaccess file,
- for other systems the needed measures may vary. You can run checksetup.pl
+ for other systems the needed measures may vary. You can run <kbd>checksetup.pl</kbd>
to recreate the .htaccess file if it has been lost."}
-%] \ No newline at end of file
+%]
diff --git a/template/en/default/admin/params/editparams.html.tmpl b/template/en/default/admin/params/editparams.html.tmpl
index 21fa9fa..8d6a987 100644
--- a/template/en/default/admin/params/editparams.html.tmpl
+++ b/template/en/default/admin/params/editparams.html.tmpl
@@ -56,7 +56,7 @@
title = title
message = message
style_urls = ['skins/standard/params.css']
- javascript_urls = ['js/params.js']
+ javascript_urls = ['js/params.js', 'js/util.js']
doc_section = "parameters.html"
%]
diff --git a/template/en/default/admin/params/general.html.tmpl b/template/en/default/admin/params/general.html.tmpl
index b8c0c77..c19cf14 100644
--- a/template/en/default/admin/params/general.html.tmpl
+++ b/template/en/default/admin/params/general.html.tmpl
@@ -45,7 +45,7 @@
_ " character encodings to UTF-8, using the <kbd>contrib/recode.pl</kbd>"
_ " script</strong>."
_ " <p>Note that if you turn this parameter from &quot;off&quot; to"
- _ " &quot;on&quot;, you must re-run checksetup.pl immediately"
+ _ " &quot;on&quot;, you must re-run <kbd>checksetup.pl</kbd> immediately"
_ " afterward.</p>",
shutdownhtml =>
diff --git a/template/en/default/admin/params/index.html.tmpl b/template/en/default/admin/params/index.html.tmpl
index 1629c8c..9f80245 100644
--- a/template/en/default/admin/params/index.html.tmpl
+++ b/template/en/default/admin/params/index.html.tmpl
@@ -35,7 +35,7 @@
<tr>
<td>
<a href="editparams.cgi?section=
- [%- panel.name FILTER url_quote %]#[% param.name FILTER url_quote %]">
+ [%- panel.name FILTER url_quote %]#[% param.name FILTER url_quote %]_desc">
[% param.name FILTER html %]</a>
</td>
<td>
diff --git a/template/en/default/admin/params/mta.html.tmpl b/template/en/default/admin/params/mta.html.tmpl
index 8533257..05c4485 100644
--- a/template/en/default/admin/params/mta.html.tmpl
+++ b/template/en/default/admin/params/mta.html.tmpl
@@ -50,19 +50,11 @@
_ " email at once. If you enable this parameter, $terms.Bugzilla will"
_ " queue all mail and then send it in the background. This requires"
_ " that you have installed certain Perl modules (as listed by"
- _ " <code>checksetup.pl</code> for this feature), and that you are"
+ _ " <kbd>checksetup.pl</kbd> for this feature), and that you are"
_ " running the <code>jobqueue.pl</code> daemon (otherwise your mail"
_ " won't get sent). This affects all mail sent by $terms.Bugzilla,"
_ " not just $terms.bug updates.",
- sendmailnow => "Sites using anything older than version 8.12 of 'sendmail' " _
- "can achieve a significant performance increase in the " _
- "UI -- at the cost of delaying the sending of mail -- by " _
- "disabling this parameter. Sites using 'sendmail' 8.12 or " _
- "higher should leave this on, as they will see no benefit from " _
- "turning it off. Sites using an MTA other than 'sendmail' " _
- "<b>must</b> leave it on, or no $terms.bug mail will be sent.",
-
smtpserver => "The SMTP server address (if using SMTP for mail delivery).",
smtp_username => "The username to pass to the SMTP server for SMTP authentication. " _
@@ -76,7 +68,7 @@
" $terms.Bugzilla and your SMTP server. You can use this to" _
" troubleshoot email problems.",
- whinedays => "The number of days that we'll let a $terms.bug sit untouched in a NEW " _
+ whinedays => "The number of days that we'll let a $terms.bug sit untouched in a CONFIRMED " _
"state before our cronjob will whine at the owner.<br> " _
"Set to 0 to disable whining.",
diff --git a/template/en/default/admin/params/radius.html.tmpl b/template/en/default/admin/params/radius.html.tmpl
index ef2282d..f12e581 100644
--- a/template/en/default/admin/params/radius.html.tmpl
+++ b/template/en/default/admin/params/radius.html.tmpl
@@ -26,13 +26,13 @@
"(e.g. <code>radius.company.com</code>, or " _
"<code>radius.company.com:portnum</code>).<br>" _
"Required only if " _
- "<a href=\"?section=auth#user_verify_class\">the " _
+ "<a href=\"?section=auth#user_verify_class_desc\">the " _
"<code>user_verify_class</code> parameter</a> contains " _
"<code>RADIUS</code>.",
RADIUS_secret => "Your RADIUS server's secret.<br>" _
"Required only if " _
- "<a href=\"?section=auth#user_verify_class\">the " _
+ "<a href=\"?section=auth#user_verify_class_desc\">the " _
"<code>user_verify_class</code> parameter</a> contains " _
"<code>RADIUS</code>.",
@@ -40,14 +40,14 @@
"data with your RADIUS server. " _
"If unspecified, <code>127.0.0.1</code> will be used.<br>" _
"Useful only if " _
- "<a href=\"?section=auth#user_verify_class\">the " _
+ "<a href=\"?section=auth#user_verify_class_desc\">the " _
"<code>user_verify_class</code> parameter</a> " _
"contains <code>RADIUS</code>.",
RADIUS_email_suffix => "Suffix to append to a RADIUS user name to form an " _
"e-mail address.<br>" _
"Useful only if " _
- "<a href=\"?section=auth#user_verify_class\">the " _
+ "<a href=\"?section=auth#user_verify_class_desc\">the " _
"<code>user_verify_class</code> parameter</a> " _
"contains <code>RADIUS</code>.",
}
diff --git a/template/en/default/admin/params/usermatch.html.tmpl b/template/en/default/admin/params/usermatch.html.tmpl
index 54f1509..d574edc 100644
--- a/template/en/default/admin/params/usermatch.html.tmpl
+++ b/template/en/default/admin/params/usermatch.html.tmpl
@@ -29,6 +29,9 @@
"needs to be selected. This option should not be enabled on " _
"sites where there are a large number of users.",
+ ajax_user_autocompletion => "If this option is set, typing characters in a certain user " _
+ "fields will display a list of matches that can be selected from.",
+
maxusermatches => "Search for no more than this many matches.<br> " _
"If set to '1', no users will be displayed on ambiguous matches. " _
"This is useful for user privacy purposes.<br> " _