summaryrefslogtreecommitdiffstats
path: root/template/default/global
diff options
context:
space:
mode:
authormyk%mozilla.org <>2002-02-03 18:27:02 +0100
committermyk%mozilla.org <>2002-02-03 18:27:02 +0100
commit0742929eb43ee5e3e67b59a9159ca416cbd0d4be (patch)
tree8a3a47b645da6d0a41e5d7220b71ec0ff1098757 /template/default/global
parentb5aa3e4f8caa39de11efc8b8c28eeaf09f4cc9db (diff)
downloadbugzilla-0742929eb43ee5e3e67b59a9159ca416cbd0d4be.tar.gz
bugzilla-0742929eb43ee5e3e67b59a9159ca416cbd0d4be.tar.xz
Fix for bug 121747: Stops every script before it does anything else if Bugzilla is currently shut down. Also adds global template
instantiation code to globals.pl. Patch by Myk Melez <myk@mozilla.org>. r=gerv,kiko
Diffstat (limited to 'template/default/global')
-rwxr-xr-xtemplate/default/global/header13
-rw-r--r--template/default/global/message.html.tmpl16
2 files changed, 21 insertions, 8 deletions
diff --git a/template/default/global/header b/template/default/global/header
index 1efdbf51c..627a52571 100755
--- a/template/default/global/header
+++ b/template/default/global/header
@@ -41,11 +41,8 @@
</table>
[% END %]
- [% IF message %]
- <table width="100%" cellspacing="0" cellpadding="5" border="1"><tr><td>
- <font color="green">[% message %]</font>
- </td></tr></table>
- [% END %]
-
- [% Param('shutdownhtml') %]
-
+[% IF message %]
+ <table width="100%" cellspacing="0" cellpadding="5" border="1"><tr><td>
+ <font color="green">[% message %]</font>
+ </td></tr></table>
+[% END %]
diff --git a/template/default/global/message.html.tmpl b/template/default/global/message.html.tmpl
new file mode 100644
index 000000000..03253242a
--- /dev/null
+++ b/template/default/global/message.html.tmpl
@@ -0,0 +1,16 @@
+[% DEFAULT title = "Bugzilla Message" %]
+
+[% INCLUDE global/header title=title %]
+
+[%# 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. %]
+
+[%# Display a URL if the calling script has included one. %]
+[% IF url && link %]
+ <p>
+ <a href="[% url %]">[% link %]</a>
+ </p>
+[% END %]
+
+[% INCLUDE global/footer %]