summaryrefslogtreecommitdiffstats
path: root/template/en/default/request
diff options
context:
space:
mode:
Diffstat (limited to 'template/en/default/request')
-rw-r--r--template/en/default/request/email.txt.tmpl6
-rw-r--r--template/en/default/request/queue.html.tmpl23
2 files changed, 22 insertions, 7 deletions
diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl
index fb957484b..510741eed 100644
--- a/template/en/default/request/email.txt.tmpl
+++ b/template/en/default/request/email.txt.tmpl
@@ -25,7 +25,8 @@
[% bugidsummary = bug.bug_id _ ': ' _ bug.short_desc %]
[% attidsummary = attachment.id _ ': ' _ attachment.description %]
[% flagtype_name = flag ? flag.type.name : old_flag.type.name %]
-[% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "canceled" ,
+[%# Upstreaming: denied (bug 621883) %]
+[% statuses = { '+' => "granted" , '-' => 'not granted' , 'X' => "canceled" ,
'?' => "asked" } %]
[% to_identity = "" %]
@@ -53,6 +54,9 @@ Subject: [% flagtype_name %] [%+ subject_status %]: [[% terms.Bug %] [%+ bug.bug
[Attachment [% attachment.id %]] [% attachment.description FILTER clean_text %][% END %]
Date: [% date %]
X-Bugzilla-Type: request
+[%- IF flag.requestee %]
+X-Bugzilla-Flag-Requestee: [% flag.requestee.email %]
+[% END %]
[%+ threadingmarker %]
[%+ USE wrap -%]
diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl
index 57650de55..0ed14bad7 100644
--- a/template/en/default/request/queue.html.tmpl
+++ b/template/en/default/request/queue.html.tmpl
@@ -25,10 +25,6 @@
[% PROCESS global/header.html.tmpl
title="Request Queue"
- style = "
- table.requests th { text-align: left; }
- table#filtering th { text-align: right; }
- "
onload="var f = document.request_form; selectProduct(f.product, f.component, null, null, 'Any');"
javascript_urls=["js/productform.js", "js/field.js"]
style_urls = ['skins/standard/buglist.css']
@@ -161,10 +157,22 @@ to some group are shown by default.
} %]
[% PROCESS "global/select-menu.html.tmpl" name="group" options=groups default=cgi.param('group') %]
</td>
+ </tr>
+ <tr>
+ <th></th>
+ <td>
+ <label><input type="radio" name="do_union" value="0"
+ [% 'checked="checked"' IF !cgi.param('do_union') %]>AND *</label>
+ <label><input type="radio" name="do_union" value="1"
+ [% 'checked="checked"' IF cgi.param('do_union') %]>OR *</label>
+ </td>
+ <td colspan="3"></td>
<td><input type="submit" id="filter" value="Filter"></td>
</tr>
</table>
+ <p>(* The logical conjunction/disjunction between the requester
+ and the requestee)</p>
</form>
[% column_headers = {
@@ -198,7 +206,10 @@ to some group are shown by default.
[% PROCESS start_new_table %]
[% END %]
[% buglist.${request.bug_id} = 1 %]
- <tr>
+
+ <tr class="bz_bugitem bz_[% request.bug_severity FILTER css_class_quote -%]
+ bz_[% request.priority FILTER css_class_quote -%]
+ bz_[% request.bug_status FILTER css_class_quote %]">
[% FOREACH column = display_columns %]
[% NEXT IF column == group_field || excluded_columns.contains(column) %]
<td>
@@ -238,7 +249,7 @@ to some group are shown by default.
[% BLOCK display_bug %]
<a href="show_bug.cgi?id=[% request.bug_id %]"
[%- ' class="bz_secure"' IF request.restricted %]>
- [% request.bug_id %]: [%+ request.bug_summary FILTER html %]</a>
+ [% request.bug_id %] ([% request.priority FILTER html %]/[% request.bug_severity FILTER html %]): [%+ request.bug_summary FILTER html %]</a>
[% END %]
[% BLOCK display_attachment %]