summaryrefslogtreecommitdiffstats
path: root/template/en/default/bug
diff options
context:
space:
mode:
authorMax Kanat-Alexander <mkanat@bugzilla.org>2010-02-16 00:22:55 +0100
committerMax Kanat-Alexander <mkanat@bugzilla.org>2010-02-16 00:22:55 +0100
commit120b63d507a3316666b25494bc890a024948aef8 (patch)
tree0a96e60d6316cc8471b066def8b1e1273f38e4ab /template/en/default/bug
parent7802dbcf7bedcc09e5f1052ceb1ba82347a124b7 (diff)
downloadbugzilla-120b63d507a3316666b25494bc890a024948aef8.tar.gz
bugzilla-120b63d507a3316666b25494bc890a024948aef8.tar.xz
Bug 372979: Make voting into an extension
r=mkanat, a=mkanat, a=LpSolit
Diffstat (limited to 'template/en/default/bug')
-rw-r--r--template/en/default/bug/edit.html.tmpl19
-rw-r--r--template/en/default/bug/format_comment.txt.tmpl4
-rw-r--r--template/en/default/bug/process/header.html.tmpl4
-rw-r--r--template/en/default/bug/process/results.html.tmpl3
-rw-r--r--template/en/default/bug/votes/delete-all.html.tmpl51
-rw-r--r--template/en/default/bug/votes/list-for-bug.html.tmpl60
-rw-r--r--template/en/default/bug/votes/list-for-user.html.tmpl185
7 files changed, 8 insertions, 318 deletions
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 95376bb7d..b84aa8238 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -398,7 +398,7 @@
[% BLOCK section_details2 %]
[%###############################################################%]
- [%# Importance (priority, severity and votes) #%]
+ [%# Importance (priority and severity) #%]
[%###############################################################%]
<tr>
<td class="field_label">
@@ -414,22 +414,7 @@
bug = bug, field = bug_fields.bug_severity,
no_tds = 1, value = bug.bug_severity
editable = bug.check_can_change_field('bug_severity', 0, 1) %]
- [% IF bug.use_votes %]
- <span id="votes_container">
- [% IF bug.votes %]
- with
- <a href="votes.cgi?action=show_bug&amp;bug_id=[% bug.bug_id %]">
- [% bug.votes %]
- [% IF bug.votes == 1 %]
- vote
- [% ELSE %]
- votes
- [% END %]</a>
- [% END %]
- (<a href="votes.cgi?action=show_user&amp;bug_id=
- [% bug.bug_id %]#vote_[% bug.bug_id %]">vote</a>)
- </span>
- [% END %]
+ [% Hook.process('after_importance', 'bug/edit.html.tmpl') %]
</td>
</tr>
diff --git a/template/en/default/bug/format_comment.txt.tmpl b/template/en/default/bug/format_comment.txt.tmpl
index 27b72a918..2d4a20303 100644
--- a/template/en/default/bug/format_comment.txt.tmpl
+++ b/template/en/default/bug/format_comment.txt.tmpl
@@ -39,8 +39,6 @@ X[% comment_body %]
*** This [% terms.bug %] has been marked as a duplicate of [% terms.bug %] [%+ comment.extra_data %] ***
[% ELSIF comment.type == constants.CMT_HAS_DUPE %]
*** [% terms.Bug %] [%+ comment.extra_data %] has been marked as a duplicate of this [% terms.bug %]. ***
-[% ELSIF comment.type == constants.CMT_POPULAR_VOTES %]
-*** This [% terms.bug %] has been confirmed by popular vote. ***
[% ELSIF comment.type == constants.CMT_MOVED_TO %]
X[% comment_body %]
@@ -65,6 +63,8 @@ Comment on attachment [% comment.extra_data %]
[%+ comment.attachment.description %]
[%+ comment.body %]
+[% ELSIF comment.type %]
+ [% Hook.process('type') %]
[% ELSE %]
X[% comment_body %]
[% END %]
diff --git a/template/en/default/bug/process/header.html.tmpl b/template/en/default/bug/process/header.html.tmpl
index 79f0126d4..6b608b9ed 100644
--- a/template/en/default/bug/process/header.html.tmpl
+++ b/template/en/default/bug/process/header.html.tmpl
@@ -39,8 +39,8 @@
[% END %]
[% ELSIF title_tag == "mid_air" %]
[% title = "Mid-air collision!" %]
-[% ELSIF title_tag == "change_votes" %]
- [% title = "Change Votes" %]
[% END %]
+[% Hook.process('title') %]
+
[% PROCESS global/header.html.tmpl %]
diff --git a/template/en/default/bug/process/results.html.tmpl b/template/en/default/bug/process/results.html.tmpl
index d2adca8b8..7c1af42af 100644
--- a/template/en/default/bug/process/results.html.tmpl
+++ b/template/en/default/bug/process/results.html.tmpl
@@ -44,12 +44,13 @@
'bug' => "Changes submitted for $link" ,
'dupe' => "Duplicate notation added to $link" ,
'dep' => "Checking for dependency changes on $link" ,
- 'votes' => "$Link confirmed by number of votes" ,
'created' => "$Link has been added to the database" ,
'move' => "$Link has been moved to another database" ,
}
%]
+[% Hook.process('title') %]
+
<dl>
<dt>[% title.$type %]</dt>
<dd>
diff --git a/template/en/default/bug/votes/delete-all.html.tmpl b/template/en/default/bug/votes/delete-all.html.tmpl
deleted file mode 100644
index 41b75123d..000000000
--- a/template/en/default/bug/votes/delete-all.html.tmpl
+++ /dev/null
@@ -1,51 +0,0 @@
-[%# 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 <gerv@gerv.net>
- #%]
-
-[%# INTERFACE:
- # This template has no interface.
- #%]
-
-[% PROCESS global/variables.none.tmpl %]
-
-[% PROCESS global/header.html.tmpl
- title = "Remove your votes?"
- %]
-
-<p>
- You are about to remove all of your [% terms.bug %] votes. Are you sure you wish to
- remove your vote from every [% terms.bug %] you've voted on?
-</p>
-
-<form action="votes.cgi" method="post">
- <input type="hidden" name="action" value="vote">
- <p>
- <input type="radio" name="delete_all_votes" value="1">
- Yes, delete all my votes
- </p>
- <p>
- <input type="radio" name="delete_all_votes" value="0" checked="checked">
- No, go back and review my votes
- </p>
- <p>
- <input type="submit" id="vote" value="Submit">
- </p>
-</form>
-
-[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/bug/votes/list-for-bug.html.tmpl b/template/en/default/bug/votes/list-for-bug.html.tmpl
deleted file mode 100644
index a599dc0fb..000000000
--- a/template/en/default/bug/votes/list-for-bug.html.tmpl
+++ /dev/null
@@ -1,60 +0,0 @@
-[%# 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 <gerv@gerv.net>
- #%]
-
-[%# INTERFACE:
- # bug_id: integer. ID of the bug we are listing the votes for.
- # users: list of hashes. May be empty. Each hash has two members:
- # login_name: string. The login name of the user whose vote is attached
- # vote_count: integer. The number of times that user has votes for this bug.
- #%]
-
-[% PROCESS global/variables.none.tmpl %]
-
-[% PROCESS global/header.html.tmpl
- title = "Show Votes"
- subheader = "$terms.Bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>"
- %]
-
-[% total = 0 %]
-<table cellspacing="4">
- <tr>
- <th>Who</th>
- <th>Number of votes</th>
- </tr>
-
- [% FOREACH voter = users %]
- [% total = total + voter.vote_count %]
- <tr>
- <td>
- <a href="votes.cgi?action=show_user&amp;user_id=
- [%- voter.id FILTER url_quote %]">
- [% voter.login_name FILTER email FILTER html %]
- </a>
- </td>
- <td align="right">
- [% voter.vote_count %]
- </td>
- </tr>
- [% END %]
-</table>
-
-<p>Total votes: [% total %]</p>
-
-[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/bug/votes/list-for-user.html.tmpl b/template/en/default/bug/votes/list-for-user.html.tmpl
deleted file mode 100644
index 2f97616ed..000000000
--- a/template/en/default/bug/votes/list-for-user.html.tmpl
+++ /dev/null
@@ -1,185 +0,0 @@
-[%# 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 <gerv@gerv.net>
- #%]
-
-[%# INTERFACE:
- # voting_user: hash containing a 'login' field
- #
- # products: list of hashes containing details of products relating to
- # voting:
- # name: name of product
- # bugs: list of bugs the user has voted for
- # bug_ids: list of bug ids the user has voted for
- # onevoteonly: one or more votes allowed per bug?
- # total: users current vote count for the product
- # maxvotes: max votes allowed for a user in this product
- # maxperbug: max votes per bug allowed for a user in this product
- #
- # bug_id: number; if the user is voting for a bug, this is the bug id
- #
- # canedit: boolean; Should the votes be presented in a form, or readonly?
- #
- # all_bug_ids: List of all bug ids the user has voted for, across all products
- #%]
-
-[% PROCESS global/variables.none.tmpl %]
-
-[% IF !header_done %]
- [% subheader = voting_user.login FILTER html %]
- [% IF canedit %]
- [% title = "Change Votes" %]
- [% IF bug_id %]
- [%# We .select and .focus the input so it works for textbox and
- checkbox %]
- [% onload = "document.forms['voting_form'].bug_" _ bug_id _
- ".select();document.forms['voting_form'].bug_" _ bug_id _
- ".focus()" %]
- [% END %]
- [% ELSE %]
- [% title = "Show Votes" %]
- [% END %]
- [% PROCESS global/header.html.tmpl
- style_urls = [ "skins/standard/voting.css" ]
- %]
-[% ELSE %]
- <hr>
-[% END %]
-
-[% IF votes_recorded %]
- <p>
- <font color="red">
- The changes to your votes have been saved.
- </font>
- </p>
-[% ELSE %]
- <br>
-[% END %]
-
-[% IF products.size %]
- <form name="voting_form" method="post" action="votes.cgi">
- <input type="hidden" name="action" value="vote">
- <table cellspacing="4">
- <tr>
- <td></td>
- <th>Votes</th>
- <th>[% terms.Bug %] #</th>
- <th>Summary</th>
- </tr>
-
- [% onevoteproduct = 0 %]
- [% multivoteproduct = 0 %]
- [% FOREACH product = products %]
- [% IF product.onevoteonly %]
- [% onevoteproduct = 1 %]
- [% ELSE %]
- [% multivoteproduct = 1 %]
- [% END %]
- <tr>
- <th>[% product.name FILTER html %]</th>
- <td colspan="2" ><a href="buglist.cgi?bug_id=
- [%- product.bug_ids.join(",") FILTER url_quote %]">([% terms.bug %] list)</a>
- </td>
- <td>
- [% IF product.maxperbug < product.maxvotes AND
- product.maxperbug > 1 %]
- <font size="-1">
- (Note: only [% product.maxperbug %] vote
- [% "s" IF product.maxperbug != 1 %] allowed per [% terms.bug %] in
- this product.)
- </font>
- [% END %]
- </td>
- </tr>
-
- [% FOREACH bug = product.bugs %]
- <tr [% IF bug.id == bug_id && canedit %]
- class="bz_bug_being_voted_on" [% END %]>
- <td>[% IF bug.id == bug_id && canedit %]Enter New Vote here &rarr;
- [%- END %]</td>
- <td align="right"><a name="vote_[% bug.id %]">
- [% IF canedit %]
- [% IF product.onevoteonly %]
- <input type="checkbox" name="[% bug.id %]" value="1"
- [% " checked" IF bug.count %] id="bug_[% bug.id %]">
- [% ELSE %]
- <input name="[% bug.id %]" value="[% bug.count %]"
- size="2" id="bug_[% bug.id %]">
- [% END %]
- [% ELSE %]
- [% bug.count %]
- [% END %]
- </a></td>
- <td align="center">
- [% bug.id FILTER bug_link(bug) FILTER none %]
- </td>
- <td>
- [% bug.summary FILTER html %]
- (<a href="votes.cgi?action=show_bug&amp;bug_id=[% bug.id %]">Show Votes</a>)
- </td>
- </tr>
- [% END %]
-
- <tr>
- <td></td>
- <td colspan="3">[% product.total %] vote
- [% "s" IF product.total != 1 %] used out of [% product.maxvotes %]
- allowed.
- <br>
- <br>
- </td>
- </tr>
- [% END %]
- </table>
-
- [% IF canedit %]
- <input type="submit" value="Change My Votes" id="change"> or
- <a href="buglist.cgi?bug_id=[% all_bug_ids.join(",") FILTER url_quote %]">view all
- as [% terms.bug %] list</a>
- <br>
- <br>
- To change your votes,
- [% IF multivoteproduct %]
- type in new numbers (using zero to mean no votes)
- [% " or " IF onevoteproduct %]
- [% END %]
- [% IF onevoteproduct %]
- change the checkbox
- [% END %]
- and then click <b>Change My Votes</b>.
- [% ELSE %]
- <a href="buglist.cgi?bug_id=[% all_bug_ids.join(",") FILTER url_quote %]">View all
- as [% terms.bug %] list</a>
- [% END %]
- </form>
-[% ELSE %]
- <p>
- [% IF canedit %]
- You are
- [% ELSE %]
- This user is
- [% END %]
- currently not voting on any [% terms.bugs %].
- </p>
-[% END %]
-
-<p>
- <a href="page.cgi?id=voting.html">Help with voting</a>.
-</p>
-
-[% PROCESS global/footer.html.tmpl %]