summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgerv%gerv.net <>2002-04-20 03:35:39 +0200
committergerv%gerv.net <>2002-04-20 03:35:39 +0200
commit07466db53c0990b4cf9ccdedb08c1a075c18446e (patch)
treea60c8fffb517952a7b19ed20109752168bede811
parentc73a72af3d96ad82ef38d9d27fad2e4b6e87f36c (diff)
downloadbugzilla-07466db53c0990b4cf9ccdedb08c1a075c18446e.tar.gz
bugzilla-07466db53c0990b4cf9ccdedb08c1a075c18446e.tar.xz
Bug 135707 - make template/en/default templates consistent with template/default. Patch by ddk, 2xr=gerv.
-rw-r--r--template/en/default/bug/dependency-tree.html.tmpl9
-rw-r--r--template/en/default/global/header.html.tmpl8
-rw-r--r--template/en/default/search/search-advanced.html.tmpl11
-rw-r--r--template/en/default/search/search.html.tmpl11
4 files changed, 6 insertions, 33 deletions
diff --git a/template/en/default/bug/dependency-tree.html.tmpl b/template/en/default/bug/dependency-tree.html.tmpl
index ba0b8213f..fb6163b24 100644
--- a/template/en/default/bug/dependency-tree.html.tmpl
+++ b/template/en/default/bug/dependency-tree.html.tmpl
@@ -1,3 +1,4 @@
+<!-- 1.0@bugzilla.org -->
[%# 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
@@ -52,9 +53,9 @@
[%# Display the tree of bugs that this bug blocks. %]
<h3>Bugs that bug <a href="show_bug.cgi?id=[% bugid %]">[% bugid %]</a> blocks
[% IF blocked_ids.size > 0 %]
- (<a href="buglist.cgi?branch_id=[% blocked_ids.join(",") %]">view as bug list</a>
+ (<a href="buglist.cgi?bug_id=[% blocked_ids.join(",") %]">view as bug list</a>
[% IF canedit && blocked_ids.size > 1 %]
- | <a href="buglist.cgi?branch_id=[% blocked_ids.join(",") %]&amp;tweak=1">change several</a>
+ | <a href="buglist.cgi?bug_id=[% blocked_ids.join(",") %]&amp;tweak=1">change several</a>
[% END %])
[% IF maxdepth || hide_resolved %]
<small><b>
@@ -86,7 +87,7 @@
<li>
[% "<strike>" IF !dep.open %]
<a href="show_bug.cgi?id=[% dep_id %]">[% dep_id %]
- [[% dep.milestone FILTER html %],
+ [[% IF dep.milestone %][% dep.milestone FILTER html %], [% END %]
[% dep.assignee_email FILTER html %]] -
[% IF dep.seen %]
<i>&lt;This bug appears elsewhere in this tree&gt;</i></a>
@@ -116,7 +117,7 @@
style="display: inline; margin: 0px;">
<input name="id" type="hidden" value="[% bugid %]">
[% IF maxdepth %]
- <input name="maxdepth" type="hidden" value="$maxdepth">
+ <input name="maxdepth" type="hidden" value="[% maxdepth %]">
[% END %]
<input type="hidden" name="hide_resolved" value="[% hide_resolved ? 0 : 1 %]">
<input type="submit" value="[% hide_resolved ? "Show" : "Hide" %] Resolved">
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 4dc89e053..dfb3cc080 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -16,13 +16,7 @@
[% Param('headerhtml') %]
[% jscript %]
-
- <script type="application/x-javascript">
- <!--
- [%+ INCLUDE "help/show-hide.js.tmpl" %]
- // -->
- </script>
-
+
[% IF style %]
<style type="text/css">
[% style %]
diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl
index 85e66356b..3079ea006 100644
--- a/template/en/default/search/search-advanced.html.tmpl
+++ b/template/en/default/search/search-advanced.html.tmpl
@@ -331,17 +331,6 @@ function selectProduct(f) {
{ value => "anywords", description => "contains any of the words" },
{ value => "regexp", description => "matches the regexp" },
{ value => "notregexp", description => "doesn&#8217;t match the regexp" } ] %]
-
-[%# The decent help requires Javascript %]
-<script> <!--
- document.write("<p><a href='query.cgi?help=1'>Give me help</a> with this form (reloads page.)</p>");
-// -->
-</script>
-<noscript>
- <p>
- <a href="queryhelp.cgi">Give me help</a> with this form.
- </p>
-</noscript>
<form method="get" action="buglist.cgi" name="queryform">
diff --git a/template/en/default/search/search.html.tmpl b/template/en/default/search/search.html.tmpl
index 85e66356b..3079ea006 100644
--- a/template/en/default/search/search.html.tmpl
+++ b/template/en/default/search/search.html.tmpl
@@ -331,17 +331,6 @@ function selectProduct(f) {
{ value => "anywords", description => "contains any of the words" },
{ value => "regexp", description => "matches the regexp" },
{ value => "notregexp", description => "doesn&#8217;t match the regexp" } ] %]
-
-[%# The decent help requires Javascript %]
-<script> <!--
- document.write("<p><a href='query.cgi?help=1'>Give me help</a> with this form (reloads page.)</p>");
-// -->
-</script>
-<noscript>
- <p>
- <a href="queryhelp.cgi">Give me help</a> with this form.
- </p>
-</noscript>
<form method="get" action="buglist.cgi" name="queryform">