From c30cf5bb3eb1149ea43ae6018fae22164d6cd010 Mon Sep 17 00:00:00 2001 From: "gerv%gerv.net" <> Date: Sat, 27 Jul 2002 03:49:02 +0000 Subject: Bug 158658 - relogin.cgi should use a template. This also adds the ability to localise messages. Patch by gerv; r=burnus. --- template/en/default/global/header.html.tmpl | 4 +++ template/en/default/global/message.html.tmpl | 7 ++-- template/en/default/global/messages.html.tmpl | 50 +++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 template/en/default/global/messages.html.tmpl (limited to 'template/en') diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index a6fe70190..d4cd092f9 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -33,6 +33,10 @@ # message: string. A message to display to the user. May contain HTML. #%] +[% IF message %] + [% PROCESS global/messages.html.tmpl %] +[% END %] + [% DEFAULT h1 = title h2 = "" diff --git a/template/en/default/global/message.html.tmpl b/template/en/default/global/message.html.tmpl index 14e1f10d0..f6cb321c6 100644 --- a/template/en/default/global/message.html.tmpl +++ b/template/en/default/global/message.html.tmpl @@ -28,11 +28,10 @@ [% PROCESS global/header.html.tmpl %] -[%# The "header" template automatically displays the contents of a "message" - variable if it finds one, so it is not necessary to display the message - here. %] +[%# The "header" template automatically displays a message if it finds one. + Note that the global messages list is in messages.html.tmpl. %] -[%# Display a URL if the calling script has included one. %] +[%# Display a URL if the calling script or message block has included one. %] [% IF url && link %]
[% link %]
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
new file mode 100644
index 000000000..2cc25e0c5
--- /dev/null
+++ b/template/en/default/global/messages.html.tmpl
@@ -0,0 +1,50 @@
+
+[%# 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): Gervase Markham