Bug 250440 : when voting for bug, jump down to bug

Patch by GavinS <bugzilla@chimpychompy.org>  r=LpSolit  a=justdave

diff --git a/skins/standard/voting.css b/skins/standard/voting.css
new file mode 100644 (file)
index 0000000..5d9c9af
--- /dev/null
+++ b/skins/standard/voting.css
@@ -0,0 +1,24 @@
+/* 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.
+  *
+  * Contributor(s): Gavin Shelley <bugzilla@chimpychompy.org>
+  */
+
+/* Highlight the row for the bug being voted on */
+tr.bz_bug_being_voted_on {
+    background-color: #e2e2e2;
+}
+
+tr.bz_bug_being_voted_on td {
+    border-style: solid none solid none;
+    border-width: thin;
+}

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 74d81b4625984eb707550149b6735f71951b403f..cf2ed5d7b7c762dd112984f59bf50275933cb83b 100644 (file)
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -464,7 +464,7 @@
         [% bug.votes %]   
         <a href="votes.cgi?action=show_bug&amp;bug_id=[% bug.bug_id %]">Show
         votes for this [% terms.bug %]</a>&nbsp;&nbsp;&nbsp;
-        <a href="votes.cgi?action=show_user&amp;bug_id=[% bug.bug_id %]">Vote
+        <a href="votes.cgi?action=show_user&amp;bug_id=[% bug.bug_id %]#vote_[% bug.bug_id %]">Vote
         for this [% terms.bug %]</a>
       </td>
     </tr>

diff --git a/template/en/default/bug/votes/list-for-user.html.tmpl b/template/en/default/bug/votes/list-for-user.html.tmpl
index 968c66862b2528e09782fe6c49e56f200470ee4e..b7a47e2e0f00da0c7683d130d6f82260c35a6c16 100644 (file)
--- a/template/en/default/bug/votes/list-for-user.html.tmpl
+++ b/template/en/default/bug/votes/list-for-user.html.tmpl
@@ -19,6 +19,23 @@
   # 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
+  #            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? 
+  #%]
+
 [% PROCESS global/variables.none.tmpl %]
 
 [% IF !header_done %]
@@ -28,7 +45,9 @@
   [% ELSE %]
     [% title = "Show Votes" %]
   [% END %]
-  [% PROCESS global/header.html.tmpl %]
+  [% PROCESS global/header.html.tmpl
+             style_urls = [ "skins/standard/voting.css" ] 
+  %]
 [% ELSE %]
   <hr>
 [% END %]
@@ -78,9 +97,11 @@
         </tr>
 
         [% FOREACH bug = product.bugs %]
-          <tr>
-            <td></td>
-            <td align="right">
+          <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"
@@ -92,7 +113,7 @@
               [% ELSE %]
                 [% bug.count %]
               [% END %]
-            </td>
+            </a></td>
             <td align="right">
               [% isclosed = !bug.opened %]
                 <a href="show_bug.cgi?id=[% bug.id %]">

diff --git a/votes.cgi b/votes.cgi
index 49ac0cb2a4e471a6f32ecf186540eecd47ff8ec8..3c61f6061e01775f359fc1db7d4ac97092eca23a 100755 (executable)
--- a/votes.cgi
+++ b/votes.cgi
@@ -217,6 +217,7 @@ sub show_user {
     $vars->{'canedit'} = $canedit;
     $vars->{'voting_user'} = { "login" => $name };
     $vars->{'products'} = \@products;
+    $vars->{'bug_id'} = $bug_id;
 
     print $cgi->header();
     $template->process("bug/votes/list-for-user.html.tmpl", $vars)