[Openfirst-cvscommit] www/htdocs/bugzilla/account/prefs saved-searches.html.tmpl,NONE,1.1 account.ht
Brought to you by:
xtimg
Menu
▾
▴
[Openfirst-cvscommit] www/htdocs/bugzilla/account/prefs saved-searches.html.tmpl,NONE,1.1 account.html.tmpl,1.1,1.2 email.html.tmpl,1.1,1.2 footer.html.tmpl,1.1,1.2 permissions.html.tmpl,1.1,1.2 prefs.html.tmpl,1.1,1.2
Update of /cvsroot/openfirst/www/htdocs/bugzilla/account/prefs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32743/account/prefs Modified Files: account.html.tmpl email.html.tmpl footer.html.tmpl permissions.html.tmpl prefs.html.tmpl Added Files: saved-searches.html.tmpl Log Message: Bring templates up to date for Bugzilla 2.18.1 Index: footer.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/account/prefs/footer.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** footer.html.tmpl 28 Jun 2004 00:50:42 -0000 1.1 --- footer.html.tmpl 15 May 2005 15:04:52 -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,60 **** [%# INTERFACE: ! # mybugslink: boolean. True if the user wishes the My Bugs link to appear. # queries: array of hashes. May be empty. Each hash has two members: ! # name: string. The name of the query. ! # footer: boolean. True if the query appears in the footer. #%] ! <table> <tr> ! <th align="right">The 'My bugs' link:</th> <td> <select name="mybugslink"> ! <option value="1">should appear on the footer of every page</option> ! <option value="0" [% " selected" IF NOT mybugslink %]>should not be displayed ! </option> </select> </td> ! </tr> ! <input type="hidden" name="numqueries" value="[% queries.size %]"> [% IF queries.size %] [% FOREACH query = queries %] <tr> ! <th align="right">Your query named '[% query.name FILTER html %]':</th> <td> <select name="query-[% loop.index %]"> ! <option value="0">should only appear in the query page</option> ! <option value="1" [% " selected" IF query.footer %]> should appear on the footer of every page ! </option> </select> </td> </tr> ! <input type="hidden" name="name-[% loop.index %]" value="[% query.name FILTER html %]"> [% END %] --- 21,62 ---- [%# INTERFACE: ! # mybugslink: boolean. True if the user wishes the My Bugs link to appear. # queries: array of hashes. May be empty. Each hash has two members: ! # name: string. The name of the search. ! # footer: boolean. True if the search appears in the footer. #%] ! ! [% PROCESS global/variables.none.tmpl %] ! <table> <tr> ! <th align="right">The 'My [% terms.bugs %]' link:</th> <td> <select name="mybugslink"> ! <option value="1">should appear on the footer of every page</option> ! <option value="0" [% " selected" IF NOT mybugslink %]>should not be displayed ! </option> </select> </td> ! </tr> ! <input type="hidden" name="numqueries" value="[% queries.size %]"> [% IF queries.size %] [% FOREACH query = queries %] <tr> ! <th align="right">Your search named '[% query.name FILTER html %]':</th> <td> <select name="query-[% loop.index %]"> ! <option value="0">should only appear in the search page</option> ! <option value="1" [% " selected" IF query.footer %]> should appear on the footer of every page ! </option> </select> </td> </tr> ! <input type="hidden" name="name-[% loop.index %]" value="[% query.name FILTER html %]"> [% END %] *************** *** 63,71 **** <tr> <td colspan="4"> ! <br> ! If you create remembered queries using the ! <a href="query.cgi">query page</a>, ! you can then come to this page and choose to have some of them ! appear in the footer of each Bugzilla page. <br> <br> --- 65,73 ---- <tr> <td colspan="4"> ! <br> ! If you create remembered queries using the ! <a href="query.cgi">search page</a>, ! you can then come to this page and choose to have some of them ! appear in the footer of each [% terms.Bugzilla %] page. <br> <br> *************** *** 73,76 **** </tr> [% END %] ! </table> --- 75,78 ---- </tr> [% END %] ! </table> Index: account.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/account/prefs/account.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** account.html.tmpl 28 Jun 2004 00:50:42 -0000 1.1 --- account.html.tmpl 15 May 2005 15:04:52 -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 *************** *** 22,26 **** [%# INTERFACE: # realname: string. The user's real name, if any. - # login: string. The user's Bugzilla login email address. # login_change_date: string. The date the email change will be complete. (optional) # new_login_name: string. The user's new Bugzilla login whilst not confirmed. (optional) --- 22,25 ---- *************** *** 37,41 **** <td> <input type="hidden" name="Bugzilla_login" ! value="[% login FILTER html %]"> <input type="password" name="Bugzilla_password"> </td> --- 36,40 ---- <td> <input type="hidden" name="Bugzilla_login" ! value="[% user.login FILTER html %]"> <input type="password" name="Bugzilla_password"> </td> *************** *** 75,88 **** <tr> <th align="right">Change request expires:</th> ! <td>[% login_change_date %]</td> </tr> [% ELSE %] <tr> <th align="right">Confirmed email address:</th> ! <td>[% login FILTER html %] </tr> <tr> <th align="right">Completion date:</th> ! <td>[% login_change_date %]</td> </tr> [% END %] --- 74,87 ---- <tr> <th align="right">Change request expires:</th> ! <td>[% login_change_date FILTER time %]</td> </tr> [% ELSE %] <tr> <th align="right">Confirmed email address:</th> ! <td>[% user.login FILTER html %]</td> </tr> <tr> <th align="right">Completion date:</th> ! <td>[% login_change_date FILTER time %]</td> </tr> [% END %] Index: permissions.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/account/prefs/permissions.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** permissions.html.tmpl 28 Jun 2004 00:50:42 -0000 1.1 --- permissions.html.tmpl 15 May 2005 15:04:52 -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,54 **** [%# INTERFACE: ! # has_bits: array of strings. May be empty. ! # Descriptions of the permission bits the user has. ! # set_bits: array of strings. May be empty. ! # Descriptions of the permission bits the user can set for # other people. #%] ! ! <table> <tr> <td> [% IF has_bits.size %] ! You have the following permission bits set on your account: ! <ul> [% FOREACH bit_description = has_bits %] ! <li>[% bit_description %]</li> [% END %] ! </ul> [% ELSE %] ! There are no permission bits set on your account. [% END %] ! [% IF set_bits.size %] ! And you can turn on or off the following bits for <a href="editusers.cgi">other users</a>: <p> ! <ul> [% FOREACH bit_description = set_bits %] ! <li>[% bit_description %]</li> [% END %] ! </ul> </p> [% END %] --- 21,72 ---- [%# INTERFACE: ! # has_bits: array of hashes. May be empty. ! # name => Names of the permissions the user has. ! # desc => Descriptions of the permissions the user has. ! # set_bits: array of hashes. May be empty. ! # name => Names of the permissions the user can set for ! # other people. ! # desc => Descriptions of the permissions the user can set for # other people. #%] ! ! [% PROCESS global/variables.none.tmpl %] ! ! <table align="center"> <tr> <td> [% IF has_bits.size %] ! You have the following permission [% terms.bits %] set on your account: ! <p> ! <br> ! <table align="center"> [% FOREACH bit_description = has_bits %] ! <tr> ! <td>[% bit_description.name %]</td> ! <td>[% bit_description.desc %]</td> ! </tr> [% END %] ! </table> [% ELSE %] ! There are no permission [% terms.bits %] set on your account. [% END %] ! [% IF user.groups.editusers %] ! <br> ! You have editusers privileges. You can turn on and off ! all permissions for all users. ! [% ELSIF set_bits.size %] ! <br> ! And you can turn on or off the following [% terms.bits %] for <a href="editusers.cgi">other users</a>: <p> ! <table align="center"> [% FOREACH bit_description = set_bits %] ! <tr> ! <td>[% bit_description.name %]</td> ! <td>[% bit_description.desc %]</td> ! </tr> [% END %] ! </table> </p> [% END %] --- NEW FILE: saved-searches.html.tmpl --- [%# 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 # 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 <ge...@ge...> #%] <p>Your saved searches are as follows:</p> <blockquote> <table border="1" cellpadding="3"> <tr> <th> Search </th> <th> Run </th> <th> Edit </th> <th> Forget </th> <th> Show in Footer </th> </tr> <tr> <td>My Bugs</td> <td> [% filtered_username = user.login FILTER url_quote %] <a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">Run</a> </td> <td> </td> <td> </td> <td align="center"> <input type="checkbox" name="showmybugslink" value="1" [% " checked" IF user.showmybugslink %]> </td> </tr> [% FOREACH q = queries %] <tr> <td>[% q.name FILTER html %]</td> <td> <a href="buglist.cgi?[% q.query FILTER html %]">Run</a> </td> <td> <a href="query.cgi?[% q.query FILTER html %]&known_name=[% q.name FILTER url_quote %]">Edit</a> </td> <td> <a href="buglist.cgi?cmdtype=dorem&remaction=forget&namedcmd= [% q.name FILTER html %]">Forget</a> </td> <td align="center"> <input type="checkbox" name="linkinfooter_[% q.name FILTER html %]" value="1" [% " checked" IF q.linkinfooter %]> </td> </tr> [% END %] </table> </blockquote> Index: email.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/account/prefs/email.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** email.html.tmpl 28 Jun 2004 00:50:42 -0000 1.1 --- email.html.tmpl 15 May 2005 15:04:52 -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 *************** *** 18,37 **** # # Contributor(s): Gervase Markham <ge...@ge...> #%] [%# INTERFACE: ! # watchedusers: string. # Comma-separated list of email addresses this user watches. # excludeself: boolean. # True if user is not receiving self-generated mail. ! # <rolename>: Multiple hashes, one for each rolename (e.g. owner; see ! # below), keyed by reasonname (e.g. comments; again, see ! # below). The value is a boolean - true if the user is # receiving mail for that reason when in that role. # Also references the 'supportwatchers' Param. #%] [% useqacontact = Param('useqacontact') %] ! <table> [% IF Param('supportwatchers') %] --- 18,42 ---- # # Contributor(s): Gervase Markham <ge...@ge...> + # Myk Melez <my...@mo...> + # Shane H. W. Travis <tr...@se...> #%] [%# INTERFACE: ! # watchedusers: string. # Comma-separated list of email addresses this user watches. # excludeself: boolean. # True if user is not receiving self-generated mail. ! # <rolename>: Multiple hashes, one for each rolename (e.g. owner; see ! # below), keyed by reasonname (e.g. comments; again, see ! # below). The value is a boolean - true if the user is # receiving mail for that reason when in that role. # Also references the 'supportwatchers' Param. #%] + [% PROCESS global/variables.none.tmpl %] + [% useqacontact = Param('useqacontact') %] ! [% usevotes = Param('usevotes') %] ! <table> [% IF Param('supportwatchers') %] *************** *** 45,51 **** <td colspan="4"> If you want to help cover for someone when they're on vacation, or if ! you need to do the QA related to all of their bugs, you can tell ! Bugzilla to send mail related to their bugs to you also. List the ! email addresses of any users you wish to watch here, separated by commas. </td> --- 50,56 ---- <td colspan="4"> If you want to help cover for someone when they're on vacation, or if ! you need to do the QA related to all of their [% terms.bugs %], you can tell ! [%+ terms.Bugzilla %] to send mail related to their [% terms.bugs %] to you, too. List the ! email addresses of any accounts you wish to watch here, separated by commas. </td> *************** *** 55,59 **** <th align="right">Users to watch:</th> <td> ! <input size="35" name="watchedusers" value="[% watchedusers %]"> </td> </tr> --- 60,65 ---- <th align="right">Users to watch:</th> <td> ! <input size="35" name="watchedusers" ! value="[% watchedusers FILTER html %]"> </td> </tr> *************** *** 64,68 **** <p> If you don't like getting a notification for "trivial" ! changes to bugs, you can use the settings below to filter some (or even all) notifications. </p> --- 70,74 ---- <p> If you don't like getting a notification for "trivial" ! changes to [% terms.bugs %], you can use the settings below to filter some (or even all) notifications. </p> *************** *** 83,94 **** <td width="150"></td> <td> ! Only email me reports of changes made by other people ! <input type="checkbox" name="ExcludeSelf" value="on" [% " checked" IF excludeself %]> <br> </td> </tr> </table> <hr> <b>Field/recipient specific options:</b> --- 89,138 ---- <td width="150"></td> <td> ! <input type="checkbox" name="ExcludeSelf" id="ExcludeSelf" value="on" [% " checked" IF excludeself %]> + <label for="ExcludeSelf">Only email me reports of changes made by other people</label> + <br> + </td> + </tr> + <tr> + <td width="150"></td> + <td> + <input type="checkbox" name="FlagRequestee" id="FlagRequestee" value="on" + [% " checked" IF FlagRequestee %]> + <label for="FlagRequestee">Email me when someone asks me to set a flag</label> + <br> + </td> + </tr> + <tr> + <td width="150"></td> + <td> + <input type="checkbox" name="FlagRequester" id="FlagRequester" value="on" + [% " checked" IF FlagRequester %]> + <label for="FlagRequester">Email me when someone sets a flag I asked for</label> <br> </td> </tr> </table> + <noscript>If you had Javascript active, you could toggle all of these with one click.<br></noscript> + <script type="text/javascript"> + <!-- + function SetCheckboxes(setting) { + for (var count = 0; count < document.userprefsform.elements.length; count++) { + var theinput = document.userprefsform.elements[count]; + if (theinput.type == "checkbox") { + if (theinput.name == "ExcludeSelf") { + theinput.checked = false; + } + else { + theinput.checked = setting; + } + } + } + } + document.write('<input type="button" value="Enable All Mail" onclick="SetCheckboxes(true); return false;">\n'); + document.write('<input type="button" value="Disable All Mail" onclick="SetCheckboxes(false); return false;">\n'); + // --> + </script> <hr> <b>Field/recipient specific options:</b> *************** *** 99,104 **** <table width="100%" border="1"> <tr> ! <td colspan="[% useqacontact ? '5' : '4' %]" align="center" width="50%"> ! <b>When my relationship to this bug is:</b> </td> <td rowspan="2" width="50%"> --- 143,148 ---- <table width="100%" border="1"> <tr> ! <td colspan="[% (useqacontact AND usevotes) ? '5' : ((useqacontact OR usevotes) ? '4' : '3') %]" align="center" width="50%"> ! <b>When my relationship to this [% terms.bug %] is:</b> </td> <td rowspan="2" width="50%"> *************** *** 122,151 **** <b>CC</b> </td> ! <td align="center" width="10%"> ! <b>Voter</b> ! </td> </tr> ! [% FOREACH reason = [ ! { name = 'Removeme', ! description = 'I\'m added to or removed from this capacity' }, ! { name = 'Comments', ! description = 'New Comments are added' }, ! { name = 'Attachments', ! description = 'New Attachments are added' }, ! { name = 'Status', ! description = 'Priority, status, severity, and/or milestone changes' }, ! { name = 'Resolved', ! description = 'The bug is resolved or verified' }, ! { name = 'Keywords', ! description = 'Keywords field changes' }, ! { name = 'CC', ! description = 'CC field changes' }, ! { name = 'Other', ! description = 'Any field not mentioned above changes' } ] %] <tr> ! [% FOREACH role = [ "Reporter", "Owner", "QAcontact", "CClist", "Voter" ] %] [% NEXT IF role == "QAcontact" AND NOT useqacontact %] <td align="center"> <input type="checkbox" name="email[% role %][% reason.name %]" value="on" --- 166,205 ---- <b>CC</b> </td> ! [% IF usevotes %] ! <td align="center" width="10%"> ! <b>Voter</b> ! </td> ! [% END %] </tr> ! [% bugLabelLower = BLOCK %] ! [% terms.bug %] ! [% END %] ! ! [% FOREACH reason = [ ! { name = 'Removeme', ! description = "I'm added to or removed from this capacity" }, ! { name = 'Comments', ! description = "New Comments are added" }, ! { name = 'Attachments', ! description = "New Attachments are added" }, ! { name = 'Status', ! description = "Priority, status, severity, and/or milestone changes" }, ! { name = 'Resolved', ! description = "The ${bugLabelLower} is resolved or verified" }, ! { name = 'Keywords', ! description = "Keywords field changes" }, ! { name = 'CC', ! description = "CC field changes" }, ! { name = 'Other', ! description = "Any field not mentioned above changes" }, ! { name = 'Unconfirmed', ! description = "The ${bugLabelLower} is in the unconfirmed state" }, ! ] %] <tr> ! [% FOREACH role = [ "Reporter", "Owner", "QAcontact", "CClist", "Voter" ] %] [% NEXT IF role == "QAcontact" AND NOT useqacontact %] + [% NEXT IF role == "Voter" AND NOT usevotes %] <td align="center"> <input type="checkbox" name="email[% role %][% reason.name %]" value="on" *************** *** 158,162 **** </tr> [% END %] ! </table> <br> --- 212,216 ---- </tr> [% END %] ! </table> <br> Index: prefs.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/account/prefs/prefs.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** prefs.html.tmpl 28 Jun 2004 00:50:42 -0000 1.1 --- prefs.html.tmpl 15 May 2005 15:04:52 -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,25 **** [%# INTERFACE: - # login: string. The user's Bugzilla login email address. # tabs: List of hashes. May not be empty. Each hash has three members: # name: string. Name of the tab (used internally.) --- 21,24 ---- *************** *** 36,40 **** #%] ! [% filtered_login = login FILTER html %] [% PROCESS global/header.html.tmpl title = "User Preferences" --- 35,39 ---- #%] ! [% filtered_login = user.login FILTER html %] [% PROCESS global/header.html.tmpl title = "User Preferences" *************** *** 54,58 **** { name => "email", description => "Email settings", saveable => "1" }, ! { name => "footer", description => "Page footer", saveable => "1" }, { name => "permissions", description => "Permissions", --- 53,57 ---- { name => "email", description => "Email settings", saveable => "1" }, ! { name => "saved-searches", description => "Saved searches", saveable => "1" }, { name => "permissions", description => "Permissions", *************** *** 89,95 **** </font> </p> ! [% IF changes_saved != 1 %] <p> ! [% changes_saved %] </p> [% END %] --- 88,95 ---- </font> </p> ! [% IF email_changes_saved %] <p> ! An email has been sent to both old and new email ! addresses to confirm the change of email address. </p> [% END %] *************** *** 98,114 **** <h3>[% current_tab.description %]</h3> ! <form method="post"> <input type="hidden" name="tab" value="[% current_tab.name %]"> ! [%# See bug 160710 for why this is done this way %] ! [% IF current_tab.name == "account" %] ! [% PROCESS "account/prefs/account.html.tmpl" %] ! [% ELSIF current_tab.name == "email" %] ! [% PROCESS "account/prefs/email.html.tmpl" %] ! [% ELSIF current_tab.name == "footer" %] ! [% PROCESS "account/prefs/footer.html.tmpl" %] ! [% ELSIF current_tab.name == "permissions" %] ! [% PROCESS "account/prefs/permissions.html.tmpl" %] ! [% END %] [% IF current_tab.saveable %] --- 98,106 ---- <h3>[% current_tab.description %]</h3> ! <form name="userprefsform" method="post" action="userprefs.cgi"> <input type="hidden" name="tab" value="[% current_tab.name %]"> ! [% PROCESS "account/prefs/${current_tab.name}.html.tmpl" ! IF current_tab.name.defined %] [% IF current_tab.saveable %] |
