summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
authormkanat%bugzilla.org <>2009-12-31 13:37:48 +0100
committermkanat%bugzilla.org <>2009-12-31 13:37:48 +0100
commit958e1a758168b4908bcdd237518ab85b93d7e1bb (patch)
tree38c132c3c085445da227f608a6e8c405060cc5ec /template/en/default
parent26f912882a8e99d75d779aeb455f79abf894159b (diff)
downloadbugzilla-958e1a758168b4908bcdd237518ab85b93d7e1bb.tar.gz
bugzilla-958e1a758168b4908bcdd237518ab85b93d7e1bb.tar.xz
Bug 519858 - Move uncommonly used parameters out of the "Required" section and into a "General" and "Advanced" section
Patch by Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=LpSolit
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/admin/params/advanced.html.tmpl42
-rw-r--r--template/en/default/admin/params/core.html.tmpl68
-rw-r--r--template/en/default/admin/params/general.html.tmpl86
-rw-r--r--template/en/default/index.html.tmpl2
-rw-r--r--template/en/default/welcome-admin.html.tmpl9
5 files changed, 133 insertions, 74 deletions
diff --git a/template/en/default/admin/params/advanced.html.tmpl b/template/en/default/admin/params/advanced.html.tmpl
new file mode 100644
index 000000000..d3fe449f8
--- /dev/null
+++ b/template/en/default/admin/params/advanced.html.tmpl
@@ -0,0 +1,42 @@
+[%# The contents of this file are subject to the Mozilla Public
+ # License Version 1.1 (the "License"); you may not use this file
+ # except in compliance with the License. You may obtain a copy of
+ # the License at http://www.mozilla.org/MPL/
+ #
+ # Software distributed under the License is distributed on an "AS
+ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ # implied. See the License for the specific language governing
+ # rights and limitations under the License.
+ #
+ # The Original Code is the Bugzilla Bug Tracking System.
+ #
+ # The Initial Developer of the Original Code is Netscape Communications
+ # Corporation. Portions created by Netscape are
+ # Copyright (C) 1998 Netscape Communications Corporation. All
+ # Rights Reserved.
+ #
+ # Contributor(s): Dave Miller <justdave@bugzilla.org>
+ # Frédéric Buclin <LpSolit@gmail.com>
+ #%]
+
+[%
+ title = "Advanced"
+ desc = "Settings for advanced configurations."
+%]
+
+[% param_descs = {
+ cookiedomain =>
+ "If your website is at 'www.foo.com', setting this to"
+ _ " '.foo.com' will also allow 'bar.foo.com' to access"
+ _ " $terms.Bugzilla cookies. This is useful if you have more than"
+ _ " one hostname pointing at the same web server, and you"
+ _ " want them to share the $terms.Bugzilla cookie.",
+
+ proxy_url =>
+ "$terms.Bugzilla may have to access the web to get notifications about"
+ _ " new releases (see the <tt>upgrade_notification</tt> parameter)."
+ _ " If your $terms.Bugzilla server is behind a proxy, it may be"
+ _ " 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.",
+} %]
diff --git a/template/en/default/admin/params/core.html.tmpl b/template/en/default/admin/params/core.html.tmpl
index b65dde233..b1578f422 100644
--- a/template/en/default/admin/params/core.html.tmpl
+++ b/template/en/default/admin/params/core.html.tmpl
@@ -25,20 +25,9 @@
%]
[% param_descs = {
- maintainer => "The email address of the person who maintains this installation " _
- "of ${terms.Bugzilla}.",
-
urlbase => "The URL that is the common initial leading part of all $terms.Bugzilla " _
"URLs.",
- docs_urlbase => "The URL that is the common initial leading part of all " _
- "$terms.Bugzilla documentation URLs. " _
- "It may be an absolute URL, or a URL relative to urlbase " _
- "above. " _
- "Leave this empty to suppress links to the documentation." _
- "'%lang%' will be replaced by user's preferred language " _
- "(if available).",
-
sslbase => "The URL that is the common initial leading part of all HTTPS " _
"(SSL) $terms.Bugzilla URLs.",
@@ -49,13 +38,6 @@
_ " $terms.Bugzilla will send out links using <tt>sslbase</tt> in emails"
_ " instead of <tt>urlbase</tt>.",
- cookiedomain => "The domain for $terms.Bugzilla cookies. Normally blank. " _
- "If your website is at 'www.foo.com', setting this to " _
- "'.foo.com' will also allow 'bar.foo.com' to access " _
- "$terms.Bugzilla cookies. This is useful if you have more than " _
- "one hostname pointing at the same web server, and you " _
- "want them to share the $terms.Bugzilla cookie.",
-
cookiepath => "Path, relative to your web document root, to which to restrict " _
"$terms.Bugzilla cookies. Normally this is the URI portion of your URL " _
"base. Begin with a / (single slash mark). For instance, if " _
@@ -63,52 +45,4 @@
"this parameter to /bugzilla/. Setting it to / will allow " _
"all sites served by this web server or virtual host to read " _
"$terms.Bugzilla cookies.",
-
- utf8 => "Use UTF-8 (Unicode) encoding for all text in ${terms.Bugzilla}. New " _
- "installations should set this to true to avoid character encoding " _
- "problems. <strong>Existing databases should set this to true " _
- " only after the data has been converted from existing legacy " _
- " character encodings to UTF-8, using the " _
- " <kbd>contrib/recode.pl</kbd> script</strong>. <br><br> Note " _
- " that if you turn this parameter from &quot;off&quot; to " _
- " &quot;on&quot;, you must re-run checksetup.pl immediately " _
- " afterward.",
-
- shutdownhtml => "If this field is non-empty, then $terms.Bugzilla will be completely " _
- "disabled and this text will be displayed instead of all the " _
- "$terms.Bugzilla pages.",
-
- announcehtml => "If this field is non-empty, then $terms.Bugzilla will " _
- "display whatever is in this field at the top of every " _
- "HTML page. The HTML you put in this field is not " _
- "wrapped or enclosed in anything; you might want to " _
- "wrap it inside a <tt>&lt;div&gt;</tt>. Give the div " _
- "<em>id=message</em> to get green text inside a " _
- "red box, or <em>class=bz_private</em> for dark " _
- "red on a red background. Anything defined in " _
- "<tt>skins/standard/global.css</tt> or " _
- "<tt>skins/custom/global.css</tt> will work. To get " _
- "centered text, use <em>style=\"text-align: " _
- "center;\"</em>.",
-
- proxy_url => "$terms.Bugzilla may have to access the web to get notifications about new " _
- "releases, see the <tt>upgrade_notification</tt> parameter. In case you are " _
- "behind a proxy, it may be necessary to enter its URL if the web server " _
- "group cannot access the HTTP_PROXY environment variable. If you have to " _
- "authenticate, use the <code>http://user:pass@proxy_url/</code> syntax.",
-
- upgrade_notification => "<p>$terms.Bugzilla can inform you when a new release is available. " _
- "The notification will appear on the $terms.Bugzilla homepage, " _
- "for administrators only.</p>" _
- "<ul><li>'development_snapshot' notifies you about the latest " _
- "release on the trunk, i.e. development snapshots.</li>" _
- "<li>'latest_stable_release' notifies you about the most recent release " _
- "available on the most recent stable branch. This branch may be " _
- "different from the branch your installation is based on.</li>" _
- "<li>'stable_branch_release' notifies you only about new releases " _
- "corresponding to the branch your installation is based on. " _
- "If you are running a release candidate, you will get " _
- "a notification for newer release candidates too.</li>" _
- "<li>'disabled' will never notify you about new releases and no " _
- "connection will be established to a remote server.</li></ul>" }
-%]
+} %]
diff --git a/template/en/default/admin/params/general.html.tmpl b/template/en/default/admin/params/general.html.tmpl
new file mode 100644
index 000000000..b8c0c77ed
--- /dev/null
+++ b/template/en/default/admin/params/general.html.tmpl
@@ -0,0 +1,86 @@
+[%# The contents of this file are subject to the Mozilla Public
+ # License Version 1.1 (the "License"); you may not use this file
+ # except in compliance with the License. You may obtain a copy of
+ # the License at http://www.mozilla.org/MPL/
+ #
+ # Software distributed under the License is distributed on an "AS
+ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ # implied. See the License for the specific language governing
+ # rights and limitations under the License.
+ #
+ # The Original Code is the Bugzilla Bug Tracking System.
+ #
+ # The Initial Developer of the Original Code is Netscape Communications
+ # Corporation. Portions created by Netscape are
+ # Copyright (C) 1998 Netscape Communications Corporation. All
+ # Rights Reserved.
+ #
+ # Contributor(s): Dave Miller <justdave@bugzilla.org>
+ # Frédéric Buclin <LpSolit@gmail.com>
+ #%]
+
+[%
+ title = "General"
+ desc = "Miscellaneous general settings that are not required."
+%]
+
+[% param_descs = {
+ maintainer =>
+ "The email address of the person who maintains this installation "
+ _ " of ${terms.Bugzilla}.",
+
+ docs_urlbase =>
+ "The URL that is the common initial leading part of all"
+ _ " $terms.Bugzilla documentation URLs. It may be an absolute URL,"
+ _ " or a URL relative to the <tt>urlbase</tt> parameter. Leave this"
+ _ " empty to suppress links to the documentation."
+ _ "'%lang%' will be replaced by user's preferred language (if"
+ _ " documentation is available in that language).",
+
+ utf8 =>
+ "Use UTF-8 (Unicode) encoding for all text in ${terms.Bugzilla}. New"
+ _ " installations should set this to true to avoid character encoding"
+ _ " problems. <strong>Existing databases should set this to true"
+ _ " only after the data has been converted from existing legacy"
+ _ " 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"
+ _ " afterward.</p>",
+
+ shutdownhtml =>
+ "If this field is non-empty, then $terms.Bugzilla will be completely"
+ _ " disabled and this text will be displayed instead of all the"
+ _ " $terms.Bugzilla pages.",
+
+ announcehtml =>
+ "If this field is non-empty, then $terms.Bugzilla will"
+ _ " display whatever is in this field at the top of every"
+ _ " HTML page. The HTML you put in this field is not wrapped or"
+ _ " enclosed in anything. You might want to wrap it inside a"
+ _ "<tt>&lt;div&gt;</tt>. Give the div <em>id=\"message\"</em> to get"
+ _ " green text inside a red box, or <em>class=\"bz_private\"</em> for"
+ _ " dark red on a red background. Anything defined in "
+ _ " <tt>skins/standard/global.css</tt> or <tt>skins/custom/global.css</tt>"
+ _ " will work. To get centered text, use <em>style=\"text-align: "
+ _ " center;\"</em>.",
+
+ upgrade_notification =>
+ "$terms.Bugzilla can inform you when a new release is available."
+ _ " The notification will appear on the $terms.Bugzilla homepage,"
+ _ " for administrators only."
+ _ " <ul><li>'development_snapshot' notifies you about the development "
+ _ " snapshot that has been released.</li>"
+ _ " <li>'latest_stable_release' notifies you about the most recent"
+ _ " release available on the most recent stable branch. This branch"
+ _ " may be different from the branch your installation is based on.</li>"
+ _ " <li>'stable_branch_release' notifies you only about new releases"
+ _ " corresponding to the branch your installation is based on."
+ _ " If you are running a release candidate, you will get a notification"
+ _ " for newer release candidates too.</li>"
+ _ " <li>'disabled' will never notify you about new releases and no"
+ _ " connection will be established to a remote server.</li></ul>"
+ _ " <p>Note that if your $terms.Bugzilla server requires a proxy to"
+ _ " access the Internet, you may also need to set the <tt>proxy_url</tt>"
+ _ " parameter in the Advanced section.</p>",
+} %]
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index dd00d3550..6dfcdc751 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -96,7 +96,7 @@ YAHOO.util.Event.onDOMReady(onLoadActions);
<p class="notice">This message is only shown to logged in users with admin privs.
You can configure this notification from the
- <a href="editparams.cgi?section=core#upgrade_notification">Parameters</a> page.</p>
+ <a href="editparams.cgi?section=general#upgrade_notification">Parameters</a> page.</p>
[% ELSIF release.error == "cannot_download" %]
<p>The local XML file '[% release.xml_file FILTER html %]' cannot be created.
Please make sure the web server can write in this directory and that you can access
diff --git a/template/en/default/welcome-admin.html.tmpl b/template/en/default/welcome-admin.html.tmpl
index 6e5e36ba4..3c03fb234 100644
--- a/template/en/default/welcome-admin.html.tmpl
+++ b/template/en/default/welcome-admin.html.tmpl
@@ -41,9 +41,6 @@
parameters for this installation; among others:</p>
<ul>
- <li><a href="editparams.cgi?section=core#maintainer">maintainer</a>, the person
- responsible for this installation if something is running wrong.</li>
-
<li><a href="editparams.cgi?section=core#urlbase">urlbase</a>, which is the URL
pointing to this installation and which will be used in emails (which is also the
reason you see this page: as long as this parameter is not set, you will see this
@@ -52,9 +49,9 @@
<li><a href="editparams.cgi?section=core#cookiepath">cookiepath</a> is important
for your browser to manage your cookies correctly.</li>
- <li><a href="editparams.cgi?section=core#utf8">utf8</a> will let you encode all
- texts into UTF-8, if desired (it is strongly recommended to keep this parameter
- turned on).</li>
+ <li><a href="editparams.cgi?section=general#maintainer">maintainer</a>,
+ the person responsible for this installation if something is
+ running wrongly.</li>
</ul>
<p>Also important are the following parameters:</p>