[Openfirst-cvscommit] www/htdocs/bugzilla/bug/process bugmail.html.tmpl,NONE,1.1 header.html.tmpl,NONE,1.1 confirm-duplicate.html.tmpl,1.1,1.2 midair.html.tmpl,1.1,1.2 next.html.tmpl,1.1,1.2 results.html.tmpl,1.1,1.2 verify-new-product.html.tmpl,1.1,1.2

[Tim G. <xt...@us...>]

Update of /cvsroot/openfirst/www/htdocs/bugzilla/bug/process
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32743/bug/process

Modified Files:
	confirm-duplicate.html.tmpl midair.html.tmpl next.html.tmpl 
	results.html.tmpl verify-new-product.html.tmpl 
Added Files:
	bugmail.html.tmpl header.html.tmpl 
Log Message:
Bring templates up to date for Bugzilla 2.18.1

--- NEW FILE: bugmail.html.tmpl ---
[%# 1....@bu... %]
[%# 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): Bradley Baetz <bb...@st...>
  #                 J. Paul Reed <pr...@si...>
  #%]

[%# INTERFACE:
  # mailing_bugid: string. ID of the bug this mail is concerning.
  # mailrecipients: hash. People involved in this change. Hash has up to five
  #                elements:
  #                changer: string. The login name of the user who made the
  #                change.
  #
  #                For bug changes where people need to be notified:
  #                 owner: string. The login name of the bug assignee.
  #                 reporter: string. The login name of the bug reporter.
  #                 qacontact: string. The login name of the bug's QA contact.
  #                  Optional.
  #                 cc: list of strings. The login names of those on the CC
  #                  list.
  #%]

[% PROCESS global/variables.none.tmpl %]

[% mail = SendBugMail(mailing_bugid, mailrecipients) %]

[% PROCESS emails
   description = "Email sent to"
   names = mail.sent
%]
<br>
[% PROCESS emails
   description = "Excluding"
   names = mail.excluded
%]
<br>
<center>
  If you wish to tweak the kinds of mail [% terms.Bugzilla %] sends you, you can
  <a href="userprefs.cgi?tab=email">change your preferences</a>.
</center>


[%############################################################################%]
[%# Block for a set of email addresses                                       #%]
[%############################################################################%]

[% BLOCK emails %]
  <b>[% description FILTER html %]:</b>
  [% IF names.size > 0 %]
    [%+ FOREACH name = names %]
      [% name FILTER html %][% ", " UNLESS loop.last() %]
    [% END %]
  [% ELSE %]
    no one
  [% END %]
[% END %]

Index: next.html.tmpl
===================================================================
RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/process/next.html.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** next.html.tmpl	28 Jun 2004 00:55:12 -0000	1.1
--- next.html.tmpl	15 May 2005 15:04:54 -0000	1.2
***************
*** 1,3 ****
! <!-- 1....@bu... -->
  [%# The contents of this file are subject to the Mozilla Public
    # License Version 1.1 (the "License"); you may not use this file
--- 1,3 ----
! [%# 1....@bu... %]
  [%# The contents of this file are subject to the Mozilla Public
    # License Version 1.1 (the "License"); you may not use this file
***************
*** 21,32 ****
  
  [%# INTERFACE:
!   # next_id : number; the ID of the next bug in the user's bug list.
    #%]
  
  <hr>
  
  <p>
!   The next bug in your list is bug
!   <a href="show_bug.cgi?id=[% next_id %]">[% next_id %]</a>:
  </p>
  
--- 21,67 ----
  
  [%# INTERFACE:
!   # bug : Bug object; the next bug to show
    #%]
  
+ [% PROCESS global/variables.none.tmpl %]
+ 
  <hr>
  
  <p>
!   The next [% terms.bug %] in your list is [% terms.bug %]
!   <a href="show_bug.cgi?id=[% bug.bug_id %]">[% bug.bug_id %]</a>:
  </p>
  
+ <hr>
+ <table border="0" cellspacing="0" width="100%">
+   <tr>
+     <td valign="top" align="left" nowrap="nowrap">
+       <font size="+1">
+         <b>[%+ terms.Bugzilla %] [%+ terms.Bug %] [%+ bug.bug_id %]</b>
+       </font>
+     </td>
+     <td valign="middle" align="left">
+       &nbsp;
+     </td>
+     <td valign="middle" align="left">
+       [% bug.short_desc FILTER html %]
+     </td>
+     <td valign="middle" align="right">
+       Last modified: [% bug.delta_ts FILTER time %]
+     </td>
+   </tr>
+ </table>
+ 
+ [% PROCESS bug/navigate.html.tmpl %]
+ 
+ <hr>
+ 
+ [% PROCESS "bug/edit.html.tmpl" %]
+ 
+ <hr>
+ 
+ [% PROCESS bug/navigate.html.tmpl %]
+ 
+ <br>
+ 
+ [% PROCESS global/footer.html.tmpl %]

--- NEW FILE: header.html.tmpl ---
[%# 1....@bu... %]
[%# 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 <ge...@ge...>
  #%]

[%# INTERFACE:
  # As global/header.html.tmpl.
  #%]

[% PROCESS global/variables.none.tmpl %]

[% IF    title_tag == "bug_processed" %]
  [% title = "$terms.Bug processed" %]
[% ELSIF title_tag == "mid_air" %]
  [% title = "Mid-air collision!" %]
[% END %]

[% PROCESS global/header.html.tmpl %]

Index: verify-new-product.html.tmpl
===================================================================
RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/process/verify-new-product.html.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** verify-new-product.html.tmpl	28 Jun 2004 00:55:12 -0000	1.1
--- verify-new-product.html.tmpl	15 May 2005 15:04:54 -0000	1.2
***************
*** 1,3 ****
! <!-- 1....@bu... -->
  [%# The contents of this file are subject to the Mozilla Public
    # License Version 1.1 (the "License"); you may not use this file
--- 1,3 ----
! [%# 1....@bu... %]
  [%# The contents of this file are subject to the Mozilla Public
    # License Version 1.1 (the "License"); you may not use this file
***************
*** 23,27 ****
    # form: hash; the form values submitted to the script
    # mform: hash; the form multi-values submitted to the script
!   # verify_fields: boolean; whether or not to verify 
    #   the version, component, and target milestone fields
    # versions: array; versions for the new product.
--- 23,27 ----
    # form: hash; the form values submitted to the script
    # mform: hash; the form multi-values submitted to the script
!   # verify_fields: boolean; whether or not to verify
    #   the version, component, and target milestone fields
    # versions: array; versions for the new product.
***************
*** 32,42 ****
    # verify_bug_group: boolean; whether or not to ask the user
    #   if they want to add the bug to its new product's group
!   # use_target_milestone: boolean; whether or not to use 
    #   the target milestone field
    #%]
!  
  <form action="process_bug.cgi" method="post">
  
! [% PROCESS "global/hidden-fields.html.tmpl" 
       exclude=(verify_fields ? "^version|component|target_milestone$" : "") %]
  
--- 32,46 ----
    # verify_bug_group: boolean; whether or not to ask the user
    #   if they want to add the bug to its new product's group
!   # use_target_milestone: boolean; whether or not to use
    #   the target milestone field
    #%]
! 
! [% PROCESS global/variables.none.tmpl %]
! 
! [% PROCESS global/header.html.tmpl %]
! 
  <form action="process_bug.cgi" method="post">
  
! [% PROCESS "global/hidden-fields.html.tmpl"
       exclude=(verify_fields ? "^version|component|target_milestone$" : "") %]
  
***************
*** 47,56 ****
    <p>
    [% IF use_target_milestone %]
!     You are moving the bug(s) to the product <b>[% form.product %]</b>, 
      and the version, component, and/or target milestone fields are no longer
      correct.  Please set the correct version, component, and target milestone now:
    [% ELSE %]
!     You are moving the bug(s) to the product <b>[% form.product %]</b>, 
!     and the version and component fields are no longer correct.  
      Please set the correct version and component now:
    [% END %]
--- 51,62 ----
    <p>
    [% IF use_target_milestone %]
!     You are moving the [% terms.bug %](s) to the product 
!     <b>[% form.product FILTER html %]</b>,
      and the version, component, and/or target milestone fields are no longer
      correct.  Please set the correct version, component, and target milestone now:
    [% ELSE %]
!     You are moving the [% terms.bug %](s) to the product 
!     <b>[% form.product FILTER html %]</b>,
!     and the version and component fields are no longer correct.
      Please set the correct version and component now:
    [% END %]
***************
*** 77,86 ****
  
  [% END %]
!        
  [% IF verify_bug_group %]
!   <h3>Verify Bug Group</h3>
  
    <p>
!     Do you want to add the bug to its new product's group (if any)?
    </p>
  
--- 83,92 ----
  
  [% END %]
! 
  [% IF verify_bug_group %]
!   <h3>Verify [% terms.Bug %] Group</h3>
  
    <p>
!     Do you want to add the [% terms.bug %] to its new product's default groups (if any)?
    </p>
  
***************
*** 89,93 ****
      <input type="radio" name="addtonewgroup" value="yes"><b>yes</b><br>
      <input type="radio" name="addtonewgroup" value="yesifinold" checked="checked">
!       <b>yes, but only if the bug was in its old product's group</b><br>
    </p>
  [% END %]
--- 95,99 ----
      <input type="radio" name="addtonewgroup" value="yes"><b>yes</b><br>
      <input type="radio" name="addtonewgroup" value="yesifinold" checked="checked">
!       <b>yes, but only if the [% terms.bug %] was in any of its old product's default groups</b><br>
    </p>
  [% END %]
***************
*** 97,101 ****
  </form>
  <hr>
! <a href="query.cgi">Cancel and Return to the Query Page</a>
  
  [% PROCESS global/footer.html.tmpl %]
--- 103,107 ----
  </form>
  <hr>
! <a href="query.cgi">Cancel and Return to the Search Page</a>
  
  [% PROCESS global/footer.html.tmpl %]

Index: results.html.tmpl
===================================================================
RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/process/results.html.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** results.html.tmpl	28 Jun 2004 00:55:12 -0000	1.1
--- results.html.tmpl	15 May 2005 15:04:54 -0000	1.2
***************
*** 1,3 ****
! <!-- 1....@bu... -->
  [%# The contents of this file are subject to the Mozilla Public
    # License Version 1.1 (the "License"); you may not use this file
--- 1,3 ----
! [%# 1....@bu... %]
  [%# The contents of this file are subject to the Mozilla Public
    # License Version 1.1 (the "License"); you may not use this file
***************
*** 26,41 ****
    #   is changed, "dupe" when a duplication notation is added to a bug,
    #   and "dep" when a bug is checked for changes to its dependencies.
    #%]
  
  [% DEFAULT type="bug" %]
  
! [% 
    title = {
!     'bug' => "Changes submitted for bug $id" , 
!     'dupe' => "Duplicate notation added to bug $id" , 
!     'dep' => "Checking for dependency changes on bug $id" , 
!     'votes' => "Bug $id confirmed by number of votes" , 
!     'created' => "Bug $id has been added to the database" , 
!   } 
  %]
  
--- 26,49 ----
    #   is changed, "dupe" when a duplication notation is added to a bug,
    #   and "dep" when a bug is checked for changes to its dependencies.
+   #
+   # mailrecipients: hash; BugMail recipient params. Optional.
    #%]
  
+ [% PROCESS global/variables.none.tmpl %]
+ 
+ [% UNLESS header_done %]
+   [% PROCESS bug/process/header.html.tmpl %]
+ [% END %]
+ 
  [% DEFAULT type="bug" %]
  
! [%
    title = {
!     'bug' => "Changes submitted for $terms.bug $id" ,
!     'dupe' => "Duplicate notation added to $terms.bug $id" ,
!     'dep' => "Checking for dependency changes on $terms.bug $id" ,
!     'votes' => "$terms.Bug $id confirmed by number of votes" ,
!     'created' => "$terms.Bug $id has been added to the database" ,
!   }
  %]
  
***************
*** 44,51 ****
      <td>
        <h2>[% title.$type %]</h2>
!       [% mail %]
      </td>
      <td>
!       <a href="show_bug.cgi?id=[% id %]">Back To BUG# [% id %]</a>
      </td>
    </tr>
--- 52,59 ----
      <td>
        <h2>[% title.$type %]</h2>
!       [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = id %]
      </td>
      <td>
!       <a href="show_bug.cgi?id=[% id %]">Back To [% terms.Bug %]# [% id %]</a>
      </td>
    </tr>

Index: midair.html.tmpl
===================================================================
RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/process/midair.html.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** midair.html.tmpl	28 Jun 2004 00:55:12 -0000	1.1
--- midair.html.tmpl	15 May 2005 15:04:54 -0000	1.2
***************
*** 1,3 ****
! <!-- 1....@bu... -->
  [%# The contents of this file are subject to the Mozilla Public
    # License Version 1.1 (the "License"); you may not use this file
--- 1,3 ----
! [%# 1....@bu... %]
  [%# The contents of this file are subject to the Mozilla Public
    # License Version 1.1 (the "License"); you may not use this file
***************
*** 34,42 ****
    # bug_id: number; the ID of the bug being changed.
    #%]
!  
  <h1>Mid-air collision detected!</h1>
  
  <p>
!   Someone else has made changes to this bug at the same time you were trying to.
    The changes made were:
  </p>
--- 34,48 ----
    # bug_id: number; the ID of the bug being changed.
    #%]
! 
! [% PROCESS global/variables.none.tmpl %]
! 
! [% UNLESS header_done %]
!   [% PROCESS bug/process/header.html.tmpl %]
! [% END %]
! 
  <h1>Mid-air collision detected!</h1>
  
  <p>
!   Someone else has made changes to this [% terms.bug %] at the same time you were trying to.
    The changes made were:
  </p>
***************
*** 45,49 ****
    [% PROCESS "bug/activity/table.html.tmpl" incomplete_data=0 %]
  </p>
!           
  [% IF comments.size > start_at %]
  <p>
--- 51,55 ----
    [% PROCESS "bug/activity/table.html.tmpl" incomplete_data=0 %]
  </p>
! 
  [% IF comments.size > start_at %]
  <p>
***************
*** 61,66 ****
  <ul>
    <li>
!     <form method="post">
!       [% PROCESS "global/hidden-fields.html.tmpl" exclude="^(Bugzilla|LDAP)_(login|password)$" %]
        <input type="submit" value="Submit my changes anyway">
          This will cause all of the above changes to be overwritten
--- 67,72 ----
  <ul>
    <li>
!     <form method="post" action="process_bug.cgi">
!       [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]
        <input type="submit" value="Submit my changes anyway">
          This will cause all of the above changes to be overwritten
***************
*** 69,74 ****
    </li>
    <li>
!     <a href="show_bug.cgi?id=[% bug_id %]">Throw away my changes, 
!       and revisit bug [% bug_id %]</a>
    </li>
  </ul>
--- 75,80 ----
    </li>
    <li>
!     <a href="show_bug.cgi?id=[% bug_id %]">Throw away my changes,
!       and revisit [% terms.bug %] [%+ bug_id %]</a>
    </li>
  </ul>

Index: confirm-duplicate.html.tmpl
===================================================================
RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/process/confirm-duplicate.html.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** confirm-duplicate.html.tmpl	28 Jun 2004 00:55:12 -0000	1.1
--- confirm-duplicate.html.tmpl	15 May 2005 15:04:54 -0000	1.2
***************
*** 1,3 ****
! <!-- 1....@bu... -->
  [%# The contents of this file are subject to the Mozilla Public
    # License Version 1.1 (the "License"); you may not use this file
--- 1,3 ----
! [%# 1....@bu... %]
  [%# The contents of this file are subject to the Mozilla Public
    # License Version 1.1 (the "License"); you may not use this file
***************
*** 27,45 ****
    # duplicate_bug_id: number; the bug number for the bug
    #   being duped
!   # cclist_accessible: boolean; whether or not users on the cc: list 
    #   of the original bug can access that bug.
    #%]
!  
  [% PROCESS global/header.html.tmpl title="Duplicate Warning" %]
!     
  <p>
!   When marking a bug as a duplicate, the reporter of the duplicate 
!   is normally added to the CC list of the original. The permissions 
!   on bug [% original_bug_id %] (the original) are currently set 
    such that the reporter would not normally be able to see it.
  </p>
  
  <p>
!   <b>Adding the reporter to the CC list of bug [% original_bug_id %] 
    [% IF cclist_accessible %]
      will immediately
--- 27,48 ----
    # duplicate_bug_id: number; the bug number for the bug
    #   being duped
!   # cclist_accessible: boolean; whether or not users on the cc: list
    #   of the original bug can access that bug.
    #%]
! 
! [% PROCESS global/variables.none.tmpl %]
! 
  [% PROCESS global/header.html.tmpl title="Duplicate Warning" %]
! 
  <p>
!   When marking [% terms.abug %] as a duplicate, the reporter of the duplicate
!   is normally added to the CC list of the original. The permissions
!   on [% terms.bug %] [%+ original_bug_id %] (the original) are currently set
    such that the reporter would not normally be able to see it.
  </p>
  
  <p>
!   <b>Adding the reporter to the CC list of [% terms.bug %] 
!     [%+ original_bug_id %]
    [% IF cclist_accessible %]
      will immediately
***************
*** 47,69 ****
      might, in the future,
    [% END %]
!   allow him/her access to view this bug.</b>
    Do you wish to do this?
  </p>
-     
- <form method="post">
  
! [% PROCESS "global/hidden-fields.html.tmpl" exclude="^(Bugzilla|LDAP)_(login|password)$" %]
  
  <p>
!   <input type="radio" name="confirm_add_duplicate" value="1"> 
!     Yes, add the reporter to CC list on bug [% original_bug_id %]
  </p>
  <p>
!   <input type="radio" name="confirm_add_duplicate" value="0" checked="checked"> 
!     No, do not add the reporter to CC list on bug [% original_bug_id %]
  </p>
  <p>
!   <a href="show_bug.cgi?id=[% duplicate_bug_id %]">Throw away my changes, 
!     and revisit bug [% duplicate_bug_id %]</a>
  <p>
    <input type="submit" value="Submit">
--- 50,73 ----
      might, in the future,
    [% END %]
!   allow him/her access to view this [% terms.bug %].</b>
    Do you wish to do this?
  </p>
  
! <form method="post" action="process_bug.cgi">
! 
! [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]
  
  <p>
!   <input type="radio" name="confirm_add_duplicate" value="1">
!     Yes, add the reporter to CC list on [% terms.bug %] [%+ original_bug_id %]
  </p>
  <p>
!   <input type="radio" name="confirm_add_duplicate" value="0" checked="checked">
!     No, do not add the reporter to CC list on [% terms.bug %] 
!     [%+ original_bug_id %]
  </p>
  <p>
!   <a href="show_bug.cgi?id=[% duplicate_bug_id %]">Throw away my changes,
!     and revisit [% terms.bug %] [%+ duplicate_bug_id %]</a>
  <p>
    <input type="submit" value="Submit">