From 03ad2ba8d181eeb39ce224005e348ff6f9d3b119 Mon Sep 17 00:00:00 2001 From: "gerv%gerv.net" <> Date: Thu, 4 Apr 2002 02:54:12 +0000 Subject: Bug 124937 - templatise show_activity.cgi. Patch by me, r=myk, bbaetz. --- template/default/show/activity.html.tmpl | 91 ++++++++++++++++++++++++++++ template/default/show/bug-activity.html.tmpl | 42 +++++++++++++ template/default/show/comments.tmpl | 2 +- template/default/show/multiple.tmpl | 3 +- template/default/show/show_bug.html.tmpl | 4 +- 5 files changed, 139 insertions(+), 3 deletions(-) create mode 100644 template/default/show/activity.html.tmpl create mode 100644 template/default/show/bug-activity.html.tmpl (limited to 'template/default') diff --git a/template/default/show/activity.html.tmpl b/template/default/show/activity.html.tmpl new file mode 100644 index 000000000..12fcc2b6e --- /dev/null +++ b/template/default/show/activity.html.tmpl @@ -0,0 +1,91 @@ +[%# 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 + #%] + +[%# INTERFACE: + # operations: array of hashes. May be empty. Each has has three members: + # who: string. who performed the operation + # when: string. when they performed it + # changes: hash. Details of what they changed. This hash has three + # compulsory and one optional member: + # field: string. The name of the field + # removed: string. What was removed from the field + # added: string. What was added to the field + # attach_id: integer. If the change was adding an attachment, its id. + # incomplete_data: boolean. True if some of the data is incomplete (because + # it was affected by an old Bugzilla bug.) + #%] + +[% IF incomplete_data %] +

+ There used to be a bug Bugzilla which caused activity data + to be lost if there was a large number of cc's or dependencies. That + has been fixed, however, there was some data already lost on this bug + that could not be regenerated. The changes that the script could not + reliably determine are prefixed by '?'. +

+[% END %] + +[% IF operations.size > 0 %] + + + + + + + + + + [% FOREACH operation = operations %] + + + + [% FOREACH change = operation.changes %] + [% "" IF loop.index > 0 %] + + + + [% "" IF loop.index > 0 %] + [% END %] + + [% END %] +
WhoWhenWhatRemovedAdded
+ [% operation.who %] + + [% operation.when %] +
+ [% IF change.attachid %] + + Attachment #[% change.attachid %] + [% END %] + [% change.field %] + + [% IF change.removed %] + [% change.removed FILTER html %] + [% ELSE %] +   + [% END %] + + [% IF change.added %] + [% change.added FILTER html %] + [% ELSE %] +   + [% END %] +
+[% END %] diff --git a/template/default/show/bug-activity.html.tmpl b/template/default/show/bug-activity.html.tmpl new file mode 100644 index 000000000..b298eb0d9 --- /dev/null +++ b/template/default/show/bug-activity.html.tmpl @@ -0,0 +1,42 @@ +[%# 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 + #%] + +[%# INTERFACE: + # bug_id: integer. The bug ID. + # + # This template also needs to be called with the interface to the + # activity.html.tmpl template fulfilled. + #%] + +[% INCLUDE global/header + title = "Changes made to bug $bug_id" + h1 = "Activity log" + h2 = "Bug $bug_id" + %] + +
+ +[% INCLUDE show/activity.html.tmpl %] + +

+ Back to bug [% bug_id %] +

+ +[% INCLUDE global/footer %] diff --git a/template/default/show/comments.tmpl b/template/default/show/comments.tmpl index 7bdbdc06c..a840d6324 100644 --- a/template/default/show/comments.tmpl +++ b/template/default/show/comments.tmpl @@ -20,7 +20,7 @@ [% DEFAULT start_at = 0 %] [% count = 0 %] -[% FOREACH comment = bug.comments %] +[% FOREACH comment = comments %] [% IF count >= start_at %] [% PROCESS a_comment %] [% END %] diff --git a/template/default/show/multiple.tmpl b/template/default/show/multiple.tmpl index de5e6c251..8706d8912 100644 --- a/template/default/show/multiple.tmpl +++ b/template/default/show/multiple.tmpl @@ -136,7 +136,8 @@ - [% PROCESS show/comments.tmpl %] + [% PROCESS show/comments.tmpl + comments = bug.comments %]
[% END %] diff --git a/template/default/show/show_bug.html.tmpl b/template/default/show/show_bug.html.tmpl index 994bc4ae5..5006a92eb 100644 --- a/template/default/show/show_bug.html.tmpl +++ b/template/default/show/show_bug.html.tmpl @@ -488,7 +488,9 @@
-[% PROCESS show/comments.tmpl %] +[% PROCESS show/comments.tmpl + comments = bug.comments + %]
-- cgit v1.2.3-24-g4f1b