summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authormyk%mozilla.org <>2002-11-12 03:02:03 +0100
committermyk%mozilla.org <>2002-11-12 03:02:03 +0100
commit15767ab7c1238e83e1c6d62c6b95c373f4bfd034 (patch)
treefb3033248addabbaaca61085025990583dfc6dca /template/en
parentbe1bdf3972e95f617138f631e466875e7bd0b34c (diff)
downloadbugzilla-15767ab7c1238e83e1c6d62c6b95c373f4bfd034.tar.gz
bugzilla-15767ab7c1238e83e1c6d62c6b95c373f4bfd034.tar.xz
Fix for bug 179360: puts the filters at the top of the request queue and eliminates that empty table that sometimes is at the top of the
queue. r=bbaetz a=myk
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/request/queue.html.tmpl98
1 files changed, 51 insertions, 47 deletions
diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl
index a3449da8e..7060fadaa 100644
--- a/template/en/default/request/queue.html.tmpl
+++ b/template/en/default/request/queue.html.tmpl
@@ -35,53 +35,7 @@
<script language="JavaScript" type="text/javascript" src="productmenu.js"></script>
[% END %]
-[% PROCESS global/header.html.tmpl
- title="Request Queue"
- style = "
- table.requests th { text-align: left; }
- table#filter th { text-align: right; }
- "
-%]
-
-[% column_headers = {
- "type" => "Flag" ,
- "status" => "Status" ,
- "bug" => "Bug" ,
- "attachment" => "Attachment" ,
- "requester" => "Requester" ,
- "requestee" => "Requestee" ,
- "created" => "Created" ,
- "category" => "Product/Component" } %]
-
-[% DEFAULT display_columns = ["requester", "requestee", "type", "bug", "attachment", "created"]
- group_field = "Requestee"
- group_value = ""
-%]
-
-[% IF requests.size == 0 %]
- <p>
- No requests.
- </p>
-[% ELSE %]
- [% PROCESS start_new_table %]
- [% FOREACH request = requests %]
- [% IF request.$group_field != group_value %]
- </table>
- [% PROCESS start_new_table %]
- [% group_value = request.$group_field %]
- [% END %]
- <tr>
- [% FOREACH column = display_columns %]
- [% NEXT IF column == group_field || excluded_columns.contains(column) %]
- <td>[% PROCESS "display_$column" %]</td>
- [% END %]
- </tr>
- [% END %]
- </table>
-[% END %]
-
-<h3>Filter the Queue</h3>
-
+[% filter_form = BLOCK %]
<form action="request.cgi" method="get">
<input type="hidden" name="action" value="queue">
@@ -147,6 +101,56 @@
</table>
</form>
+[% END %]
+
+[% PROCESS global/header.html.tmpl
+ title="Request Queue"
+ h2=filter_form
+ style = "
+ table.requests th { text-align: left; }
+ table#filter th { text-align: right; }
+ "
+%]
+
+[% column_headers = {
+ "type" => "Flag" ,
+ "status" => "Status" ,
+ "bug" => "Bug" ,
+ "attachment" => "Attachment" ,
+ "requester" => "Requester" ,
+ "requestee" => "Requestee" ,
+ "created" => "Created" ,
+ "category" => "Product/Component" } %]
+
+[% DEFAULT display_columns = ["requester", "requestee", "type", "bug", "attachment", "created"]
+ group_field = "Requestee"
+ group_value = ""
+%]
+
+
+[% IF requests.size == 0 %]
+ <p>
+ No requests.
+ </p>
+[% ELSE %]
+ [% FOREACH request = requests %]
+ [% IF loop.first %] [% PROCESS start_new_table %] [% END %]
+ [% IF request.$group_field != group_value %]
+ [% group_value = request.$group_field %]
+ [% UNLESS loop.first %]
+ </table>
+ [% PROCESS start_new_table %]
+ [% END %]
+ [% END %]
+ <tr>
+ [% FOREACH column = display_columns %]
+ [% NEXT IF column == group_field || excluded_columns.contains(column) %]
+ <td>[% PROCESS "display_$column" %]</td>
+ [% END %]
+ </tr>
+ [% END %]
+ </table>
+[% END %]
[% PROCESS global/footer.html.tmpl %]