diff options
author | gerv%gerv.net <> | 2002-04-22 04:30:20 +0000 |
---|---|---|
committer | gerv%gerv.net <> | 2002-04-22 04:30:20 +0000 |
commit | 379af653e173a2aa6bdf8a68c18b4584fae30fe6 (patch) | |
tree | f6e4db81092f3f1a67b7683c5998a69aead01d16 /template/en/default/bug/process/midair.html.tmpl | |
parent | 8d135242d4a7241bd6ad70c6ec004a1dadd6e502 (diff) | |
download | bugs-379af653e173a2aa6bdf8a68c18b4584fae30fe6.tar bugs-379af653e173a2aa6bdf8a68c18b4584fae30fe6.tar.gz bugs-379af653e173a2aa6bdf8a68c18b4584fae30fe6.tar.bz2 bugs-379af653e173a2aa6bdf8a68c18b4584fae30fe6.tar.xz bugs-379af653e173a2aa6bdf8a68c18b4584fae30fe6.zip |
Bug 135707 - rearrange templates to normalise filenames, and create directory structure which allows for localised versions of the templates. Earlier versions of these templates can be found, cvs removed, scattered around bugzilla/template/default; but there are no substantial changes between their initial checkin there and here.
Diffstat (limited to 'template/en/default/bug/process/midair.html.tmpl')
-rw-r--r-- | template/en/default/bug/process/midair.html.tmpl | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl new file mode 100644 index 000000000..89ac71fe3 --- /dev/null +++ b/template/en/default/bug/process/midair.html.tmpl @@ -0,0 +1,75 @@ +<!-- 1.0@bugzilla.org --> +[%# 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): Myk Melez <myk@mozilla.org> + #%] + +[%# INTERFACE: + # form: hash; the form values submitted to the script + # operations: array; bug activity since the user last displayed the bug form, + # used by show/activity.html.tmpl to display recent changes that will be + # overwritten if the user submits these changes. See that template + # for further documentation. + # start_at: number; the comment at which show/comments.tmpl should begin + # displaying comments, either the index of the last comment (if the user + # entered a comment along with their change) or a number less than that + # (if they didn't), in which case no comments are displayed. + # comments: array; all the comments on the bug. + # 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> + +<p> + [% PROCESS "show/activity.html.tmpl" incomplete_data=0 %] +</p> + +[% IF comments.size > start_at %] +<p> + Added comments: + <blockquote> + [% PROCESS "show/comments.tmpl" %] + </blockquote> +</p> +[% END %] + +<p> +You have the following choices: +</p> + +<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 + [% ", except for the added comment(s)" IF comments.size > start_at %]. + </form> + </li> + <li> + <a href="show_bug.cgi?id=[% bug_id %]">Throw away my changes, + and revisit bug [% bug_id %]</a> + </li> +</ul> + +[% PROCESS global/footer %] |