From 5f7726c010bf79f584d1224e39070ca0f64fe4ff Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Thu, 8 Jul 2010 04:18:38 +0200 Subject: Bug 577407: Several HTML elements have the same ID when editing parameters r/a=mkanat --- template/en/default/admin/params/attachment.html.tmpl | 2 +- template/en/default/admin/params/common.html.tmpl | 2 +- template/en/default/admin/params/index.html.tmpl | 2 +- template/en/default/admin/params/radius.html.tmpl | 8 ++++---- template/en/default/index.html.tmpl | 6 +++--- template/en/default/welcome-admin.html.tmpl | 12 ++++++------ 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/template/en/default/admin/params/attachment.html.tmpl b/template/en/default/admin/params/attachment.html.tmpl index e6f6cb778..12fd491fc 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.

" _ "

Note that if you have set the" - _ " cookiedomain" + _ " cookiedomain" _" parameter, you should set attachment_base to use a" _ " domain that would not be matched by" _ " cookiedomain.

" diff --git a/template/en/default/admin/params/common.html.tmpl b/template/en/default/admin/params/common.html.tmpl index 870451ebc..3ec38ca56 100644 --- a/template/en/default/admin/params/common.html.tmpl +++ b/template/en/default/admin/params/common.html.tmpl @@ -28,7 +28,7 @@
[% FOREACH param = panel.param_list %] -
[% param.name FILTER html %]
+
[% param.name FILTER html %]
[% panel.param_descs.${param.name} FILTER none %]

[% IF param.type == "t" %] diff --git a/template/en/default/admin/params/index.html.tmpl b/template/en/default/admin/params/index.html.tmpl index 1629c8c6f..9f8024528 100644 --- a/template/en/default/admin/params/index.html.tmpl +++ b/template/en/default/admin/params/index.html.tmpl @@ -35,7 +35,7 @@ + [%- panel.name FILTER url_quote %]#[% param.name FILTER url_quote %]_desc"> [% param.name FILTER html %] diff --git a/template/en/default/admin/params/radius.html.tmpl b/template/en/default/admin/params/radius.html.tmpl index ef2282d45..f12e581b7 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. radius.company.com, or " _ "radius.company.com:portnum).
" _ "Required only if " _ - "the " _ + "the " _ "user_verify_class parameter contains " _ "RADIUS.", RADIUS_secret => "Your RADIUS server's secret.
" _ "Required only if " _ - "the " _ + "the " _ "user_verify_class parameter contains " _ "RADIUS.", @@ -40,14 +40,14 @@ "data with your RADIUS server. " _ "If unspecified, 127.0.0.1 will be used.
" _ "Useful only if " _ - "the " _ + "the " _ "user_verify_class parameter " _ "contains RADIUS.", RADIUS_email_suffix => "Suffix to append to a RADIUS user name to form an " _ "e-mail address.
" _ "Useful only if " _ - "the " _ + "the " _ "user_verify_class parameter " _ "contains RADIUS.", } diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 4d760c6f8..5e0de5d2d 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -96,12 +96,12 @@ YAHOO.util.Event.onDOMReady(onLoadActions);

This message is only shown to logged in users with admin privs. You can configure this notification from the - Parameters page.

+ Parameters page.

[% ELSIF release.error == "cannot_download" %]

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 the web. If you are behind a proxy, set the - proxy_url parameter correctly.

+ proxy_url parameter correctly.

[% ELSIF release.error == "no_update" %]

The local XML file '[% release.xml_file FILTER html %]' cannot be updated. Please make sure the web server can edit this file.

@@ -114,7 +114,7 @@ YAHOO.util.Event.onDOMReady(onLoadActions); [% ELSIF release.error == "unknown_parameter" %]

'[% Param("upgrade_notification") FILTER html %]' is not a valid notification parameter. Please check this parameter in the - Parameters page.

+ Parameters page.

[% END %] [% END %] diff --git a/template/en/default/welcome-admin.html.tmpl b/template/en/default/welcome-admin.html.tmpl index 3c03fb234..289a6bd7d 100644 --- a/template/en/default/welcome-admin.html.tmpl +++ b/template/en/default/welcome-admin.html.tmpl @@ -41,15 +41,15 @@ parameters for this installation; among others:

    -
  • urlbase, which is the URL +
  • urlbase, 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 page again and again).
    • -
  • cookiepath is important +
  • cookiepath is important for your browser to manage your cookies correctly.
    • -
  • maintainer, +
  • maintainer, the person responsible for this installation if something is running wrongly.
@@ -57,12 +57,12 @@

Also important are the following parameters:

    -
  • requirelogin, if turned +
  • requirelogin, if turned on, will protect your installation from users having no account on this installation. In other words, users who are not explicitly authenticated with a valid account cannot see any data. This is what you want if you want to keep your data private.
    • -
  • createemailregexp +
  • createemailregexp defines which users are allowed to create an account on this installation. If set to ".*" (the default), everybody is free to create his own account. If set to "@mycompany.com$", only users having an account @mycompany.com will be allowed to @@ -71,7 +71,7 @@ installation, you must absolutely set this parameter to something different from the default.
    • -
  • mail_delivery_method +
  • mail_delivery_method defines the method used to send emails, such as sendmail or SMTP. You have to set it correctly to send emails.
-- cgit v1.2.3-24-g4f1b