[Openfirst-cvscommit] www/htdocs/bugzilla/bug/votes delete-all.html.tmpl,1.1,1.2 list-for-bug.html.t
Brought to you by:
xtimg
From: Tim G. <xt...@us...> - 2005-05-15 15:05:05
|
Update of /cvsroot/openfirst/www/htdocs/bugzilla/bug/votes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32743/bug/votes Modified Files: delete-all.html.tmpl list-for-bug.html.tmpl list-for-user.html.tmpl Log Message: Bring templates up to date for Bugzilla 2.18.1 Index: list-for-bug.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/votes/list-for-bug.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** list-for-bug.html.tmpl 28 Jun 2004 00:54:29 -0000 1.1 --- list-for-bug.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 *************** *** 25,36 **** # name: string. The login name of the user whose vote is attached # count: integer. The number of times that user has votes for this bug. ! # total: integer. The total number of votes for this bug. #%] ! [% PROCESS global/header.html.tmpl title = "Show Votes" ! h2 = "Bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>" %] ! <table cellspacing="4"> <tr> --- 25,38 ---- # name: string. The login name of the user whose vote is attached # count: integer. The number of times that user has votes for this bug. ! # total: integer. The total number of votes for this bug. #%] ! ! [% PROCESS global/variables.none.tmpl %] ! [% PROCESS global/header.html.tmpl title = "Show Votes" ! h2 = "$terms.Bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>" %] ! <table cellspacing="4"> <tr> Index: list-for-user.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/votes/list-for-user.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** list-for-user.html.tmpl 28 Jun 2004 00:54:29 -0000 1.1 --- list-for-user.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 *************** *** 20,29 **** #%] ! [% PROCESS global/header.html.tmpl ! title = "Show Votes" ! h2 = voting_user.name ! %] ! [% canedit = 1 IF voting_user.login == user.login %] [% IF votes_recorded %] --- 20,36 ---- #%] ! [% PROCESS global/variables.none.tmpl %] ! [% IF !header_done %] ! [% h2 = voting_user.login FILTER html %] ! [% IF canedit %] ! [% title = "Change Votes" %] ! [% ELSE %] ! [% title = "Show Votes" %] ! [% END %] ! [% PROCESS global/header.html.tmpl %] ! [% ELSE %] ! <hr> ! [% END %] [% IF votes_recorded %] *************** *** 38,52 **** [% IF products.size %] ! <form action="votes.cgi"> <input type="hidden" name="action" value="vote"> <table cellspacing="4"> <tr> <td></td> - <th>Bug #</th> - <th>Summary</th> <th>Votes</th> </tr> [% FOREACH product = products %] <tr> <th>[% product.name FILTER html %]</th> --- 45,66 ---- [% IF products.size %] ! <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> *************** *** 57,61 **** <font size="-1"> (Note: only [% product.maxperbug %] vote ! [% "s" IF product.maxperbug != 1 %] allowed per bug in this product.) </font> --- 71,75 ---- <font size="-1"> (Note: only [% product.maxperbug %] vote ! [% "s" IF product.maxperbug != 1 %] allowed per [% terms.bug %] in this product.) </font> *************** *** 67,81 **** <tr> <td></td> - <td> - [% "<strike>" IF NOT bug.opened %] - <a href="show_bug.cgi?id=[% bug.id %]"> - [% bug.id %]</a> - [% "</strike>" IF NOT bug.opened %] - </td> - <td> - <a href="votes.cgi?action=show_bug&bug_id=[% bug.id %]"> - [% bug.summary FILTER html %] - </a> - </td> <td align="right"> [% IF canedit %] --- 81,84 ---- *************** *** 84,88 **** [% " checked" IF bug.count %]> [% ELSE %] ! <input name="[% bug.id %]" value="[% bug.count %]" size="2"> [% END %] --- 87,91 ---- [% " checked" IF bug.count %]> [% ELSE %] ! <input name="[% bug.id %]" value="[% bug.count %]" size="2"> [% END %] *************** *** 91,94 **** --- 94,107 ---- [% END %] </td> + <td align="right"> + [% isclosed = !bug.opened %] + <a href="show_bug.cgi?id=[% bug.id %]"> + [% bug.id FILTER closed(isclosed) %]</a> + </td> + <td> + <a href="votes.cgi?action=show_bug&bug_id=[% bug.id %]"> + [% bug.summary FILTER html %] + </a> + </td> </tr> [% END %] *************** *** 110,117 **** <br> <br> ! To change your votes, type in new numbers (using zero to ! mean no votes) or change the checkbox, and then click ! <b>Change My Votes</b>. ! [% END %] </form> [% ELSE %] --- 123,136 ---- <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>. ! [% END %] </form> [% ELSE %] *************** *** 122,131 **** This user is [% END %] ! currently not voting on any bugs. </p> [% END %] <p> ! <a href="votehelp.html">Help with voting</a>. </p> --- 141,150 ---- 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> Index: delete-all.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/votes/delete-all.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** delete-all.html.tmpl 28 Jun 2004 00:54:29 -0000 1.1 --- delete-all.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,27 **** [%# INTERFACE: ! # This template has no interface. #%] ! [% PROCESS global/header.html.tmpl title = "Remove your votes?" --- 21,29 ---- [%# INTERFACE: ! # This template has no interface. #%] ! ! [% PROCESS global/variables.none.tmpl %] ! [% PROCESS global/header.html.tmpl title = "Remove your votes?" *************** *** 29,34 **** <p> ! You are about to remove all of your bug votes. Are you sure you wish to ! remove your vote from every bug you've voted on? </p> --- 31,36 ---- <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> |