summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
Diffstat (limited to 'template')
-rw-r--r--template/en/default/filterexceptions.pl5
-rw-r--r--template/en/default/global/header.html.tmpl2
-rw-r--r--template/en/default/global/help.html.tmpl13
-rw-r--r--template/en/default/search/search-advanced.html.tmpl32
4 files changed, 19 insertions, 33 deletions
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 72ab1550a..f605ca82e 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -216,11 +216,6 @@
'bug.bug_id',
],
-'global/help.html.tmpl' => [
- 'h.id',
- 'h.html',
-],
-
'global/choose-product.html.tmpl' => [
'target',
],
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index ec906f3e6..ad1df396d 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -82,8 +82,6 @@
[% END %]
[% END %]
- [%+ INCLUDE "global/help-header.html.tmpl" %]
-
[%# Set up the skin CSS cascade:
# 1. Standard Bugzilla stylesheet set (persistent)
# 2. Standard Bugzilla stylesheet set (selectable)
diff --git a/template/en/default/global/help.html.tmpl b/template/en/default/global/help.html.tmpl
index cc69534da..4ac309f90 100644
--- a/template/en/default/global/help.html.tmpl
+++ b/template/en/default/global/help.html.tmpl
@@ -23,12 +23,11 @@
[% cgi = Bugzilla.cgi %]
[% IF cgi.param("help") %]
- [% IF cgi.user_agent("Mozilla/5") %]
- [% FOREACH h = help_html %]
- <div id="[% h.id %]_help" class="help" style="display: none;">
- [%- h.html -%]
- </div>
- [% END %]
- [% END %]
+ <script type="text/javascript"> <!--
+ [% FOREACH h = help_html %]
+ g_helpTexts["[% h.id FILTER js %]"] = "[%- h.html FILTER js -%]";
+ [% END %]
+ // -->
+ </script>
[% END %]
diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl
index 5d9849caf..22dc1dd7d 100644
--- a/template/en/default/search/search-advanced.html.tmpl
+++ b/template/en/default/search/search-advanced.html.tmpl
@@ -37,9 +37,10 @@ var queryform = "queryform"
[% PROCESS global/header.html.tmpl
title = "Search for $terms.bugs"
- onload = "doOnSelectProduct(0); initHelp();"
+ onload = "doOnSelectProduct(0); enableHelp();"
javascript = js_data
- javascript_urls = [ "js/productform.js" ]
+ javascript_urls = [ "js/productform.js" "js/util.js" "js/help.js" ]
+ style_urls = [ "skins/standard/help.css" ]
style = "dl.bug_changes dt {
margin-top: 15px;
}"
@@ -50,25 +51,19 @@ var queryform = "queryform"
[% button_name = "Search" %]
[%# The decent help requires Javascript %]
+<script type="text/javascript"> <!--
[% IF NOT cgi.param("help") %]
- [% IF cgi.user_agent("Mozilla/5") %]
- <script type="text/javascript"> <!--
- document.write("<p><a href='query.cgi?help=1&amp;format=advanced'>Give me some help<\/a> (reloads page).<\/p>");
- // -->
- </script>
- [% END %]
+ document.write("<p><a href='query.cgi?help=1&amp;format=advanced'>Give me some help<\/a> (reloads page).<\/p>");
[% ELSE %]
- <p>
- For help, mouse over the page elements.
- <font color="red">
- [% IF cgi.user_agent("Mozilla/5") %]
- Note that if the help popups are hidden by form element scroll bars,
- this is a b<!-- word broken up to pass test 009 -->ug in your browser,
- not in [% terms.Bugzilla %].
- [% END %]
- </font>
- </p>
+ [% PROCESS "search/search-help.html.tmpl" %]
+ if (generateHelp())
+ document.write("<p>For help, mouse over the page elements.<\/p>");
+ else
+ document.write("<p>Help initialization failed, no help available.<\/p>");
[% END %]
+// -->
+</script>
+
<form method="get" action="buglist.cgi" name="queryform">
[% PROCESS search/form.html.tmpl %]
@@ -81,7 +76,6 @@ var queryform = "queryform"
</form>
-[% PROCESS "search/search-help.html.tmpl" IF cgi.param("help") %]
[% END %]