summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorEd Morley <emorley@mozilla.com>2015-03-19 08:16:30 +0100
committerByron Jones <glob@mozilla.com>2015-03-19 08:16:30 +0100
commit6638a015487885a47bb0ba851865ef8b073d08fb (patch)
tree114070587bef8d7eb8dbc1f833258adbcd73dafd /template/en
parent2f65ef51e9ba430783a2d9ef06e0aa0af041d510 (diff)
downloadbugzilla-6638a015487885a47bb0ba851865ef8b073d08fb.tar.gz
bugzilla-6638a015487885a47bb0ba851865ef8b073d08fb.tar.xz
Bug 1105568: Add support for HTML flagmail
r=glob,a=glob
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/email/flagmail-header.txt.tmpl28
-rw-r--r--template/en/default/email/flagmail.html.tmpl80
-rw-r--r--template/en/default/email/flagmail.txt.tmpl11
3 files changed, 108 insertions, 11 deletions
diff --git a/template/en/default/email/flagmail-header.txt.tmpl b/template/en/default/email/flagmail-header.txt.tmpl
new file mode 100644
index 000000000..8aa3955f7
--- /dev/null
+++ b/template/en/default/email/flagmail-header.txt.tmpl
@@ -0,0 +1,28 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ #
+ # This Source Code Form is "Incompatible With Secondary Licenses", as
+ # defined by the Mozilla Public License, v. 2.0.
+ #%]
+
+[% flagtype_name = flag ? flag.type.name : old_flag.type.name %]
+[% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "canceled" ,
+ '?' => "asked" } %]
+
+[% action = flag.status || 'X' %]
+
+[% IF flag && flag.status == '?' %]
+ [% subject_status = "requested" %]
+[% ELSE %]
+ [% subject_status = statuses.$action %]
+[% END %]
+From: [% Param('mailfrom') %]
+To: [% to %]
+Subject: [% flagtype_name %] [%+ subject_status %]: [[% terms.Bug %] [%+ bug.bug_id %]] [% bug.short_desc %]
+[%- IF attachment %] :
+ [Attachment [% attachment.id %]] [% attachment.description FILTER clean_text %][% END %]
+Date: [% date %]
+X-Bugzilla-Type: request
+[%+ INCLUDE "email/header-common.txt.tmpl" %]
+[%+ threadingmarker %]
diff --git a/template/en/default/email/flagmail.html.tmpl b/template/en/default/email/flagmail.html.tmpl
new file mode 100644
index 000000000..314455c65
--- /dev/null
+++ b/template/en/default/email/flagmail.html.tmpl
@@ -0,0 +1,80 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ #
+ # This Source Code Form is "Incompatible With Secondary Licenses", as
+ # defined by the Mozilla Public License, v. 2.0.
+ #%]
+
+[% flagtype_name = flag ? flag.type.name : old_flag.type.name %]
+[% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "canceled" ,
+ '?' => "asked" } %]
+
+[% action = flag.status || 'X' %]
+
+[% pending_request = (flag && flag.status == '?') %]
+[% reassigned = (pending_request && flag.setter_id != user.id) %]
+[% was_pending_request = (old_flag && old_flag.status == '?') %]
+
+<html>
+ <head>
+ <base href="[% urlbase FILTER html %]">
+ </head>
+ <body>
+ <p>
+ [% INCLUDE global/user.html.tmpl user = to_user, who = user %] has
+ [% IF reassigned =%]
+ reassigned [% INCLUDE global/user.html.tmpl user = to_user, who = flag.setter %]'s request for
+ [% IF old_flag.requestee.defined %]
+ [%= INCLUDE global/user.html.tmpl user = to_user, who = old_flag.requestee %]'s
+ [% END %]
+ [%= flagtype_name FILTER html %]
+ [% IF flag.requestee.defined =%]
+ to [% INCLUDE global/user.html.tmpl user = to_user, who = flag.requestee %]
+ [% END %]
+ [% ELSE %]
+ [%= statuses.$action FILTER html %]
+ [% IF pending_request %]
+ [%= INCLUDE global/user.html.tmpl user = to_user, who = flag.requestee %] for
+ [% ELSIF was_pending_request %]
+ [%= INCLUDE global/user.html.tmpl user = to_user, who = old_flag.setter %]'s request for
+ [% IF old_flag.requestee.defined %]
+ [%= INCLUDE global/user.html.tmpl user = to_user, who = old_flag.requestee %]'s
+ [% END %]
+ [% END %]
+ <b>[% flagtype_name FILTER html %]</b>
+ [% END %]:
+ </p>
+
+ <p>
+ [% "$terms.Bug $bug.bug_id" FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %]:
+ [%= bug.short_desc FILTER html %]
+ </p>
+
+ [% IF attachment %]
+ <p>
+ <a href="[% urlbase FILTER html %]attachment.cgi?id=[% attachment.id FILTER html ~%]
+ &action=edit">Attachment [% attachment.id FILTER html %]</a>:
+ [%= attachment.description FILTER html %]
+ </p>
+ [% END %]
+
+ [% Hook.process('after_summary') %]
+
+ <p>
+ [% FOREACH comment = new_comments %]
+ <div>
+ [% IF comment.count %]
+ <b>[% "Comment # ${comment.count}" FILTER bug_link(bug,
+ {comment_num => comment.count, full_url => 1, user => to_user}) FILTER none =%]
+ on [% "$terms.bug $bug.id" FILTER bug_link(bug, { full_url => 1, user => to_user }) FILTER none =%]
+ from [% INCLUDE global/user.html.tmpl user = to_user, who = comment.author %]</b>
+ [% ELSE %]
+ <b>Description:</b>
+ [% END %]
+ <pre>[% comment.body_full({ wrap => 1 }) FILTER markdown(bug, comment, to_user) %]</pre>
+ </div>
+ [% END %]
+ </p>
+ </body>
+</html>
diff --git a/template/en/default/email/flagmail.txt.tmpl b/template/en/default/email/flagmail.txt.tmpl
index cf64d9661..9b80a493d 100644
--- a/template/en/default/email/flagmail.txt.tmpl
+++ b/template/en/default/email/flagmail.txt.tmpl
@@ -17,7 +17,6 @@
[% action = flag.status || 'X' %]
[% IF flag && flag.status == '?' %]
- [% subject_status = "requested" %]
[% IF flag.setter_id == user.id %]
[% to_identity = flag.requestee.identity _ " for" %]
[% ELSE %]
@@ -31,17 +30,7 @@
[% requestee_identity = old_flag.requestee.identity _ "'s" %]
[% END %]
[% END %]
- [% subject_status = statuses.$action %]
[% END %]
-From: [% Param('mailfrom') %]
-To: [% to %]
-Subject: [% flagtype_name %] [%+ subject_status %]: [[% terms.Bug %] [%+ bug.bug_id %]] [% bug.short_desc %]
-[%- IF attachment %] :
- [Attachment [% attachment.id %]] [% attachment.description FILTER clean_text %][% END %]
-Date: [% date %]
-X-Bugzilla-Type: request
-[%+ INCLUDE "email/header-common.txt.tmpl" %]
-[%+ threadingmarker %]
[%+ USE wrap -%]
[%- FILTER bullet = wrap(80) -%]
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-25 11:05:42 +0100