From 40a4bbb0e6a57e7f8f2b0bc5a59235ab33392f91 Mon Sep 17 00:00:00 2001 From: Dave Lawrence Date: Mon, 17 Sep 2012 12:39:39 -0400 Subject: Bug 778731 - Add email flag to NEEDINFO state r=glob --- .../template/en/default/bug/needinfo.html.tmpl | 86 ++++++++++++++++++++++ .../attachment/create-form_before_submit.html.tmpl | 17 +++++ .../edit-after_comment_textarea.html.tmpl | 12 +++ .../hook/bug/edit-after_comment_textarea.html.tmpl | 11 +++ 4 files changed, 126 insertions(+) create mode 100644 extensions/Needinfo/template/en/default/bug/needinfo.html.tmpl create mode 100644 extensions/Needinfo/template/en/default/hook/attachment/create-form_before_submit.html.tmpl create mode 100644 extensions/Needinfo/template/en/default/hook/attachment/edit-after_comment_textarea.html.tmpl create mode 100644 extensions/Needinfo/template/en/default/hook/bug/edit-after_comment_textarea.html.tmpl (limited to 'extensions/Needinfo/template') diff --git a/extensions/Needinfo/template/en/default/bug/needinfo.html.tmpl b/extensions/Needinfo/template/en/default/bug/needinfo.html.tmpl new file mode 100644 index 000000000..8810b5f21 --- /dev/null +++ b/extensions/Needinfo/template/en/default/bug/needinfo.html.tmpl @@ -0,0 +1,86 @@ +[%# 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. + #%] + +[% show_needinfo = 0 %] +[% needinfo_requested = 0 %] +[% needinfo_from = "" %] +[% needinfo_from_any = 0 %] + +[% FOREACH type = bug.flag_types %] + [% IF type.name == 'needinfo' %] + [% show_needinfo = 1 %] + [% FOREACH flag = type.flags %] + [% IF flag.status == '?' %] + [% needinfo_requested = 1 %] + [% IF flag.requestee.login %] + [% needinfo_from = flag.requestee.login %] + [% ELSE %] + [% needinfo_from_any = 1 %] + [% END %] + [% END %] + [% END %] + [% END %] +[% END %] + +[% IF show_needinfo %] + [%# Displays NEEDINFO tag in bug header %] + [% IF needinfo_requested %] + + [% END %] + +
+ [% IF needinfo_requested %] + [% IF needinfo_from == user.login || needinfo_from_any %] + Adding comment will automatically clear needinfo request. + [% ELSE %] + + + [% END %] + [% END %] + + [% IF user.in_group('canconfirm') && !is_attachment + && !needinfo_requested && bug.status.is_open %] + + + + + + [%+ INCLUDE global/userselect.html.tmpl + id => "needinfo_from" + name => "needinfo_from" + size => 30 + value => "" + %] + + [% END %] +
+[% END %] diff --git a/extensions/Needinfo/template/en/default/hook/attachment/create-form_before_submit.html.tmpl b/extensions/Needinfo/template/en/default/hook/attachment/create-form_before_submit.html.tmpl new file mode 100644 index 000000000..ea9c17bd5 --- /dev/null +++ b/extensions/Needinfo/template/en/default/hook/attachment/create-form_before_submit.html.tmpl @@ -0,0 +1,17 @@ +[%# 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. + #%] + + +   + + [% PROCESS bug/needinfo.html.tmpl + bug => bug + is_attachment => 1 + %] + + diff --git a/extensions/Needinfo/template/en/default/hook/attachment/edit-after_comment_textarea.html.tmpl b/extensions/Needinfo/template/en/default/hook/attachment/edit-after_comment_textarea.html.tmpl new file mode 100644 index 000000000..8f03fc752 --- /dev/null +++ b/extensions/Needinfo/template/en/default/hook/attachment/edit-after_comment_textarea.html.tmpl @@ -0,0 +1,12 @@ +[%# 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. + #%] + +[% PROCESS bug/needinfo.html.tmpl + bug => attachment.bug + is_attachment => 1 +%] diff --git a/extensions/Needinfo/template/en/default/hook/bug/edit-after_comment_textarea.html.tmpl b/extensions/Needinfo/template/en/default/hook/bug/edit-after_comment_textarea.html.tmpl new file mode 100644 index 000000000..90f0cc584 --- /dev/null +++ b/extensions/Needinfo/template/en/default/hook/bug/edit-after_comment_textarea.html.tmpl @@ -0,0 +1,11 @@ +[%# 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. + #%] + +[% PROCESS bug/needinfo.html.tmpl + bug = bug +%] -- cgit v1.2.3-24-g4f1b