From 958e1a758168b4908bcdd237518ab85b93d7e1bb Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Thu, 31 Dec 2009 12:37:48 +0000
Subject: Bug 519858 - Move uncommonly used parameters out of the "Required"
section and into a "General" and "Advanced" section Patch by Max
Kanat-Alexander $terms.Bugzilla can inform you when a new release is available. " _
- "The notification will appear on the $terms.Bugzilla homepage, " _
- "for administrators only. Note that if you turn this parameter from "off" to"
+ _ " "on", you must re-run checksetup.pl immediately"
+ _ " afterward. Note that if your $terms.Bugzilla server requires a proxy to"
+ _ " access the Internet, you may also need to set the proxy_url"
+ _ " parameter in the Advanced section. This message is only shown to logged in users with admin privs.
You can configure this notification from the
- Parameters page.http://user:pass@proxy_url/
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 sslbase in emails"
_ " instead of urlbase.",
- 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. Existing databases should set this to true " _
- " only after the data has been converted from existing legacy " _
- " character encodings to UTF-8, using the " _
- " contrib/recode.pl script.
Note " _
- " that if you turn this parameter from "off" to " _
- " "on", 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 <div>. Give the div " _
- "id=message to get green text inside a " _
- "red box, or class=bz_private for dark " _
- "red on a red background. Anything defined in " _
- "skins/standard/global.css or " _
- "skins/custom/global.css will work. To get " _
- "centered text, use style=\"text-align: " _
- "center;\".",
-
- proxy_url => "$terms.Bugzilla may have to access the web to get notifications about new " _
- "releases, see the upgrade_notification 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 http://user:pass@proxy_url/
syntax.",
-
- upgrade_notification => "
" }
-%]
+} %]
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
"
+ _ "
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:
Also important are the following parameters:
-- cgit v1.2.3-24-g4f1b