From 64d770c3a09d82b06cc47f72d1155466f25f7505 Mon Sep 17 00:00:00 2001 From: "kiko%async.com.br" <> Date: Wed, 29 Oct 2003 12:32:39 +0000 Subject: Fix for bug 221039: Separating knob in edit.html.tmpl. Splits bug/edit.html.tmpl into bug/knob.html.tmpl. Patch by Ludovic Dubost , r=kiko, a=justdave. --- template/en/default/bug/edit.html.tmpl | 120 +-------------------------- template/en/default/bug/knob.html.tmpl | 144 +++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+), 119 deletions(-) create mode 100644 template/en/default/bug/knob.html.tmpl (limited to 'template/en/default/bug') diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 911035da1..7c5273be5 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -515,125 +515,7 @@ [% END %] [% END %] -[%# *** Knob *** %] - -
- - Leave as [% bug.bug_status FILTER html %]  - [% bug.resolution FILTER html %] -
- - [% knum = 1 %] - - [% IF bug.bug_status == "UNCONFIRMED" && - bug.user.canconfirm %] - - Confirm [% terms.bug %] (change status to NEW) -
- [% knum = knum + 1 %] - [% END %] - - [% IF bug.user.canedit %] - [% IF bug.isopened %] - [% IF bug.bug_status != "ASSIGNED" && bug.user.canconfirm %] - - Accept [% terms.bug %] ( - [% IF bug.isunconfirmed %]confirm [% terms.bug %], [% END %]change - status to ASSIGNED) -
- [% knum = knum + 1 %] - [% END %] - - [% IF bug.resolution %] - - Clear the resolution (remove the current resolution of - [% bug.resolution FILTER html %])
- [% knum = knum + 1 %] - [% END %] - - - Resolve [% terms.bug %], changing resolution to - -
- [% knum = knum + 1 %] - - - Resolve [% terms.bug %], mark it as duplicate of [% terms.bug %] # - -
- [% knum = knum + 1 %] - - - Reassign [% terms.bug %] to - -
- [% IF bug.isunconfirmed && bug.user.canconfirm %] -      - and confirm [% terms.bug %] (change status to NEW) -
- [% END %] - [% knum = knum + 1 %] - - - Reassign [% terms.bug %] to owner - [% " and QA contact" IF Param('useqacontact') %] - of selected component -
- [% IF bug.isunconfirmed && bug.user.canconfirm %] -      - and confirm [% terms.bug %] (change status to NEW) -
- [% END %] - [% knum = knum + 1 %] - [% ELSE %] - [% IF bug.resolution != "MOVED" || - (bug.resolution == "MOVED" && bug.user.canmove) %] - Reopen [% terms.bug %] -
- [% knum = knum + 1 %] - [% END %] - [% IF bug.bug_status == "RESOLVED" %] - - Mark [% terms.bug %] as VERIFIED
- [% knum = knum + 1 %] - [% END %] - [% IF bug.bug_status != "CLOSED" %] - - Mark [% terms.bug %] as CLOSED
- [% knum = knum + 1 %] - [% END %] - [% END %] - [% END %] - - - -

- - - View [% terms.Bug %] Activity -   |   - Format For Printing - - - - [% IF bug.user.canmove %] -   |   - - [% END %] -

+[% PROCESS bug/knob.html.tmpl %] [%# *** Additional Comments *** %] diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl new file mode 100644 index 000000000..dfcd4437b --- /dev/null +++ b/template/en/default/bug/knob.html.tmpl @@ -0,0 +1,144 @@ + +[%# 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 + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Gervase Markham + # Vaskin Kissoyan + #%] + +[% PROCESS global/variables.none.tmpl %] + +[%# *** Knob *** %] + +
+ + Leave as [% bug.bug_status FILTER html %]  + [% bug.resolution FILTER html %] +
+ + [% knum = 1 %] + + [% IF bug.bug_status == "UNCONFIRMED" && + bug.user.canconfirm %] + + Confirm [% terms.bug %] (change status to NEW) +
+ [% knum = knum + 1 %] + [% END %] + + [% IF bug.user.canedit %] + [% IF bug.isopened %] + [% IF bug.bug_status != "ASSIGNED" && bug.user.canconfirm %] + + Accept [% terms.bug %] ( + [% IF bug.isunconfirmed %]confirm [% terms.bug %], [% END %]change + status to ASSIGNED) +
+ [% knum = knum + 1 %] + [% END %] + + [% IF bug.resolution %] + + Clear the resolution (remove the current resolution of + [% bug.resolution FILTER html %])
+ [% knum = knum + 1 %] + [% END %] + + + Resolve [% terms.bug %], changing resolution to + +
+ [% knum = knum + 1 %] + + + Resolve [% terms.bug %], mark it as duplicate of [% terms.bug %] # + +
+ [% knum = knum + 1 %] + + + Reassign [% terms.bug %] to + +
+ [% IF bug.isunconfirmed && bug.user.canconfirm %] +      + and confirm [% terms.bug %] (change status to NEW) +
+ [% END %] + [% knum = knum + 1 %] + + + Reassign [% terms.bug %] to owner + [% " and QA contact" IF Param('useqacontact') %] + of selected component +
+ [% IF bug.isunconfirmed && bug.user.canconfirm %] +      + and confirm [% terms.bug %] (change status to NEW) +
+ [% END %] + [% knum = knum + 1 %] + [% ELSE %] + [% IF bug.resolution != "MOVED" || + (bug.resolution == "MOVED" && bug.user.canmove) %] + Reopen [% terms.bug %] +
+ [% knum = knum + 1 %] + [% END %] + [% IF bug.bug_status == "RESOLVED" %] + + Mark [% terms.bug %] as VERIFIED
+ [% knum = knum + 1 %] + [% END %] + [% IF bug.bug_status != "CLOSED" %] + + Mark [% terms.bug %] as CLOSED
+ [% knum = knum + 1 %] + [% END %] + [% END %] + [% END %] + + + +

+ + + View [% terms.Bug %] Activity +   |   + Format For Printing + + + + [% IF bug.user.canmove %] +   |   + + [% END %] +

+ -- cgit v1.2.3-24-g4f1b