openfirst-cvscommit Mailing List for openFIRST (Page 28)
Brought to you by:
xtimg
Menu
▾
▴
openfirst-cvscommit — Notify subscribers of changes to files in CVS.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(41) |
Jun
(210) |
Jul
(39) |
Aug
(153) |
Sep
(147) |
Oct
(173) |
Nov
(81) |
Dec
(163) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(33) |
Feb
(18) |
Mar
|
Apr
(62) |
May
|
Jun
(100) |
Jul
(38) |
Aug
(58) |
Sep
(1) |
Oct
|
Nov
(25) |
Dec
(172) |
| 2005 |
Jan
(31) |
Feb
(12) |
Mar
(67) |
Apr
(92) |
May
(247) |
Jun
(34) |
Jul
(36) |
Aug
(192) |
Sep
(15) |
Oct
(42) |
Nov
(92) |
Dec
(4) |
| 2006 |
Jan
|
Feb
(21) |
Mar
|
Apr
|
May
|
Jun
(53) |
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
(4) |
Apr
(4) |
May
|
Jun
(15) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <bug...@we...> - 2005-05-15 16:35:32
|
http://bugzilla.openfirst.org/show_bug.cgi?id=249 Summary: Demo site does not update well Product: openFIRST Version: unspecified Platform: PC URL: http://www.demo.openfirst.org/ OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: www AssignedTo: de...@op... ReportedBy: ti...@op... Whenever there are conflicts encountered on demo.* using its' cvs update the process fails to detect and resolve these conflicts automatically. It is often a long time before someone with the access to manually fix demo.* notices and fixes it. It would be nice if demo.* were more self-maintaining, especially in regards to resolving conflicts. ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. |
|
From: Tim G. <xt...@us...> - 2005-05-15 15:10:23
|
Update of /cvsroot/openfirst/www/htdocs/bugzilla In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1308 Modified Files: README Log Message: State that templates up to date for Bugzilla 2.18.1 Index: README =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/README,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** README 28 Jun 2004 00:39:51 -0000 1.1 --- README 15 May 2005 15:10:09 -0000 1.2 *************** *** 1 **** --- 1,5 ---- These are the template files for the Bugzilla.openfirst.org site. + + + This was last updated for Bugzilla 2.18.1; new versions of Bugzilla can change + template formats significantly and require redesigning these templates completely. |
|
From: Tim G. <xt...@us...> - 2005-05-15 15:05:34
|
Update of /cvsroot/openfirst/www/htdocs/bugzilla/bug In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32743/bug Modified Files: choose.html.tmpl comments.html.tmpl dependency-graph.html.tmpl dependency-tree.html.tmpl edit.html.tmpl navigate.html.tmpl show-multiple.html.tmpl Added Files: knob.html.tmpl show.html.tmpl show.xml.tmpl time.html.tmpl Log Message: Bring templates up to date for Bugzilla 2.18.1 Index: dependency-tree.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/dependency-tree.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dependency-tree.html.tmpl 28 Jun 2004 00:45:44 -0000 1.1 --- dependency-tree.html.tmpl 15 May 2005 15:04:53 -0000 1.2 *************** *** 1,8 **** ! <!-- 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 --- 1,8 ---- ! [%# 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 *************** *** 18,29 **** # # Contributor(s): Tobias Burnus <bu...@ne...> ! # Ville Skyttä <vil...@ik...> # Myk Melez <my...@mo...> #%] ! [% PROCESS global/header.html.tmpl ! title = "Dependency tree for Bug $bugid" ! h1 = "Dependency tree for <a href=\"show_bug.cgi?id=$bugid\">bug $bugid</a>" ! style = "strike { background-color: #d9d9d9; color: #000000; }" %] --- 18,30 ---- # # Contributor(s): Tobias Burnus <bu...@ne...> ! # Ville Skyttä <vil...@ik...> # Myk Melez <my...@mo...> #%] ! [% PROCESS global/variables.none.tmpl %] ! ! [% PROCESS global/header.html.tmpl ! title = "Dependency tree for $terms.Bug $bugid" ! h1 = "Dependency tree for <a href=\"show_bug.cgi?id=$bugid\">$terms.Bug $bugid</a>" %] *************** *** 31,39 **** [%# Display the tree of bugs that this bug depends on. %] ! <h3>[% hide_resolved ? "Open b" : "B" %]ugs that <a href="show_bug.cgi?id=[% bugid %]">bug [% bugid %]</a> depends on</h3> [% IF dependson_ids.size > 0 %] ( [% IF maxdepth -%]Up to [% maxdepth %] level[% "s" IF maxdepth > 1 %] deep | [% END %] ! <a href="buglist.cgi?bug_id=[% dependson_ids.join(",") %]">view as bug list</a> [% IF canedit && dependson_ids.size > 1 %] | <a href="buglist.cgi?bug_id=[% dependson_ids.join(",") %]&tweak=1">change several</a> --- 32,47 ---- [%# Display the tree of bugs that this bug depends on. %] ! <h3> ! [% IF hide_resolved %] ! Open [% terms.bugs %] ! [% ELSE %] ! [% terms.Bugs %] ! [% END %] ! that <a href="show_bug.cgi?id=[% bugid %]">[% terms.bug %] [%+ bugid %]</a> ! depends on</h3> [% IF dependson_ids.size > 0 %] ( [% IF maxdepth -%]Up to [% maxdepth %] level[% "s" IF maxdepth > 1 %] deep | [% END %] ! <a href="buglist.cgi?bug_id=[% dependson_ids.join(",") %]">view as [% terms.bug %] list</a> [% IF canedit && dependson_ids.size > 1 %] | <a href="buglist.cgi?bug_id=[% dependson_ids.join(",") %]&tweak=1">change several</a> *************** *** 46,54 **** [%# Display the tree of bugs that this bug blocks. %] ! <h3>[% hide_resolved ? "Open b" : "B" %]ugs that <a href="show_bug.cgi?id=[% bugid %]">bug [% bugid %]</a> blocks</h3> [% IF blocked_ids.size > 0 %] ( [% IF maxdepth -%]Up to [% maxdepth %] level[% "s" IF maxdepth > 1 %] deep | [% END %] ! <a href="buglist.cgi?bug_id=[% blocked_ids.join(",") %]">view as bug list</a> [% IF canedit && blocked_ids.size > 1 %] | <a href="buglist.cgi?bug_id=[% blocked_ids.join(",") %]&tweak=1">change several</a> --- 54,69 ---- [%# Display the tree of bugs that this bug blocks. %] ! <h3> ! [% IF hide_resolved %] ! Open [% terms.bugs %] ! [% ELSE %] ! [% terms.Bugs %] ! [% END %] ! that <a href="show_bug.cgi?id=[% bugid %]">[% terms.bug %] [%+ bugid %]</a> ! blocks</h3> [% IF blocked_ids.size > 0 %] ( [% IF maxdepth -%]Up to [% maxdepth %] level[% "s" IF maxdepth > 1 %] deep | [% END %] ! <a href="buglist.cgi?bug_id=[% blocked_ids.join(",") %]">view as [% terms.bug %] list</a> [% IF canedit && blocked_ids.size > 1 %] | <a href="buglist.cgi?bug_id=[% blocked_ids.join(",") %]&tweak=1">change several</a> *************** *** 75,89 **** [% dep = tree.$dep_id %] <li> ! [% "<strike>" IF !dep.open %] ! <a href="show_bug.cgi?id=[% dep_id %]">[% dep_id %] [[% IF dep.milestone %][% dep.milestone FILTER html %], [% END %] ! [% dep.assignee_email FILTER html %]] - [% IF dep.seen %] ! <i>This bug appears elsewhere in this tree.</i></a> [% ELSE %] [% dep.summary FILTER html %].</a> [% END %] ! [% "</strike>" IF !dep.open %] ! [% INCLUDE display_tree bug_id=dep_id IF dep.dependencies.size > 0 && !dep.seen %] </li> --- 90,107 ---- [% dep = tree.$dep_id %] <li> ! [% "<script>document.write('<a href=\"#\" class=\"toggle\" onclick=\"listToggle(event); return false\">[-]</a>')</script>" ! IF dep.dependencies.size > 0 && !dep.seen %] ! [% isclosed = !dep.open %] ! [% FILTER closed(isclosed) %] ! <a href="show_bug.cgi?id=[% dep_id %]">[% dep_id %] [[% IF dep.milestone %][% dep.milestone FILTER html %], [% END %] ! [% dep.assignee_email FILTER html %]] - [% IF dep.seen %] ! <i>This [% terms.bug %] appears elsewhere in this tree.</i></a> [% ELSE %] [% dep.summary FILTER html %].</a> [% END %] ! [% END %] ! [% INCLUDE display_tree bug_id=dep_id IF dep.dependencies.size > 0 && !dep.seen %] </li> *************** *** 96,99 **** --- 114,151 ---- [%###########################################################################%] + <script type="text/javascript" language="JavaScript"> + if (!Node) { + /* MSIE doesn't define Node, so provide a compatibility array */ + var Node = { TEXT_NODE: 3, }; + } + + function toggleDisplay(node) + { + var display = node.style.display; + if (display == "none") { + node.style.display = + ("oldDisplay" in node) ? node.oldDisplay : "block"; + return true; + } + + node.oldDisplay = display; + node.style.display = "none"; + return false; + } + + function listToggle(event) + { + var node = event.target; + if (node.nodeType == Node.TEXT_NODE) + node = node.parentNode; + var toggle = node.nextSibling; + while (toggle && toggle.tagName != "UL") + toggle = toggle.nextSibling; + if (toggle) { + node.firstChild.data = toggleDisplay(toggle) ? "[-]" : "[+]"; + } + } + + </script> [% BLOCK depthControlToolbar %] <table cellpadding="3" border="0" cellspacing="0" bgcolor="#d0d0d0"> *************** *** 102,106 **** Swaps text depending on the state of hide_resolved %] <td align="center"> ! <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> <input name="id" type="hidden" value="[% bugid %]"> --- 154,158 ---- Swaps text depending on the state of hide_resolved %] <td align="center"> ! <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> <input name="id" type="hidden" value="[% bugid %]"> *************** *** 109,113 **** [% END %] <input type="hidden" name="hide_resolved" value="[% hide_resolved ? 0 : 1 %]"> ! <input type="submit" value="[% hide_resolved ? "Show" : "Hide" %] Resolved"> </form> </td> --- 161,166 ---- [% END %] <input type="hidden" name="hide_resolved" value="[% hide_resolved ? 0 : 1 %]"> ! <input type="submit" ! value="[% IF hide_resolved %]Show[% ELSE %]Hide[% END %] Resolved"> </form> </td> *************** *** 125,131 **** style="display: inline; margin: 0px;"> [%# set to one form %] ! <input type="submit" value=" 1 " [% ! realdepth < 2 || maxdepth == 1 ? "disabled" : "" ! %]> <input name="id" type="hidden" value="[% bugid %]"> <input name="maxdepth" type="hidden" value="1"> --- 178,183 ---- style="display: inline; margin: 0px;"> [%# set to one form %] ! <input type="submit" value=" 1 " ! [% "disabled" IF realdepth < 2 || maxdepth == 1 %]> <input name="id" type="hidden" value="[% bugid %]"> <input name="maxdepth" type="hidden" value="1"> *************** *** 135,160 **** <td> ! <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> ! [%# Minus one form Allow subtracting only when realdepth and maxdepth > 1 %] <input name="id" type="hidden" value="[% bugid %]"> ! <input name="maxdepth" type="hidden" value="[% ! maxdepth == 1 ? 1 : ( maxdepth ? maxdepth - 1 : realdepth - 1 ) %]"> <input name="hide_resolved" type="hidden" value="[% hide_resolved %]"> ! <input type="submit" value=" < " [% ! realdepth < 2 || ( maxdepth && maxdepth < 2 ) ? "disabled" : "" ! %]> </form> </td> <td> ! <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> [%# Limit entry form: the button can not do anything when total depth is less than two, so disable it %] ! <input name="maxdepth" size="4" maxlength="4" value="[% maxdepth > 0 && maxdepth <= realdepth ? maxdepth : "" %]"> --- 187,211 ---- <td> ! <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> ! [%# Minus one form Allow subtracting only when realdepth and maxdepth > 1 %] <input name="id" type="hidden" value="[% bugid %]"> ! <input name="maxdepth" type="hidden" value="[% ! maxdepth == 1 ? 1 : ( maxdepth ? maxdepth - 1 : realdepth - 1 ) %]"> <input name="hide_resolved" type="hidden" value="[% hide_resolved %]"> ! <input type="submit" value=" < " ! [% "disabled" IF realdepth < 2 || ( maxdepth && maxdepth < 2 ) %]> </form> </td> <td> ! <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> [%# Limit entry form: the button can not do anything when total depth is less than two, so disable it %] ! <input name="maxdepth" size="4" maxlength="4" value="[% maxdepth > 0 && maxdepth <= realdepth ? maxdepth : "" %]"> *************** *** 162,166 **** <input name="hide_resolved" type="hidden" value="[% hide_resolved %]"> <noscript> ! <input type="submit" value="Change" [% realdepth < 2 ? "disabled" : "" %]> </noscript> </form> --- 213,217 ---- <input name="hide_resolved" type="hidden" value="[% hide_resolved %]"> <noscript> ! <input type="submit" value="Change" [% "disabled" IF realdepth < 2 %]> </noscript> </form> *************** *** 168,174 **** <td> ! <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> ! [%# plus one form Disable button if total depth < 2, or if depth set to unlimited %] <input name="id" type="hidden" value="[% bugid %]"> --- 219,225 ---- <td> ! <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> ! [%# plus one form Disable button if total depth < 2, or if depth set to unlimited %] <input name="id" type="hidden" value="[% bugid %]"> *************** *** 177,198 **** [% END %] <input name="hide_resolved" type="hidden" value="[% hide_resolved %]"> ! <input type="submit" value=" > " [% ! realdepth < 2 || ! maxdepth || maxdepth >= realdepth ? ! "disabled" : "" ! %]> </form> </td> <td> ! <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> [%# Unlimited button %] <input name="id" type="hidden" value="[% bugid %]"> <input name="hide_resolved" type="hidden" value="[% hide_resolved %]"> ! <input type="submit" value=" Unlimited " ! [% maxdepth == 0 || maxdepth == realdepth ? "disabled" : "" %]> </form> </td> </tr> </table> [% END %] --- 228,249 ---- [% END %] <input name="hide_resolved" type="hidden" value="[% hide_resolved %]"> ! <input type="submit" value=" > " ! [% "disabled" IF realdepth < 2 || !maxdepth || maxdepth >= realdepth %] ! %]> </form> </td> <td> ! <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> [%# Unlimited button %] <input name="id" type="hidden" value="[% bugid %]"> <input name="hide_resolved" type="hidden" value="[% hide_resolved %]"> ! <input type="submit" value=" Unlimited " ! [% "disabled" IF maxdepth == 0 || maxdepth == realdepth %]> </form> </td> </tr> </table> + [% END %] Index: edit.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/edit.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** edit.html.tmpl 28 Jun 2004 00:45:44 -0000 1.1 --- edit.html.tmpl 15 May 2005 15:04:53 -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,90 **** # [...1031 lines suppressed...] ! [% END %] ! </select> </td> <td> </td> --- 572,586 ---- [%############################################################################%] ! [% BLOCK select %] <td> ! <label for="[% selname %]" accesskey="[% accesskey %]"> ! <select name="[% selname %]" id="[% selname %]"> ! [% FOREACH x = bug.choices.${selname} %] ! <option value="[% x FILTER html %]" ! [% " selected" IF x == bug.${selname} %]>[% x FILTER html %] ! </option> ! [% END %] ! </select> ! </label> </td> <td> </td> Index: choose.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/choose.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** choose.html.tmpl 28 Jun 2004 00:45:44 -0000 1.1 --- choose.html.tmpl 15 May 2005 15:04:53 -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,34 **** #%] ! [% UNLESS header_done %] ! [% PROCESS global/header.html.tmpl ! title = "Search by bug number" ! %] ! [% END %] <form method="get" action="show_bug.cgi"> <p> ! You may find a single bug by entering its bug id here: <input name="id" size="6"> ! <input type="submit" value="Show Me This Bug"> </p> </form> --- 20,34 ---- #%] ! [% PROCESS global/variables.none.tmpl %] ! ! [% PROCESS global/header.html.tmpl ! title = "Search by $terms.bug number" ! %] <form method="get" action="show_bug.cgi"> <p> ! You may find a single [% terms.bug %] by entering its [% terms.bug %] id here: <input name="id" size="6"> ! <input type="submit" value="Show Me This [% terms.Bug %]"> </p> </form> --- NEW FILE: time.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): Jeff Hedlund <jef...@ma...> # #%] [% BLOCK formattimeunit %] [%# INTERFACE: # time_unit: the number converting, converts to 2 decimal places # unless the last character is a 0, then it truncates to # 1 decimal place #%] [% time_unit = time_unit FILTER format('%.2f') %] [% IF time_unit.match('0\Z') %] [% time_unit FILTER format('%.1f') %] [% ELSE %] [% time_unit FILTER format('%.2f') %] [% END %] [% END %] [% BLOCK calculatepercentage %] [%# INTERFACE: # act: actual time # rem: remaining time # %] [% IF (act + rem) > 0 %] [% (act / (act + rem)) * 100 FILTER format("%d") %] [% ELSE %] 0 [% END %] [% END %] Index: dependency-graph.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/dependency-graph.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dependency-graph.html.tmpl 28 Jun 2004 00:45:44 -0000 1.1 --- dependency-graph.html.tmpl 15 May 2005 15:04:53 -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,43 **** # doall: boolean. True if we are displaying every bug in the database. # showsummary: boolean. True if we are showing bug summaries. ! # rankdir: string. "TB" if we are ranking top-to-bottom, "LR" if left-to-right. # image_url: string. The URL of the graphic showing the dependencies. # map_url: string. The URL of the map file for the image. (Optional) ! # image_map: string. The image map for the graphic showing the dependencies. (Optional) #%] [% title = "Dependency Graph" h1 = title %] ! [% IF NOT multiple_bugs AND NOT doall %] ! [% title = "$title for bug $bug_id" ! h1 = "$h1 for bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>" %] [% END %] --- 25,45 ---- # doall: boolean. True if we are displaying every bug in the database. # showsummary: boolean. True if we are showing bug summaries. ! # rankdir: string. "TB" if we are ranking top-to-bottom, "LR" if left-to-right. # image_url: string. The URL of the graphic showing the dependencies. # map_url: string. The URL of the map file for the image. (Optional) ! # image_map: string. The image map for the graphic showing the dependencies. (Optional) #%] + [% PROCESS global/variables.none.tmpl %] + [% title = "Dependency Graph" h1 = title %] ! [% IF NOT multiple_bugs AND NOT doall %] ! [% title = "$title for $terms.bug $bug_id" ! h1 = "$h1 for $terms.bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>" %] [% END %] *************** *** 48,59 **** <p> ! Green circles represent open bugs. </p> [% IF image_map %] ! <img src="[% image_url %]" usemap="#imagemap"> [% ELSE %] <a href="[% map_url %]"> ! <img src="[% image_url %]" ismap="ismap"> </a> [% END %] --- 50,61 ---- <p> ! Green circles represent open [% terms.bugs %]. </p> [% IF image_map %] ! <img src="[% image_url %]" alt="Dependency graph" usemap="#imagemap"> [% ELSE %] <a href="[% map_url %]"> ! <img src="[% image_url %]" alt="Dependency graph" ismap="ismap"> </a> [% END %] *************** *** 61,89 **** <hr> ! <form> <table> <tr> <td> ! Bug numbers: <input name="id" value="[% bug_id %]"> </td> </tr> ! <tr> <td> ! <input type="checkbox" name="doall" [% " checked" IF doall %]> ! Show <b>every</b> bug in the system with dependencies </td> </tr> ! <tr> <td colspan="3"> ! <input type="checkbox" name="showsummary" [% " checked" IF showsummary %]> ! Show the summaries of all displayed bugs </td> </tr> ! <tr> <td colspan="3"> --- 63,91 ---- <hr> ! <form action="showdependencygraph.cgi"> <table> <tr> <td> ! [% terms.Bug %] numbers: <input name="id" value="[% bug_id %]"> </td> </tr> ! <tr> <td> ! <input type="checkbox" name="doall" [% " checked" IF doall %]> ! Show <b>every</b> [% terms.bug %] in the system with dependencies </td> </tr> ! <tr> <td colspan="3"> ! <input type="checkbox" name="showsummary" [% " checked" IF showsummary %]> ! Show the summaries of all displayed [% terms.bugs %] </td> </tr> ! <tr> <td colspan="3"> --- NEW FILE: show.xml.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): Bradley Baetz <bb...@st...> # #%] <?xml version="1.0" standalone="yes"?> <!DOCTYPE bugzilla SYSTEM "[% Param('urlbase') %]bugzilla.dtd"> <bugzilla version="[% VERSION %]" urlbase="[% Param('urlbase') %]" maintainer="[% Param('maintainer') FILTER xml %]" [% IF user %] exporter="[% user.email FILTER xml %]" [% END %] > [% FOREACH bug = bugs %] [% IF bug.error %] <bug error="[% bug.error FILTER xml %]"> <bug_id>[% bug.bug_id FILTER xml %]</bug_id> </bug> [% ELSE %] <bug> [% FOREACH field = bug.fields %] [% IF displayfields.$field %] [%+ PROCESS bug_field %] [% END %] [% END %] [%# Now handle 'special' fields #%] [% IF displayfields.group %] [% FOREACH g = bug.groups %] [% NEXT UNLESS g.ison %] <group>[% g.name FILTER xml %]</group> [% END %] [% END %] [% IF displayfields.long_desc %] [% FOREACH c = bug.longdescs %] [% NEXT IF c.isprivate && !UserInGroup(Param("insidergroup")) %] <long_desc> <who>[% c.email FILTER xml %]</who> <bug_when>[% c.time FILTER time FILTER xml %]</bug_when> <thetext>[% c.body FILTER xml %]</thetext> </long_desc> [% END %] [% END %] [% IF displayfields.attachment %] [% FOREACH a = bug.attachments %] [% NEXT IF a.isprivate && !UserInGroup(Param("insidergroup")) %] <attachment> <attachid>[% a.attachid %]</attachid> <date>[% a.date FILTER time FILTER xml %]</date> <desc>[% a.description FILTER xml %]</desc> </attachment> [% END %] [% END %] </bug> [% END %] [% END %] </bugzilla> [% BLOCK bug_field %] [% FOREACH val = bug.$field %] [%# We need to handle some fields differently. This should become # nicer once we have custfields, and a type attribute for the fields #%] [% IF field == 'reporter' OR field == 'assigned_to' OR field == 'qa_contact' %] [% val = val.email %] [% ELSIF field == 'creation_ts' OR field == 'delta_ts' %] [% val = val FILTER time %] [% END %] <[% field %]>[% val FILTER xml %]</[% field %]> [% END %] [% END %] Index: navigate.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/navigate.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** navigate.html.tmpl 28 Jun 2004 00:45:44 -0000 1.1 --- navigate.html.tmpl 15 May 2005 15:04:53 -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 *************** *** 19,54 **** # Contributor(s): Gervase Markham <ge...@ge...> #%] ! [% IF bug_list && bug_list.size > 0 %] [% this_bug_idx = lsearch(bug_list, bug.bug_id) %] ! <b>Bug List:</b> [% IF this_bug_idx != -1 %] ([% this_bug_idx + 1 %] of [% bug_list.size %]) [% END %] ! <a href="show_bug.cgi?id=[% bug_list.first %]">First</a> <a href="show_bug.cgi?id=[% bug_list.last %]">Last</a> ! [% IF this_bug_idx != -1 %] ! [% IF this_bug_idx > 0 %] ! [% prev_bug = this_bug_idx - 1 %] ! <a href="show_bug.cgi?id=[% bug_list.$prev_bug %]">Prev</a> ! [% ELSE %] ! <i><font color="#777777">Prev</font></i> ! [% END %] ! [% IF this_bug_idx + 1 < bug_list.size %] ! [% next_bug = this_bug_idx + 1 %] ! <a href="show_bug.cgi?id=[% bug_list.$next_bug %]">Next</a> [% ELSE %] ! <i><font color="#777777">Next</font></i> [% END %] [% ELSE %] ! (This bug is not in your list) [% END %] ! <a href="buglist.cgi?regetlastlist=1">Show list</a> [% END %] ! <a href="query.cgi">Query page</a> ! <a href="enter_bug.cgi">Enter new bug</a> --- 19,60 ---- # Contributor(s): Gervase Markham <ge...@ge...> #%] ! ! [% PROCESS global/variables.none.tmpl %] ! [% IF bug_list && bug_list.size > 0 %] [% this_bug_idx = lsearch(bug_list, bug.bug_id) %] ! <b>[% terms.Bug %] List:</b> [% IF this_bug_idx != -1 %] ([% this_bug_idx + 1 %] of [% bug_list.size %]) [% END %] ! <a href="show_bug.cgi?id=[% bug_list.first %]">First</a> <a href="show_bug.cgi?id=[% bug_list.last %]">Last</a> ! [% IF bug.bug_id %] ! [% IF this_bug_idx != -1 %] ! [% IF this_bug_idx > 0 %] ! [% prev_bug = this_bug_idx - 1 %] ! <a href="show_bug.cgi?id=[% bug_list.$prev_bug %]">Prev</a> ! [% ELSE %] ! <i><font color="#777777">Prev</font></i> ! [% END %] ! [% IF this_bug_idx + 1 < bug_list.size %] ! [% next_bug = this_bug_idx + 1 %] ! <a href="show_bug.cgi?id=[% bug_list.$next_bug %]">Next</a> ! [% ELSE %] ! <i><font color="#777777">Next</font></i> ! [% END %] [% ELSE %] ! (This [% terms.bug %] is not in your list) [% END %] [% ELSE %] ! [% END %] ! <a href="buglist.cgi?regetlastlist=1">Show list</a> [% END %] ! <a href="query.cgi">Search page</a> ! <a href="enter_bug.cgi">Enter new [% terms.bug %]</a> Index: comments.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/comments.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** comments.html.tmpl 28 Jun 2004 00:45:44 -0000 1.1 --- comments.html.tmpl 15 May 2005 15:04:53 -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,25 **** #%] ! [% DEFAULT start_at = 0 %] [% count = 0 %] [% FOREACH comment = comments %] [% IF count >= start_at %] --- 20,26 ---- #%] ! [% DEFAULT start_at = 0 mode = "show" %] [% count = 0 %] + [% isinsider = Param("insidergroup") && UserInGroup(Param("insidergroup")) %] [% FOREACH comment = comments %] [% IF count >= start_at %] *************** *** 30,33 **** --- 31,40 ---- [% END %] + [% PROCESS bug/time.html.tmpl %] + + [%# Note: this template is used in multiple places; if you use this hook, + # make sure you are aware of this fact. + #%] + [% Hook.process("aftercomments") %] [%############################################################################%] *************** *** 36,53 **** [% BLOCK a_comment %] ! [% IF count > 0 %] ! <br> ! <i>------- Additional Comment ! <a name="c[% count %]" href="#c[% count %]">#[% count %]</a> From ! <a href="mailto:[% comment.email FILTER html %]">[% comment.name FILTER html %]</a> ! [%+ comment.time %] ------- ! </i> ! [% END %] ! [%# Don't indent the <pre> block, since then the spaces are displayed in the # generated HTML #%] ! <pre> ! [%- quoteUrls(comment.body) -%] </pre> [% END %] --- 43,89 ---- [% BLOCK a_comment %] ! [% IF NOT comment.isprivate || isinsider %] ! <div [% "class=\"bz_private\"" IF comment.isprivate %]> ! [% IF count > 0 %] ! <br> ! <span class="bz_comment"> ! ------- <i>Additional Comment ! <a name="c[% count %]" href="#c[% count %]">#[% count %]</a> From ! <a href="mailto:[% comment.email FILTER html %]"> ! [% comment.name FILTER html %]</a> ! [%+ comment.time FILTER time %] ! </i> ! [% IF mode == "edit" %] ! <script type="text/javascript" language="JavaScript"><!-- ! addReplyLink([% count %]); //--></script> ! [% END %] ! ------- ! </span> ! [% END %] ! ! [% IF mode == "edit" && isinsider %] ! <i> ! <input type="hidden" name="oisprivate-[% count %]" ! value="[% comment.isprivate %]"> ! <input type="hidden" name="when-[% count %]" value="[% comment.when %]"> ! <input type="checkbox" name="isprivate-[% count %]" value="1" ! id="isprivate-[% count %]" ! [% " checked=\"checked\"" IF comment.isprivate %]> Private ! </i> ! [% END %] ! [% IF UserInGroup(Param('timetrackinggroup')) && ! (comment.work_time > 0 || comment.work_time < 0) %] ! <br> ! Additional hours worked: ! [% PROCESS formattimeunit time_unit=comment.work_time %] ! [% END %] ! [%# Don't indent the <pre> block, since then the spaces are displayed in the # generated HTML #%] ! <pre[% ' id="comment_text_' _ count _ '"' IF mode == "edit" %]> ! [%- comment.body FILTER quoteUrls -%] </pre> + </div> + [% END %] [% END %] Index: show-multiple.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/show-multiple.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** show-multiple.html.tmpl 28 Jun 2004 00:45:44 -0000 1.1 --- show-multiple.html.tmpl 15 May 2005 15:04:53 -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,28 **** #%] ! [% PROCESS global/header.html.tmpl ! title = "Full Text Bug Listing" ! %] [% IF bugs.first %] [% FOREACH bug = bugs %] --- 21,31 ---- #%] ! [% PROCESS global/variables.none.tmpl %] + [% PROCESS global/header.html.tmpl + title = "Full Text $terms.Bug Listing" + style_urls = [ "css/show_multiple.css" ] + %] + [% PROCESS bug/time.html.tmpl %] [% IF bugs.first %] [% FOREACH bug = bugs %] *************** *** 31,38 **** [% ELSE %] <p> ! You'd have more luck if you gave me some bug numbers. </p> [% END %] [% PROCESS global/footer.html.tmpl %] --- 34,42 ---- [% ELSE %] <p> ! You'd have more luck if you gave me some [% terms.bug %] numbers. </p> [% END %] + [% PROCESS global/footer.html.tmpl %] *************** *** 43,50 **** [% BLOCK bug_display %] ! <img src="1x1.gif" width="1" height="80" align="left"> <div align="center"> <b> ! <font ="+3">Bug [% bug.bug_id %] - [% bug.short_desc FILTER html %]</font> </b> </div> --- 47,54 ---- [% BLOCK bug_display %] ! <img alt="" src="1x1.gif" width="1" height="80" align="left"> <div align="center"> <b> ! <font size="+3">[% terms.Bug %] [%+ bug.bug_id %] - [% bug.short_desc FILTER html %]</font> </b> </div> *************** *** 53,97 **** <tr> <td> ! <b>Bug#:</b> <a href="show_bug.cgi?id=[% bug.bug_id %]">[% bug.bug_id %]</a> </td> ! [% PROCESS cell attr = { description => "Product", name => "product" } %] ! [% PROCESS cell attr = { description => "Version", name => "version" } %] ! [% PROCESS cell attr = { description => "Platform", name => "rep_platform" } %] </tr> ! <tr> ! [% PROCESS cell attr = { description => "OS/Version", name => "op_sys" } %] ! [% PROCESS cell attr = { description => "Status", name => "bug_status" } %] ! [% PROCESS cell attr = { description => "Severity", name => "bug_severity" } %] ! [% PROCESS cell attr = { description => "Priority", name => "priority" } %] </tr> ! <tr> ! [% PROCESS cell attr = { description => "Resolution", name => "resolution" } %] ! [% PROCESS cell attr = { description => "Assigned To", name => "assigned_to" } %] ! [% PROCESS cell attr = { description => "Reported By", name => "reporter" } %] [% IF Param('useqacontact') %] ! [% PROCESS cell attr = { description => "QA Contact", name => "qa_contact" } %] [% END %] </tr> ! <tr> <td colspan="2"> <b>Component:</b> ! [% bug.component %] </td> ! <td colspan="2"> [% IF Param('usetargetmilestone') %] --- 57,104 ---- <tr> <td> ! <b>[% terms.Bug %]#:</b> <a href="show_bug.cgi?id=[% bug.bug_id %]">[% bug.bug_id %]</a> + [% IF Param("usebugaliases") AND bug.alias %] + ([% bug.alias FILTER html %]) + [% END %] </td> ! [% PROCESS cell attr = { description => "Product", name => "product" } %] ! [% PROCESS cell attr = { description => "Version", name => "version" } %] ! [% PROCESS cell attr = { description => "Platform", name => "rep_platform" } %] </tr> ! <tr> ! [% PROCESS cell attr = { description => "OS/Version", name => "op_sys" } %] ! [% PROCESS cell attr = { description => "Status", name => "bug_status" } %] ! [% PROCESS cell attr = { description => "Severity", name => "bug_severity" } %] ! [% PROCESS cell attr = { description => "Priority", name => "priority" } %] </tr> ! <tr> ! [% PROCESS cell attr = { description => "Resolution", name => "resolution" } %] ! [% PROCESS cell attr = { description => "Assigned To", name => "assigned_to" } %] ! [% PROCESS cell attr = { description => "Reported By", name => "reporter" } %] [% IF Param('useqacontact') %] ! [% PROCESS cell attr = { description => "QA Contact", name => "qa_contact" } %] [% END %] </tr> ! <tr> <td colspan="2"> <b>Component:</b> ! [% bug.component FILTER html %] </td> ! <td colspan="2"> [% IF Param('usetargetmilestone') %] *************** *** 101,112 **** </td> </tr> ! <tr> <td colspan="4"> <b>URL:</b> ! <a href="[% bug.bug_file_loc FILTER html %]"> ! [% bug.bug_file_loc FILTER html %]</a> </tr> ! <tr> <td colspan="4"> --- 108,124 ---- </td> </tr> ! <tr> <td colspan="4"> <b>URL:</b> ! [% IF bug.bug_file_loc ! AND NOT bug.bug_file_loc.match("^(javascript|data)") %] ! <a href="[% bug.bug_file_loc FILTER html %]"> ! [% bug.bug_file_loc FILTER html %]</a> ! [% ELSE %] ! [% bug.bug_file_loc FILTER html %] ! [% END %] </tr> ! <tr> <td colspan="4"> *************** *** 114,118 **** </td> </tr> ! [% IF use_keywords %] <tr> --- 126,130 ---- </td> </tr> ! [% IF use_keywords %] <tr> *************** *** 132,135 **** --- 144,179 ---- [% END %] + [% IF UserInGroup(Param("timetrackinggroup")) %] + <tr> + <td colspan="4"> + <b>Orig. Est.:</b> + [% PROCESS formattimeunit time_unit=bug.estimated_time %] + + <b>Current Est.:</b> + [% PROCESS formattimeunit + time_unit=(bug.remaining_time + bug.actual_time) %] + + <b>Hours Worked:</b> + [% PROCESS formattimeunit time_unit=bug.actual_time %] + <b>Hours Left:</b> + [% PROCESS formattimeunit time_unit=bug.remaining_time %] + + <b>Percentage Complete:</b> + [% PROCESS calculatepercentage act=bug.actual_time + rem=bug.remaining_time %] + <b>Gain</b> + [% PROCESS formattimeunit + time_unit=bug.estimated_time - (bug.actual_time + bug.remaining_time) %] + + </td> + </tr> + [% END %] + + <tr> + <td colspan="4"> + <b>Opened:</b> + [% bug.creation_ts FILTER time %] + </td> + </tr> <tr> <td colspan="4"> *************** *** 139,145 **** </table> ! [% PROCESS bug/comments.html.tmpl comments = bug.comments %] ! <hr> [% END %] --- 183,189 ---- </table> ! [% PROCESS bug/comments.html.tmpl comments = bug.comments %] ! <hr> [% END %] *************** *** 152,156 **** [% BLOCK cell %] <td> ! <b>[% attr.description%]:</b> [% bug.${attr.name} FILTER html %] </td> --- 196,200 ---- [% BLOCK cell %] <td> ! <b>[% attr.description FILTER html %]:</b> [% bug.${attr.name} FILTER html %] </td> --- NEW FILE: show.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...> # Vaskin Kissoyan <vki...@ya...> # Bradley Baetz <bb...@st...> #%] [% PROCESS global/variables.none.tmpl %] [%# This script/template only handles one bug #%] [% bug = bugs.0 %] [% filtered_desc = bug.short_desc FILTER html %] [% filtered_timestamp = bug.delta_ts FILTER time %] [% PROCESS global/header.html.tmpl title = "$terms.Bug $bug.bug_id - $bug.short_desc" h1 = "$terms.Bugzilla $terms.Bug $bug.bug_id" h2 = filtered_desc h3 = "Last modified: $filtered_timestamp" bodyclasses = ['bz_bug', "bz_status_$bug.bug_status", "bz_component_$bug.component", "bz_bug_$bug.bug_id" ] %] [% PROCESS bug/navigate.html.tmpl %] <hr> [% PROCESS bug/edit.html.tmpl %] <hr> [% PROCESS bug/navigate.html.tmpl %] <br> [% PROCESS global/footer.html.tmpl %] --- NEW FILE: knob.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...> # Vaskin Kissoyan <vki...@ya...> #%] [% PROCESS global/variables.none.tmpl %] [%# *** Knob *** %] <br> <input type="radio" id="knob-leave" name="knob" value="none" checked="checked"> <label for="knob-leave"> Leave as <b>[% bug.bug_status FILTER html %] [% bug.resolution FILTER html %]</b> </label> <br> [% knum = 1 %] [% IF bug.isunconfirmed && bug.user.canconfirm %] <input type="radio" id="knob-confirm" name="knob" value="confirm"> <label for="knob-confirm"> Confirm [% terms.bug %] (change status to <b>NEW</b>) </label> <br> [% knum = knum + 1 %] [% END %] [% IF bug.user.canedit %] [% IF bug.isopened %] [% IF bug.bug_status != "ASSIGNED" && bug.user.canconfirm %] <input type="radio" id="knob-accept" name="knob" value="accept"> <label for="knob-accept"> Accept [% terms.bug %] ( [% IF bug.isunconfirmed %]confirm [% terms.bug %], [% END %]change status to <b>ASSIGNED</b>) </label> <br> [% knum = knum + 1 %] [% END %] [% IF bug.resolution %] <input type="radio" id="knob-clear" name="knob" value="clearresolution"> <label for="knob-clear"> Clear the resolution (remove the current resolution of <b>[% bug.resolution FILTER html %]</b>) </label> <br> [% knum = knum + 1 %] [% END %] <input type="radio" id="knob-resolve" name="knob" value="resolve"> <label for="knob-resolve"> Resolve [% terms.bug %], changing <a href="page.cgi?id=fields.html#resolution">resolution</a> to </label> <select name="resolution" onchange="document.changeform.knob[[% knum %]].checked=true"> [% FOREACH r = bug.choices.resolution %] <option value="[% r FILTER html %]">[% r FILTER html %]</option> [% END %] </select> <br> [% knum = knum + 1 %] <input type="radio" id="knob-duplicate" name="knob" value="duplicate"> <label for="knob-duplicate"> Resolve [% terms.bug %], mark it as duplicate of [% terms.bug %] # </label> <input name="dup_id" size="6" onchange="if (this.value != '') {document.changeform.knob[[% knum %]].checked=true}"> <br> [% knum = knum + 1 %] <input type="radio" id="knob-reassign" name="knob" value="reassign"> <label for="knob-reassign"> <a href="page.cgi?id=fields.html#assigned_to">Reassign</a> [% terms.bug %] to </label> <input name="assigned_to" size="32" onchange="if ((this.value != '[% bug.assigned_to.login FILTER js FILTER html %]') && (this.value != '')) { document.changeform.knob[[% knum %]].checked=true; }" value="[% bug.assigned_to.login FILTER html %]"> <br> [% IF bug.isunconfirmed && bug.user.canconfirm %] <input type="checkbox" id="andconfirm" name="andconfirm"> <label for="andconfirm"> and confirm [% terms.bug %] (change status to <b>NEW</b>) </label> <br> [% END %] [% knum = knum + 1 %] <input type="radio" id="knob-reassign-cmp" name="knob" value="reassignbycomponent"> <label for="knob-reassign-cmp"> Reassign [% terms.bug %] to owner [% " and QA contact" IF Param('useqacontact') %] of selected component </label> <br> [% IF bug.isunconfirmed && bug.user.canconfirm %] <input type="checkbox" id="compconfirm" name="compconfirm"> <label for="compconfirm"> and confirm [% terms.bug %] (change status to <b>NEW</b>) </label> <br> [% END %] [% knum = knum + 1 %] [% ELSE %] [% IF bug.resolution != "MOVED" || (bug.resolution == "MOVED" && bug.user.canmove) %] <input type="radio" id="knob-reopen" name="knob" value="reopen"> <label for="knob-reopen"> Reopen [% terms.bug %] </label> <br> [% knum = knum + 1 %] [% END %] [% IF bug.bug_status == "RESOLVED" %] <input type="radio" id="knob-verify" name="knob" value="verify"> <label for="knob-verify"> Mark [% terms.bug %] as <b>VERIFIED</b> </label> <br> [% knum = knum + 1 %] [% END %] [% IF bug.bug_status != "CLOSED" %] <input type="radio" id="knob-close" name="knob" value="close"> <label for="knob-close"> Mark [% terms.bug %] as <b>CLOSED</b> </label> <br> [% knum = knum + 1 %] [% END %] [% END %] [% END %] <input type="submit" value="Commit"> <input type="hidden" name="form_name" value="process_bug"> <p> <font size="+1"> <b> <a href="show_activity.cgi?id=[% bug.bug_id %]">View [% terms.Bug %] Activity</a> | <a href="long_list.cgi?buglist=[% bug.bug_id %]">Format For Printing</a> </b> </font> [% IF bug.user.canmove %] <font size="+1"><b> | </b></font> <input type="submit" name="action" value="[% Param("move-button-text") %]"> [% END %] </p> |
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 %] |
|
From: Tim G. <xt...@us...> - 2005-05-15 15:05:33
|
Update of /cvsroot/openfirst/www/htdocs/bugzilla/attachment In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32743/attachment Modified Files: content-types.html.tmpl create.html.tmpl created.html.tmpl edit.html.tmpl list.html.tmpl show-multiple.html.tmpl updated.html.tmpl Added Files: choose.html.tmpl diff-file.html.tmpl diff-footer.html.tmpl diff-header.html.tmpl Log Message: Bring templates up to date for Bugzilla 2.18.1 Index: content-types.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/attachment/content-types.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** content-types.html.tmpl 28 Jun 2004 00:46:30 -0000 1.1 --- content-types.html.tmpl 15 May 2005 15:04:53 -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 --- NEW FILE: diff-footer.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): John Keiser <jk...@ne...> #%] </form> [% IF headers %] <br> [% PROCESS global/footer.html.tmpl %] [% ELSE %] </body> </html> [% END %] Index: edit.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/attachment/edit.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** edit.html.tmpl 28 Jun 2004 00:46:30 -0000 1.1 --- edit.html.tmpl 15 May 2005 15:04:53 -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,38 **** #%] [%# Define strings that will serve as the title and header of this page %] ! [% title = BLOCK %]Edit Attachment #[% attachid %] for Bug #[% bugid %][% END %] ! [% h1 = BLOCK %]Edit Attachment #[% attachid %] for <a href="show_bug.cgi?id=[% bugid %]">Bug #[% bugid %]</a>[% END %] [% h2 = BLOCK %][% bugsummary FILTER html %][% END %] ! [% PROCESS global/header.html.tmpl title = title h1 = h1 h2 = h2 style = " ! th { text-align: right; vertical-align: top; } ! td { text-align: left; vertical-align: top; } ! td#info { text-align: right; vertical-align: top; } ! td#actions { text-align: right; vertical-align: bottom; } ! td#noview { text-align: left; vertical-align: center; } " %] --- 20,41 ---- #%] + [% PROCESS global/variables.none.tmpl %] + [%# Define strings that will serve as the title and header of this page %] ! [% title = BLOCK %]Edit Attachment #[% attachid %] for [% terms.Bug %] #[% bugid %][% END %] ! [% h1 = BLOCK %]Edit Attachment #[% attachid %] for ! [%+ GetBugLink(bugid, "$terms.Bug $bugid") %][% END %] [% h2 = BLOCK %][% bugsummary FILTER html %][% END %] ! [% PROCESS global/header.html.tmpl title = title h1 = h1 h2 = h2 style = " ! table.attachment_info th { text-align: right; vertical-align: top; } ! table.attachment_info td { text-align: left; vertical-align: top; } ! #noview { text-align: left; vertical-align: middle; } ! ! table#flags th, table#flags td { font-size: small; vertical-align: baseline; text-align: left; } " %] *************** *** 40,43 **** --- 43,50 ---- <script type="application/x-javascript" language="JavaScript"> <!-- + var prev_mode = 'raw'; + var current_mode = 'raw'; + var has_edited = 0; + var has_viewed_as_diff = 0; function editAsComment() { *************** *** 54,58 **** if ( contentType == 'text/plain' ) { ! theContent = theContent.replace( /^<html><head\/><body><pre>/i , "" ); theContent = theContent.replace( /<\/pre><\/body><\/html>$/i , "" ); theContent = theContent.replace( /</gi , "<" ); --- 61,65 ---- if ( contentType == 'text/plain' ) { ! theContent = theContent.replace( /^<html><head\/?><body><pre>/i , "" ); theContent = theContent.replace( /<\/pre><\/body><\/html>$/i , "" ); theContent = theContent.replace( /</gi , "<" ); *************** *** 67,108 **** theContent = theContent.replace( /(.*\n|.+)/g , ">$1" ); ! hideElementById('viewFrame'); ! hideElementById('editButton'); ! hideElementById('smallCommentFrame'); ! ! showElementById('undoEditButton'); ! ! // Show the TEXTAREA that will contain the editable attachment ! // and copy the content of the attachment into it. ! showElementById('editFrame'); var editFrame = document.getElementById('editFrame'); editFrame.value = theContent; editFrame.value += "\n\n"; } function undoEditAsComment() { ! // Hide the "edit attachment as comment" TEXTAREA and the "undo" button. ! hideElementById('undoEditButton'); ! hideElementById('editFrame'); ! ! // Show the "view attachment" IFRAME, the "redo" button that allows the user ! // to go back to editing the attachment as a comment, and the small comment field. ! showElementById('viewFrame'); ! showElementById('redoEditButton'); ! showElementById('smallCommentFrame'); ! } function redoEditAsComment() { ! // Hide the "view attachment" IFRAME, the "redo" button that allows the user ! // to go back to editing the attachment as a comment, and the small comment field. ! hideElementById('viewFrame'); ! hideElementById('redoEditButton'); ! hideElementById('smallCommentFrame'); ! // Show the "edit attachment as comment" TEXTAREA and the "undo" button. ! showElementById('undoEditButton'); ! showElementById('editFrame'); } --- 74,162 ---- theContent = theContent.replace( /(.*\n|.+)/g , ">$1" ); ! switchToMode('edit'); + // Copy the contents of the diff into the textarea var editFrame = document.getElementById('editFrame'); editFrame.value = theContent; editFrame.value += "\n\n"; + + has_edited = 1; } function undoEditAsComment() { ! switchToMode(prev_mode); } function redoEditAsComment() { ! switchToMode('edit'); ! } ! [% IF patchviewerinstalled %] ! function viewDiff() ! { ! switchToMode('diff'); ! // If we have not viewed as diff before, set the view diff frame URL ! if (!has_viewed_as_diff) { ! var viewDiffFrame = document.getElementById('viewDiffFrame'); ! viewDiffFrame.src = ! 'attachment.cgi?id=[% attachid %]&action=diff&headers=0'; ! has_viewed_as_diff = 1; ! } ! } ! [% END %] ! function viewRaw() ! { ! switchToMode('raw'); ! } ! ! function switchToMode(mode) ! { ! if (mode == current_mode) { ! alert('switched to same mode! This should not happen.'); ! return; ! } ! ! // Switch out of current mode ! if (current_mode == 'edit') { ! hideElementById('editFrame'); ! hideElementById('undoEditButton'); ! } else if (current_mode == 'raw') { ! hideElementById('viewFrame'); ! [% IF patchviewerinstalled %] ! hideElementById('viewDiffButton'); ! [% END %] ! hideElementById(has_edited ? 'redoEditButton' : 'editButton'); ! hideElementById('smallCommentFrame'); ! } else if (current_mode == 'diff') { ! [% IF patchviewerinstalled %] ! hideElementById('viewDiffFrame'); ! [% END %] ! hideElementById('viewRawButton'); ! hideElementById(has_edited ? 'redoEditButton' : 'editButton'); ! hideElementById('smallCommentFrame'); ! } ! ! // Switch into new mode ! if (mode == 'edit') { ! showElementById('editFrame'); ! showElementById('undoEditButton'); ! } else if (mode == 'raw') { ! showElementById('viewFrame'); ! [% IF patchviewerinstalled %] ! showElementById('viewDiffButton'); ! [% END %] ! showElementById(has_edited ? 'redoEditButton' : 'editButton'); ! showElementById('smallCommentFrame'); ! } else if (mode == 'diff') { ! [% IF patchviewerinstalled %] ! showElementById('viewDiffFrame'); ! [% END %] ! showElementById('viewRawButton'); ! showElementById(has_edited ? 'redoEditButton' : 'editButton'); ! showElementById('smallCommentFrame'); ! } ! ! prev_mode = current_mode; ! current_mode = mode; } *************** *** 148,152 **** <input type="hidden" name="contenttypemethod" value="manual"> ! <table width="100%"> <tr> --- 202,206 ---- <input type="hidden" name="contenttypemethod" value="manual"> ! <table class="attachment_info" width="100%"> <tr> *************** *** 156,180 **** <textarea rows="3" cols="25" name="description" wrap="soft">[% description FILTER html %]</textarea><br> <b>MIME Type:</b><br> <input type="text" size="20" name="contenttypeentry" value="[% contenttype FILTER html %]"><br> ! <b>Flags:</b><br> ! <input type="checkbox" name="ispatch" value="1"[% " checked" IF ispatch %]>patch ! <input type="checkbox" name="isobsolete" value="1"[% " checked" IF isobsolete %]>obsolete<br> ! [% IF statusdefs.size %] ! <b>Status:</b><br> ! [% FOREACH def = statusdefs %] ! <input type="checkbox" name="status" value="[% def.id %]"[% " checked" IF statuses.${def.id} %]>[% def.name FILTER html %]<br> ! [% END %] [% END %] <div id="smallCommentFrame"> ! <b>Comment (on the bug):</b><br> <textarea name="comment" rows="5" cols="25" wrap="soft"></textarea><br> </div> ! <input type="submit" value="Submit"> ! </small> </td> --- 210,245 ---- <textarea rows="3" cols="25" name="description" wrap="soft">[% description FILTER html %]</textarea><br> + <b>Filename:</b><br> + <input type="text" size="20" name="filename" value="[% filename FILTER html %]"><br> + <b>Size: </b>[% datasize FILTER unitconvert %]<br> + <b>MIME Type:</b><br> <input type="text" size="20" name="contenttypeentry" value="[% contenttype FILTER html %]"><br> ! <input type="checkbox" id="ispatch" name="ispatch" value="1" ! [% 'checked="checked"' IF ispatch %]> ! <label for="ispatch">patch</label> ! <input type="checkbox" id="isobsolete" name="isobsolete" value="1" ! [% 'checked="checked"' IF isobsolete %]> ! <label for="isobsolete">obsolete</label><br> ! [% IF (Param("insidergroup") && UserInGroup(Param("insidergroup"))) %] ! <input type="checkbox" name="isprivate" value="1"[% " checked" IF isprivate %]> private<br><br> ! [% ELSE %]<br> ! [% END %] ! [% IF flag_types.size > 0 %] ! [% PROCESS "flag/list.html.tmpl" bug_id=bugid attach_id=attachid %]<br> [% END %] <div id="smallCommentFrame"> ! <b>Comment (on the [% terms.bug %]):</b><br> <textarea name="comment" rows="5" cols="25" wrap="soft"></textarea><br> </div> ! <input type="submit" value="Submit"><br><br> ! <strong>Actions:</strong> <a href="attachment.cgi?id=[% attachid %]">View</a> ! [% IF ispatch && patchviewerinstalled %] ! | <a href="attachment.cgi?id=[% attachid %]&action=diff">Diff</a> ! [% END %] </small> </td> *************** *** 183,196 **** <td width="75%"> <textarea id="editFrame" name="comment" style="height: 400px; width: 100%; display: none;" cols="80" wrap="soft"></textarea> ! <iframe id="viewFrame" src="attachment.cgi?id=[% attachid %]&action=view" style="height: 400px; width: 100%;"> <b>You cannot view the attachment while editing it because your browser does not support IFRAMEs. ! <a href="attachment.cgi?id=[% attachid %]&action=view">View the attachment on a separate page</a>.</b> </iframe> <script type="application/x-javascript" language="JavaScript"> <!-- if (typeof document.getElementById == "function") { document.write('<button type="button" id="editButton" onclick="editAsComment();">Edit Attachment As Comment</button>'); document.write('<button type="button" id="undoEditButton" onclick="undoEditAsComment();" style="display: none;">Undo Edit As Comment</button>'); document.write('<button type="button" id="redoEditButton" onclick="redoEditAsComment();" style="display: none;">Redo Edit As Comment</button>'); } //--> --- 248,268 ---- <td width="75%"> <textarea id="editFrame" name="comment" style="height: 400px; width: 100%; display: none;" cols="80" wrap="soft"></textarea> ! <iframe id="viewFrame" src="attachment.cgi?id=[% attachid %]" style="height: 400px; width: 100%;"> <b>You cannot view the attachment while editing it because your browser does not support IFRAMEs. ! <a href="attachment.cgi?id=[% attachid %]">View the attachment on a separate page</a>.</b> </iframe> <script type="application/x-javascript" language="JavaScript"> <!-- if (typeof document.getElementById == "function") { + [% IF patchviewerinstalled %] + document.write('<iframe id="viewDiffFrame" style="height: 400px; width: 100%; display: none;"></iframe>'); + [% END %] document.write('<button type="button" id="editButton" onclick="editAsComment();">Edit Attachment As Comment</button>'); document.write('<button type="button" id="undoEditButton" onclick="undoEditAsComment();" style="display: none;">Undo Edit As Comment</button>'); document.write('<button type="button" id="redoEditButton" onclick="redoEditAsComment();" style="display: none;">Redo Edit As Comment</button>'); + [% IF patchviewerinstalled %] + document.write('<button type="button" id="viewDiffButton" onclick="viewDiff();">View Attachment As Diff</button>'); + [% END %] + document.write('<button type="button" id="viewRawButton" onclick="viewRaw();" style="display: none;">View Attachment As Raw</button>'); } //--> *************** *** 200,205 **** <td id="noview" width="50%"> <p><b> ! Attachment cannot be viewed because its MIME type is not either text/*, image/*, or application/vnd.mozilla.*. ! <a href="attachment.cgi?id=[% attachid %]&action=view">Download the attachment instead</a>. </b></p> </td> --- 272,281 ---- <td id="noview" width="50%"> <p><b> ! Attachment is not viewable in your browser because its MIME type ! ([% contenttype FILTER html %]) is not one that your browser is ! able to display. ! </b></p> ! <p><b> ! <a href="attachment.cgi?id=[% attachid %]">Download the attachment</a>. </b></p> </td> *************** *** 210,214 **** </table> ! Attachments on this Bug: [% FOREACH a = attachments %] [% IF a == attachid %] --- 286,290 ---- </table> ! Attachments on this [% terms.Bug %]: [% FOREACH a = attachments %] [% IF a == attachid %] --- NEW FILE: diff-file.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): John Keiser <jk...@ne...> #%] [%# This line is really long for a reason: to get rid of any possible textnodes # between the elements. This is necessary because DOM parent-child-sibling # relations can change and screw up the javascript for restoring, collapsing # and expanding. Do not change without testing all three of those. #%] <table class="file_table"><thead><tr><td class="file_head" colspan="2"><a href="#" onclick="return twisty_click(this)">[% collapsed ? '(+)' : '(-)' %]</a><input type="checkbox" name="[% file.filename FILTER html %]"[% collapsed ? '' : ' checked' %] style="display: none"> [% IF lxr_prefix && !file.is_add %] <a href="[% lxr_prefix %]">[% file.filename FILTER html %]</a> [% ELSE %] [% file.filename FILTER html %] [% END %] [% IF file.plus_lines %] [% IF file.minus_lines %] (-[% file.minus_lines %] / +[% file.plus_lines %] lines) [% ELSE %] (+[% file.plus_lines %] lines) [% END %] [% ELSE %] [% IF file.minus_lines %] (-[% file.minus_lines %] lines) [% END %] [% END %] </td></tr></thead><tbody class="[% collapsed ? 'file_collapse' : 'file' %]"> <script type="application/x-javascript" language="JavaScript"> incremental_restore() </script> [% section_num = 0 %] [% FOREACH section = sections %] [% section_num = section_num + 1 %] <tr><th class="section_head" colspan="2"> [% IF file.is_add %] Added [% ELSIF file.is_remove %] [% IF bonsai_prefix %] <a href="[% bonsai_prefix %]">Removed</a> [% ELSE %] Removed [% END %] [% ELSE %] [% IF bonsai_prefix %] <a href="[% bonsai_prefix %]#[% section.old_start %]"> [% END %] [% IF section.old_lines > 1 %] Lines [% section.old_start %]-[% section.old_start + section.old_lines - 1 %] [% ELSE %] Line [% section.old_start %] [% END %] [% IF bonsai_prefix %] </a> [% END %] [% END %] (<a name="[% file.filename FILTER html %]_sec[% section_num %]" href="#[% file.filename FILTER html %]_sec[% section_num %]">Link Here</a>) </th></tr> [% FOREACH group = section.groups %] [% IF group.context %] [% FOREACH line = group.context %] <tr><td><pre>[% line FILTER html %]</pre></td><td><pre>[% line FILTER html %]</pre></td></tr> [% END %] [% END %] [% IF group.plus.size %] [% IF group.minus.size %] [% i = 0 %] [% WHILE (i < group.plus.size || i < group.minus.size) %] [% currentloop = 0 %] [% WHILE currentloop < 500 && (i < group.plus.size || i < group.minus.size) %] <tr class="changed"> <td><pre>[% group.minus.$i FILTER html %]</pre></td> <td><pre>[% group.plus.$i FILTER html %]</pre></td> </tr> [% currentloop = currentloop + 1 %] [% i = i + 1 %] [% END %] [% END %] [% ELSE %] [% FOREACH line = group.plus %] [% IF file.is_add %] <tr> <td class="added" colspan="2"><pre>[% line FILTER html %]</pre></td> </tr> [% ELSE %] <tr> <td></td> <td class="added"><pre>[% line FILTER html %]</pre></td> </tr> [% END %] [% END %] [% END %] [% ELSE %] [% IF group.minus.size %] [% FOREACH line = group.minus %] [% IF file.is_remove %] <tr> <td class="removed" colspan="2"><pre>[% line FILTER html %]</pre></td> </tr> [% ELSE %] <tr> <td class="removed"><pre>[% line FILTER html %]</pre></td> <td></td> </tr> [% END %] [% END %] [% END %] [% END %] [% END %] [% END %] </table> Index: list.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/attachment/list.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** list.html.tmpl 28 Jun 2004 00:46:30 -0000 1.1 --- list.html.tmpl 15 May 2005 15:04:53 -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,41 **** <th bgcolor="#cccccc" align="left">Attachment</th> <th bgcolor="#cccccc" align="left">Type</th> ! <th bgcolor="#cccccc" align="left">Modified</th> ! <th bgcolor="#cccccc" align="left">Status</th> <th bgcolor="#cccccc" align="left">Actions</th> </tr> ! [% FOREACH attachment = attachments %] ! <tr> <td valign="top"> ! [% IF attachment.isobsolete %] ! <strike><a href="attachment.cgi?id=[% attachment.attachid %]&action=view">[% attachment.description FILTER html %]</a></strike> ! [% ELSE %] ! <a href="attachment.cgi?id=[% attachment.attachid %]&action=view">[% attachment.description FILTER html %]</a> ! [% END %] </td> --- 25,41 ---- <th bgcolor="#cccccc" align="left">Attachment</th> <th bgcolor="#cccccc" align="left">Type</th> ! <th bgcolor="#cccccc" align="left">Created</th> ! <th bgcolor="#cccccc" align="left">Size</th> ! [% IF show_attachment_flags %] ! <th bgcolor="#cccccc" align="left">Flags</th> ! [% END %] <th bgcolor="#cccccc" align="left">Actions</th> </tr> ! [% canseeprivate = !Param("insidergroup") || UserInGroup(Param("insidergroup")) %] [% FOREACH attachment = attachments %] ! [% IF !attachment.isprivate || canseeprivate %] ! <tr [% "class=\"bz_private\"" IF attachment.isprivate %]> <td valign="top"> ! <a href="attachment.cgi?id=[% attachment.attachid %]">[% attachment.description FILTER html FILTER obsolete(attachment.isobsolete) %]</a> </td> *************** *** 48,80 **** </td> ! <td valign="top">[% attachment.date %]</td> ! <td valign="top"> ! [% IF attachment.statuses.size == 0 %] ! <i>none</i> ! [% ELSE %] ! [% FOREACH s = attachment.statuses %] ! [% s FILTER html FILTER replace('\s', ' ') %]<br> [% END %] ! [% END %] ! </td> ! <td valign="top"> [% IF attachment.canedit %] <a href="attachment.cgi?id=[% attachment.attachid %]&action=edit">Edit</a> ! [% ELSE %] ! None [% END %] </td> </tr> [% END %] <tr> ! <td colspan="4"> <a href="attachment.cgi?bugid=[% bugid %]&action=enter">Create a New Attachment</a> (proposed patch, testcase, etc.) </td> ! <td colspan="1"> ! <a href="attachment.cgi?bugid=[% bugid %]&action=viewall">View All</a> ! </td> </tr> </table> --- 48,100 ---- </td> ! <td valign="top">[% attachment.date FILTER time %]</td> ! <td valign="top">[% attachment.datasize FILTER unitconvert %]</td> ! [% IF show_attachment_flags %] ! <td valign="top"> ! [% IF attachment.flags.size == 0 %] ! <i>none</i> ! [% ELSE %] ! [% FOREACH flag = attachment.flags %] ! [% IF flag.setter %] ! [% flag.setter.nick FILTER html %]: ! [% END %] ! [%+ flag.type.name FILTER html %][% flag.status %] ! [%+ IF flag.status == "?" && flag.requestee %] ! ([% flag.requestee.nick FILTER html %]) ! [% END %]<br> ! [% END %] [% END %] ! </td> ! [% END %] ! <td valign="top"> [% IF attachment.canedit %] <a href="attachment.cgi?id=[% attachment.attachid %]&action=edit">Edit</a> ! [% END %] ! [% IF attachment.ispatch && patchviewerinstalled %] ! [% IF attachment.canedit %] ! | ! [% END %] ! <a href="attachment.cgi?id=[% attachment.attachid %]&action=diff">Diff</a> [% END %] </td> </tr> + [% END %] [% END %] <tr> ! <td colspan="[% show_attachment_flags ? 5 : 4 %]"> <a href="attachment.cgi?bugid=[% bugid %]&action=enter">Create a New Attachment</a> (proposed patch, testcase, etc.) </td> ! [% IF attachments.size %] ! <td> ! <a href="attachment.cgi?bugid=[% bugid %]&action=viewall">View All</a> ! </td> ! [% ELSE %] ! <td class="bz_disabled"> ! View All ! </td> ! [% END %] </tr> </table> --- NEW FILE: diff-header.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): John Keiser <jk...@ne...> #%] [%# Define strings that will serve as the title and header of this page %] [% PROCESS global/variables.none.tmpl %] [% title = BLOCK %] [% IF attachid %] Attachment #[% attachid %] for [% terms.bug %] #[% bugid %] [% ELSE %] Interdiff of #[% oldid %] and #[% newid %] for #[% terms.bug %] #[% bugid %] [% END %] [% END %] [% style = BLOCK %] .file_head { font-weight: bold; font-size: 1em; background-color: #c3c3c3; border: 1px solid black; width: 100%; } .file_head a { text-decoration: none; font-family: monospace; font-size: 1.1em; } .file_collapse { display: none; } .section_head { width: 100%; background-color: #f0f0f0; border: 1px solid black; text-align: left; } table.file_table { table-layout: fixed; width: 100%; empty-cells: show; border-spacing: 0px; border-collapse: collapse; /* draw border below last open context section in listing */ border-bottom: 1px solid black; } tbody.file td { border-left: 1px dashed black; border-right: 1px dashed black; width: 50%; } tbody.file pre { display: inline; white-space: -moz-pre-wrap; font-size: 0.9em; } tbody.file pre:empty { display: block; height: 1em; } .changed { background-color: lightblue; } .added { background-color: lightgreen; } .removed { background-color: #FFCC99; } .warning { color: red } [% END %] [%# SCRIPT FUNCTIONS %] [% javascript = BLOCK %] function collapse_all() { var elem = document.checkboxform.firstChild; while (elem != null) { if (elem.firstChild != null) { var tbody = elem.firstChild.nextSibling; if (tbody.className == 'file') { tbody.className = 'file_collapse'; twisty = get_twisty_from_tbody(tbody); twisty.firstChild.nodeValue = '(+)'; twisty.nextSibling.checked = false; } } elem = elem.nextSibling; } return false; } function expand_all() { var elem = document.checkboxform.firstChild; while (elem != null) { if (elem.firstChild != null) { var tbody = elem.firstChild.nextSibling; if (tbody.className == 'file_collapse') { tbody.className = 'file'; twisty = get_twisty_from_tbody(tbody); twisty.firstChild.nodeValue = '(-)'; twisty.nextSibling.checked = true; } } elem = elem.nextSibling; } return false; } var current_restore_elem; function restore_all() { current_restore_elem = null; incremental_restore(); } function incremental_restore() { if (!document.checkboxform.restore_indicator.checked) { return; } var next_restore_elem; if (current_restore_elem) { next_restore_elem = current_restore_elem.nextSibling; } else { next_restore_elem = document.checkboxform.firstChild; } while (next_restore_elem != null) { current_restore_elem = next_restore_elem; if (current_restore_elem.firstChild != null) { restore_elem(current_restore_elem.firstChild.nextSibling); } next_restore_elem = current_restore_elem.nextSibling; } } function restore_elem(elem, alertme) { if (elem.className == 'file_collapse') { twisty = get_twisty_from_tbody(elem); if (twisty.nextSibling.checked) { elem.className = 'file'; twisty.firstChild.nodeValue = '(-)'; } } else if (elem.className == 'file') { twisty = get_twisty_from_tbody(elem); if (!twisty.nextSibling.checked) { elem.className = 'file_collapse'; twisty.firstChild.nodeValue = '(+)'; } } } function twisty_click(twisty) { tbody = get_tbody_from_twisty(twisty); if (tbody.className == 'file') { tbody.className = 'file_collapse'; twisty.firstChild.nodeValue = '(+)'; twisty.nextSibling.checked = false; } else { tbody.className = 'file'; twisty.firstChild.nodeValue = '(-)'; twisty.nextSibling.checked = true; } return false; } function get_tbody_from_twisty(twisty) { return twisty.parentNode.parentNode.parentNode.nextSibling; } function get_twisty_from_tbody(tbody) { return tbody.previousSibling.firstChild.firstChild.firstChild; } [% END %] [% onload = 'restore_all(); document.checkboxform.restore_indicator.checked = true' %] [% BLOCK viewurl %]attachment.cgi?id=[% id %][% END %] [% BLOCK editurl %][% PROCESS viewurl %]&action=edit[% END %] [% BLOCK diffurl %][% PROCESS viewurl %]&action=diff[% END %] [% IF headers %] [% h1 = BLOCK %] [% IF attachid %] Attachment #[% attachid %]: [% description FILTER html %] [% ELSE %] Diff Between #[% oldid %]: <a href="[% PROCESS diffurl id=oldid %]">[% old_desc FILTER html %]</a> and #[% newid %]: <a href="[% PROCESS diffurl id=newid %]">[% new_desc FILTER html %]</a> [% END %] for <a href="show_bug.cgi?id=[% bugid %]">[% terms.bug %] #[% bugid %]</a> [% END %] [% h2 = BLOCK %] [% bugsummary FILTER html %] [% END %] [% PROCESS global/header.html.tmpl %] [% ELSE %] <html> <head> <style type="text/css"> [% style %] </style> <script type="text/javascript" language="JavaScript"> <!-- [% javascript %] --> </script> </head> <body onload="[% onload FILTER html %]"> [% END %] [%# If we have attachid, we are in diff, otherwise we're in interdiff %] [% IF attachid %] [%# HEADER %] [% IF headers %] <a href="[% PROCESS viewurl id=attachid %]">View</a> | <a href="[% PROCESS editurl id=attachid %]">Edit</a> | <a href="[% PROCESS diffurl id=attachid %]&context=[% context FILTER html %]&collapsed=[% collapsed FILTER html %]&headers=[% headers FILTER html %]&format=raw">Raw Unified</a> [% END %] [% IF other_patches.size > 0 %] [% IF headers %] |[%END%] Differences between <form style="display: inline" action=""> <select name="oldid"> [% FOREACH patch = other_patches %] <option value="[% patch.id %]" [% IF patch.selected %] selected[% END %] >[% patch.desc FILTER html %]</option> [% END %] </select> and this patch <input type="submit" value="Diff"> <input type="hidden" name="action" value="interdiff"> <input type="hidden" name="newid" value="[% attachid %]"> <input type="hidden" name="headers" value="[% headers FILTER html %]"> </form> [% END %] <br> [% ELSE %] [% IF headers %] <a href="attachment.cgi?oldid=[% oldid %]&newid=[% newid %]&action=interdiff&format=raw">Raw Unified</a> | [% END %] [% END %] [%# Collapse / Expand %] <a href="#" onmouseover="lastStatus = window.status; window.status='Collapse All'; return true" onmouseout="window.status = lastStatus; return true" onclick="return collapse_all()">Collapse All</a> | <a href="#" onmouseover="lastStatus = window.status; window.status='Expand All'; return true" onmouseout="window.status = lastStatus; return true" onclick="return expand_all()">Expand All</a> [% IF do_context %] [%# only happens for normal viewing, not interdiff %] | <span style='font-weight: bold'>Context:</span> [% IF context == "patch" %] (<strong>Patch</strong> / [% ELSE %] (<a href="[% PROCESS diffurl id=attachid %]&headers=[% headers FILTER html %]">Patch</a> / [% END %] [% IF context == "file" %] <strong>File</strong> / [% ELSE %] <a href="[% PROCESS diffurl id=attachid %]&headers=[% headers FILTER html %]&context=file">File</a> / [% END %] [% IF context == "patch" || context == "file" %] [% context = 3 %] [% END %] [%# textbox for context %] <form style="display: inline" action=""><input type="hidden" name="action" value="diff"><input type="hidden" name="id" value="[% attachid %]"><input type="hidden" name="collapsed" value="[% collapsed FILTER html %]"><input type="hidden" name="headers" value="[% headers FILTER html %]"><input type="text" name="context" value="[% context FILTER html %]" size="3"></form>) [% END %] [% IF warning %] <h2 class="warning">Warning: [% IF warning == "interdiff1" %] this difference between two patches may show things in the wrong places due to a limitation in [% terms.Bugzilla %] when comparing patches with different sets of files. [% END %] [% IF warning == "interdiff2" %] this difference between two patches may be inaccurate due to a limitation in [%+ terms.Bugzilla %] when comparing patches made against different revisions. [% END %] </h2> [% ELSE %] <br><br> [% END %] [%# Restore Stuff %] <form name="checkboxform" action=""> <input type="checkbox" name="restore_indicator" style="display: none"> --- NEW FILE: choose.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): Gavin Shelley <bug...@ch...> #%] [% PROCESS global/variables.none.tmpl %] [% PROCESS global/header.html.tmpl title = "Locate attachment" %] <form method="get" action="attachment.cgi"> <p>Access an attachment by entering its ID into the form below:</p> <p>Attachment ID: <input name="id" size="6"> <button name="action" value="edit"> Edit </button> <button name="action" value="view">View</button> </p> </form> <form method="get" action="show_bug.cgi"> <p>Or, access it from the list of attachments in its associated [% terms.bug %] report:</p> <p>[% terms.Bug %] ID: <input name="id" size="6"> <input type="submit" name="action" value="View"> </p> </form> [% PROCESS global/footer.html.tmpl %] Index: updated.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/attachment/updated.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** updated.html.tmpl 28 Jun 2004 00:46:30 -0000 1.1 --- updated.html.tmpl 15 May 2005 15:04:53 -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 *************** *** 24,31 **** # bugid: integer. ID of the bug we are updating. # attachid: integer. ID of the attachment we just attached. - # mailresults: string. Who was mailed and who wasn't. #%] ! ! [% PROCESS global/header.html.tmpl title = "Changes Submitted" style = "th { text-align: left; }" --- 24,32 ---- # bugid: integer. ID of the bug we are updating. # attachid: integer. ID of the attachment we just attached. #%] ! ! [% PROCESS global/variables.none.tmpl %] ! ! [% PROCESS global/header.html.tmpl title = "Changes Submitted" style = "th { text-align: left; }" *************** *** 37,49 **** <tr> <td> ! <h2>Changes to <a href="attachment.cgi?id=[% attachid %]&action=edit">attachment [% attachid %]</a> ! of bug [% bugid %] submitted </h2> ! [% mailresults %] </td> <td> ! <a href="show_bug.cgi?id=[% bugid %]">Back to Bug #[% bugid %]</a> </td> </tr> --- 38,50 ---- <tr> <td> ! <h2>Changes to <a href="attachment.cgi?id=[% attachid %]&action=edit">attachment [% attachid %]</a> ! of [% terms.bug %] [%+ bugid %] submitted </h2> ! [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %] </td> <td> ! <a href="show_bug.cgi?id=[% bugid %]">Back to [% terms.Bug %] #[% bugid %]</a> </td> </tr> Index: create.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/attachment/create.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** create.html.tmpl 28 Jun 2004 00:46:30 -0000 1.1 --- create.html.tmpl 15 May 2005 15:04:53 -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,35 **** #%] [%# Define strings that will serve as the title and header of this page %] ! [% title = BLOCK %]Create New Attachment for Bug #[% bugid %][% END %] ! [% h1 = BLOCK %]Create New Attachment for <a href="show_bug.cgi?id=[% bugid %]">Bug #[% bugid %]</a>[% END %] [% h2 = BLOCK %][% bugsummary FILTER html %][% END %] ! [% PROCESS global/header.html.tmpl title = title h1 = h1 h2 = h2 style = " ! th { text-align: right; vertical-align: baseline; white-space: nowrap; } ! td { text-align: left; vertical-align: baseline; padding-bottom: 5px; } " onload="setContentTypeDisabledState();" --- 20,47 ---- #%] + [% PROCESS global/variables.none.tmpl %] + [%# Define strings that will serve as the title and header of this page %] ! [% title = BLOCK %]Create New Attachment for [% terms.Bug %] #[% bugid %][% END %] ! [% h1 = BLOCK %]Create New Attachment for ! [%+ GetBugLink(bugid, "$terms.Bug $bugid") %][% END %] [% h2 = BLOCK %][% bugsummary FILTER html %][% END %] ! [% PROCESS global/header.html.tmpl title = title h1 = h1 h2 = h2 style = " ! table.attachment_entry th { ! text-align: right; ! vertical-align: baseline; ! white-space: nowrap; ! } ! ! table.attachment_entry td { ! text-align: left; ! vertical-align: baseline; ! padding-bottom: 5px; ! } " onload="setContentTypeDisabledState();" *************** *** 39,44 **** <input type="hidden" name="bugid" value="[% bugid %]"> <input type="hidden" name="action" value="insert"> ! ! <table> <tr> <th>File:</th> --- 51,56 ---- <input type="hidden" name="bugid" value="[% bugid %]"> <input type="hidden" name="action" value="insert"> ! ! <table class="attachment_entry"> <tr> <th>File:</th> *************** *** 64,80 **** <td> <em>If the attachment is a patch, check the box below.</em><br> ! <input type="checkbox" name="ispatch" value="1" onchange="setContentTypeDisabledState();"> patch<br><br> <em>Otherwise, choose a method for determining the content type.</em><br> ! <input type="radio" name="contenttypemethod" value="autodetect"> ! auto-detect<br> ! <input type="radio" name="contenttypemethod" value="list"> ! select from list: <select name="contenttypeselection" onchange="this.form.contenttypemethod[1].checked = true;"> [% PROCESS "attachment/content-types.html.tmpl" %] </select><br> ! <input type="radio" name="contenttypemethod" value="manual"> ! enter manually: <input type="text" name="contenttypeentry" size="30" maxlength="200" onchange="if (this.value) this.form.contenttypemethod[2].checked = true;"> </td> </tr> <tr> <th>Obsoletes:</th> --- 76,111 ---- <td> <em>If the attachment is a patch, check the box below.</em><br> ! <input type="checkbox" id="ispatch" name="ispatch" value="1" ! onchange="setContentTypeDisabledState();"> ! <label for="ispatch">patch</label><br><br> <em>Otherwise, choose a method for determining the content type.</em><br> ! <input type="radio" id="autodetect" ! name="contenttypemethod" value="autodetect"> ! <label for="autodetect">auto-detect</label><br> ! <input type="radio" id="list" ! name="contenttypemethod" value="list"> ! <label for="list">select from list:</label> ! <select name="contenttypeselection" ! onchange="this.form.contenttypemethod[1].checked = true;"> [% PROCESS "attachment/content-types.html.tmpl" %] </select><br> ! <input type="radio" id="manual" ! name="contenttypemethod" value="manual"> ! <label for="manual">enter manually:</label> ! <input type="text" name="contenttypeentry" size="30" maxlength="200" ! onchange="if (this.value) this.form.contenttypemethod[2].checked = true;"> </td> </tr> + [% IF (Param("insidergroup") && UserInGroup(Param("insidergroup"))) %] + <tr> + <th>Privacy:</th> + <td> + <em>If the attachment is private, check the box below.</em><br> + <input type="checkbox" name="isprivate" id="isprivate" value="1"> + <label for="isprivate">Private</label> + </td> + </tr> + [% END %] <tr> <th>Obsoletes:</th> *************** *** 83,88 **** [% IF attachments.size %] [% FOREACH attachment = attachments %] ! <input type="checkbox" name="obsolete" value="[% attachment.id %]"> ! <a href="attachment.cgi?id=[% attachment.id %]&action=edit">[% attachment.id %]: [% attachment.description FILTER html %]</a><br> [% END %] [% ELSE %] --- 114,123 ---- [% IF attachments.size %] [% FOREACH attachment = attachments %] ! [% IF ((attachment.isprivate == 0) || (Param("insidergroup") ! && UserInGroup(Param("insidergroup")))) %] ! <input type="checkbox" id="[% attachment.id %]" ! name="obsolete" value="[% attachment.id %]"> ! <a href="attachment.cgi?id=[% attachment.id %]&action=edit">[% attachment.id %]: [% attachment.description FILTER html %]</a><br> ! [% END %] [% END %] [% ELSE %] *************** *** 91,98 **** </td> </tr> <tr> <th>Comment:</th> <td> ! <em>(optional) Add a comment about this attachment to the bug.</em><br> <textarea wrap="soft" name="comment" rows="6" cols="80"></textarea> </td> --- 126,145 ---- </td> </tr> + + [% IF (user.id != bugassignee_id) AND user.groups.editbugs %] + <tr> + <th>Reassignment:</th> + <td> + <em>If you want to assign this [% terms.bug %] to yourself, + check the box below.</em><br> + <input type="checkbox" id="takebug" name="takebug" value="1"> + <label for="takebug">take [% terms.bug %]</label> + </td> + </tr> + [% END %] <tr> <th>Comment:</th> <td> ! <em>(optional) Add a comment about this attachment to the [% terms.bug %].</em><br> <textarea wrap="soft" name="comment" rows="6" cols="80"></textarea> </td> *************** *** 108,117 **** <script language="JavaScript" type="text/javascript"> <!-- ! function setContentTypeDisabledState() { var entryform = document.entryform; var isdisabled = false; ! if (entryform.ispatch.checked) isdisabled = true; --- 155,164 ---- <script language="JavaScript" type="text/javascript"> <!-- ! function setContentTypeDisabledState() { var entryform = document.entryform; var isdisabled = false; ! if (entryform.ispatch.checked) isdisabled = true; Index: show-multiple.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/attachment/show-multiple.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** show-multiple.html.tmpl 28 Jun 2004 00:46:30 -0000 1.1 --- show-multiple.html.tmpl 15 May 2005 15:04:53 -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,33 **** #%] [% filtered_summary = bugsummary FILTER html %] ! [% PROCESS global/header.html.tmpl ! title = "View All Attachments for Bug #$bugid" ! h1 = "View All Attachments for <a href=\"show_bug.cgi?id=$bugid\">Bug #$bugid</a>" h2 = filtered_summary style = " ! th { text-align: right; vertical-align: top; } ! td { text-align: left; vertical-align: top; } ! td#info { text-align: right; vertical-align: top; } ! td#actions { text-align: right; vertical-align: bottom; } " %] --- 20,34 ---- #%] + [% PROCESS global/variables.none.tmpl %] [% filtered_summary = bugsummary FILTER html %] ! [% h1 = BLOCK %]View All Attachments for ! [%+ GetBugLink(bugid, "$terms.Bug $bugid") %][% END %] ! [% PROCESS global/header.html.tmpl ! title = "View All Attachments for $terms.Bug #$bugid" ! h1 = h1 h2 = filtered_summary style = " ! table.attachment_info th { text-align: right; vertical-align: top; } ! table.attachment_info td { text-align: left; vertical-align: top; } " %] *************** *** 38,44 **** <div align="center"> ! <table cellspacing="0" cellpadding="4" border="1" width="75%"> <tr> ! <td valign="top" bgcolor="#cccccc" colspan="5"> <big><b>Attachment #[% a.attachid %]</b></big> </td> --- 39,45 ---- <div align="center"> ! <table class="attachment_info" cellspacing="0" cellpadding="4" border="1" width="75%"> <tr> ! <td valign="top" bgcolor="#cccccc" colspan="6"> <big><b>Attachment #[% a.attachid %]</b></big> </td> *************** *** 46,54 **** <tr> <td valign="top"> ! [% IF a.isobsolete %] ! <strike>[% a.description FILTER html %]</strike> ! [% ELSE %] ! [% a.description FILTER html %] ! [% END %] </td> --- 47,51 ---- <tr> <td valign="top"> ! [% a.description FILTER html FILTER obsolete(a.isobsolete) %] </td> *************** *** 61,72 **** </td> ! <td valign="top">[% a.date %]</td> <td valign="top"> ! [% IF a.statuses.size == 0 %] ! <i>none</i> [% ELSE %] ! [% FOREACH s = a.statuses %] ! [% s FILTER html FILTER replace('\s', ' ') %]<br> [% END %] [% END %] --- 58,77 ---- </td> ! <td valign="top">[% a.date FILTER time %]</td> ! <td valign="top">[% a.datasize FILTER unitconvert %]</td> <td valign="top"> ! [% IF a.flags.size == 0 %] ! <i>no flags</i> [% ELSE %] ! [% FOREACH flag = a.flags %] ! [% IF flag.setter %] ! [% flag.setter.nick FILTER html %]: ! [% END %] ! [%+ flag.type.name FILTER html %][% flag.status %] ! [% IF flag.status == "?" && flag.requestee %] ! ([% flag.requestee.nick FILTER html %]) ! [% END %] ! [% ", " IF !loop.last %] [% END %] [% END %] *************** *** 74,78 **** <td valign="top"> ! <a href="attachment.cgi?id=[% a.attachid %]&action=edit">Edit</a> </td> </tr> --- 79,83 ---- <td valign="top"> ! <a href="attachment.cgi?id=[% a.attachid %]&action=edit">Edit</a> </td> </tr> *************** *** 87,91 **** <p><b> Attachment cannot be viewed because its MIME type is not text/*, image/*, or application/vnd.mozilla.*. ! <a href="attachment.cgi?id=[% a.attachid %]&action=view">Download the attachment instead</a>. </b></p> [% END %] --- 92,96 ---- <p><b> Attachment cannot be viewed because its MIME type is not text/*, image/*, or application/vnd.mozilla.*. ! <a href="attachment.cgi?id=[% a.attachid %]&action=view">Download the attachment instead</a>. </b></p> [% END %] Index: created.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/attachment/created.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** created.html.tmpl 28 Jun 2004 00:46:30 -0000 1.1 --- created.html.tmpl 15 May 2005 15:04:53 -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 *************** *** 27,34 **** # contenttypemethod: string. How we got the content type of the attachment. # Possible values: autodetect, list, manual. - # mailresults: string. who was mailed, and who wasn't. #%] ! ! [% PROCESS global/header.html.tmpl title = "Changes Submitted" style = "th { text-align: left; }" --- 27,35 ---- # contenttypemethod: string. How we got the content type of the attachment. # Possible values: autodetect, list, manual. #%] ! ! [% PROCESS global/variables.none.tmpl %] ! ! [% PROCESS global/header.html.tmpl title = "Changes Submitted" style = "th { text-align: left; }" *************** *** 39,53 **** <td> <h2> ! <a title="[% description FILTER html %]" href="attachment.cgi?id=[% attachid %]&action=edit">Attachment #[% attachid %]</a> ! to <a href="show_bug.cgi?id=[% bugid %]">Bug #[% bugid %]</a> Created </h2> ! [% mailresults %] [% IF contenttypemethod == 'autodetect' %] <p> ! <b>Note:</b> Bugzilla automatically detected the content type ! <em>[% contenttype %]</em> for this attachment. If this is ! incorrect, correct the value by <a href="attachment.cgi?id=[% attachid %]&action=edit">editing the attachment</a>. </p> --- 40,54 ---- <td> <h2> ! <a title="[% description FILTER html %]" href="attachment.cgi?id=[% attachid %]&action=edit">Attachment #[% attachid %]</a> ! to <a href="show_bug.cgi?id=[% bugid %]">[% terms.Bug %] #[% bugid %]</a> Created </h2> ! [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %] [% IF contenttypemethod == 'autodetect' %] <p> ! <b>Note:</b> [% terms.Bugzilla %] automatically detected the content type ! <em>[% contenttype %]</em> for this attachment. If this is ! incorrect, correct the value by <a href="attachment.cgi?id=[% attachid %]&action=edit">editing the attachment</a>. </p> *************** *** 55,59 **** </td> <td> ! <a href="show_bug.cgi?id=[% bugid %]">Go back to bug #[% bugid %]</a> </td> </tr> --- 56,60 ---- </td> <td> ! <a href="show_bug.cgi?id=[% bugid %]">Go back to [% terms.bug %] #[% bugid %]</a> </td> </tr> *************** *** 61,65 **** <p> ! <a href="attachment.cgi?bugid=[% bugid %]&action=enter">Create Another Attachment to Bug #[% bugid %]</a> </p> --- 62,67 ---- <p> ! <a href="attachment.cgi?bugid=[% bugid %]&action=enter">Create ! Another Attachment to [% terms.Bug %] #[% bugid %]</a> </p> |
|
From: Tim G. <xt...@us...> - 2005-05-15 15:05:32
|
Update of /cvsroot/openfirst/www/htdocs/bugzilla/account/email In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32743/account/email Modified Files: change-new.txt.tmpl change-old.txt.tmpl confirm.html.tmpl Log Message: Bring templates up to date for Bugzilla 2.18.1 Index: change-new.txt.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/account/email/change-new.txt.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** change-new.txt.tmpl 28 Jun 2004 00:49:09 -0000 1.1 --- change-new.txt.tmpl 15 May 2005 15:04:51 -0000 1.2 *************** *** 19,39 **** # Contributor(s): John Vandenberg <ze...@nu...> #%] [% expiration_ts = token_ts + (max_token_age * 86400) %] From: bugzilla-admin-daemon To: [% emailaddress %] ! Subject: Bugzilla Change Email Address Request ! Bugzilla has received a request to change the email address ! for the [% oldemailaddress %] account to your address. To confirm the change, visit the following link: ! [% Param('urlbase') %]token.cgi?a=cfmem&t=[% token FILTER url_quote %] If you are not the person who made this request, or you wish to cancel this request, visit the following link: ! [% Param('urlbase') %]token.cgi?a=cxlem&t=[% token FILTER url_quote %] ! If you do nothing, the request will lapse after ! [%- max_token_age %] days ([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]). --- 19,42 ---- # Contributor(s): John Vandenberg <ze...@nu...> #%] + + [% PROCESS global/variables.none.tmpl %] + [% expiration_ts = token_ts + (max_token_age * 86400) %] From: bugzilla-admin-daemon To: [% emailaddress %] ! Subject: [% terms.Bugzilla %] Change Email Address Request ! [%+ terms.Bugzilla %] has received a request to change the email address ! for the account [% oldemailaddress %] to your address. To confirm the change, visit the following link: ! [%+ Param('urlbase') %]token.cgi?t=[% token FILTER url_quote %]&a=cfmem If you are not the person who made this request, or you wish to cancel this request, visit the following link: ! [%+ Param('urlbase') %]token.cgi?t=[% token FILTER url_quote %]&a=cxlem ! If you do nothing, the request will lapse after [%+ max_token_age %] days ! (at precisely [%+ time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]). Index: confirm.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/account/email/confirm.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** confirm.html.tmpl 28 Jun 2004 00:49:09 -0000 1.1 --- confirm.html.tmpl 15 May 2005 15:04:51 -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 *************** *** 24,27 **** --- 24,28 ---- #%] + [% title = "Confirm Change Email" %] [% PROCESS global/header.html.tmpl %] *************** *** 36,43 **** <tr> <th align="right">Old Email Address:</th> ! <td><input type="input" name="email" size="36"></td> </tr> <tr> ! <th align="right"> </th> <td><input type="submit" value="Submit"></td> </tr> --- 37,44 ---- <tr> <th align="right">Old Email Address:</th> ! <td><input type="text" name="email" size="36"></td> </tr> <tr> ! <th align="right"> </th> <td><input type="submit" value="Submit"></td> </tr> Index: change-old.txt.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/account/email/change-old.txt.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** change-old.txt.tmpl 28 Jun 2004 00:49:09 -0000 1.1 --- change-old.txt.tmpl 15 May 2005 15:04:51 -0000 1.2 *************** *** 24,44 **** # token: string. The token associated with this change. #%] [% expiration_ts = token_ts + (max_token_age * 86400) %] From: bugzilla-admin-daemon To: [% emailaddress %] ! Subject: Bugzilla Change Email Address Request Importance: High X-MSMail-Priority: High X-Priority: 1 ! Bugzilla has received a request to change the email address ! for your account to [% newemailaddress %]. If you are not the person who made this request, or you wish to cancel this request, visit the following link: ! [% Param('urlbase') %]token.cgi?a=cxlem&t=[% token FILTER url_quote %] ! If you do nothing, and [% newemailaddress %] confirms this request, the ! change will be made permanent after ! [%- max_token_age %] days ([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]). --- 24,47 ---- # token: string. The token associated with this change. #%] + + [% PROCESS global/variables.none.tmpl %] + [% expiration_ts = token_ts + (max_token_age * 86400) %] From: bugzilla-admin-daemon To: [% emailaddress %] ! Subject: [% terms.Bugzilla %] Change Email Address Request Importance: High X-MSMail-Priority: High X-Priority: 1 ! [%+ terms.Bugzilla %] has received a request to change the email address ! for your account to [%+ newemailaddress %]. If you are not the person who made this request, or you wish to cancel this request, visit the following link: ! [%+ Param('urlbase') %]token.cgi?t=[% token FILTER url_quote %]&a=cxlem ! If you do nothing, and [%+ newemailaddress %] confirms this request, the ! change will be made permanent after [%+ max_token_age %] days (at precisely ! [%+ time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]). |
|
From: Tim G. <xt...@us...> - 2005-05-15 15:05:32
|
Update of /cvsroot/openfirst/www/htdocs/bugzilla/account/password In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32743/account/password Modified Files: forgotten-password.txt.tmpl set-forgotten-password.html.tmpl Log Message: Bring templates up to date for Bugzilla 2.18.1 Index: set-forgotten-password.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/account/password/set-forgotten-password.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** set-forgotten-password.html.tmpl 28 Jun 2004 00:50:08 -0000 1.1 --- set-forgotten-password.html.tmpl 15 May 2005 15:04:51 -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,23 **** --- 20,24 ---- #%] + [% title = "Change Password" %] [% PROCESS global/header.html.tmpl %] Index: forgotten-password.txt.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/account/password/forgotten-password.txt.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** forgotten-password.txt.tmpl 28 Jun 2004 00:50:08 -0000 1.1 --- forgotten-password.txt.tmpl 15 May 2005 15:04:51 -0000 1.2 *************** *** 19,38 **** # Contributor(s): John Vandenberg <ze...@nu...> #%] [% expiration_ts = token_ts + (max_token_age * 86400) %] From: bugzilla-admin-daemon To: [% emailaddress %] ! Subject: Bugzilla Change Password Request ! You (or someone impersonating you) has requested to change your Bugzilla ! password. To change your password, visit the following link: ! [%+ Param('urlbase') %]token.cgi?a=cfmpw&t=[% token FILTER url_quote %] If you are not the person who made this request, or you wish to cancel this request, visit the following link: ! [%+ Param('urlbase') %]token.cgi?a=cxlpw&t=[% token FILTER url_quote %] ! If you do nothing, the request will lapse after ! [%- max_token_age %] days ! ([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) -%]) or when you log in successfully. --- 19,41 ---- # Contributor(s): John Vandenberg <ze...@nu...> #%] + + [% PROCESS global/variables.none.tmpl %] + [% expiration_ts = token_ts + (max_token_age * 86400) %] From: bugzilla-admin-daemon To: [% emailaddress %] ! Subject: [% terms.Bugzilla %] Change Password Request ! You have (or someone impersonating you has) requested to change your ! [%+ terms.Bugzilla %] password. To complete the change, visit the following link: ! [%+ Param('urlbase') %]token.cgi?t=[% token FILTER url_quote %]&a=cfmpw If you are not the person who made this request, or you wish to cancel this request, visit the following link: ! [%+ Param('urlbase') %]token.cgi?t=[% token FILTER url_quote %]&a=cxlpw ! If you do nothing, the request will lapse after [%+ max_token_age +%] days (at ! precisely [%+ time2str("%H:%M on the %o of %B, %Y", expiration_ts) -%]) or when you ! log in successfully. |
|
From: Tim G. <xt...@us...> - 2005-05-15 15:05:08
|
Update of /cvsroot/openfirst/www/htdocs/bugzilla/bug/process In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32743/bug/process Modified Files: confirm-duplicate.html.tmpl midair.html.tmpl next.html.tmpl results.html.tmpl verify-new-product.html.tmpl Added Files: bugmail.html.tmpl header.html.tmpl Log Message: Bring templates up to date for Bugzilla 2.18.1 --- NEW FILE: bugmail.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): Bradley Baetz <bb...@st...> # J. Paul Reed <pr...@si...> #%] [%# INTERFACE: # mailing_bugid: string. ID of the bug this mail is concerning. # mailrecipients: hash. People involved in this change. Hash has up to five # elements: # changer: string. The login name of the user who made the # change. # # For bug changes where people need to be notified: # owner: string. The login name of the bug assignee. # reporter: string. The login name of the bug reporter. # qacontact: string. The login name of the bug's QA contact. # Optional. # cc: list of strings. The login names of those on the CC # list. #%] [% PROCESS global/variables.none.tmpl %] [% mail = SendBugMail(mailing_bugid, mailrecipients) %] [% PROCESS emails description = "Email sent to" names = mail.sent %] <br> [% PROCESS emails description = "Excluding" names = mail.excluded %] <br> <center> If you wish to tweak the kinds of mail [% terms.Bugzilla %] sends you, you can <a href="userprefs.cgi?tab=email">change your preferences</a>. </center> [%############################################################################%] [%# Block for a set of email addresses #%] [%############################################################################%] [% BLOCK emails %] <b>[% description FILTER html %]:</b> [% IF names.size > 0 %] [%+ FOREACH name = names %] [% name FILTER html %][% ", " UNLESS loop.last() %] [% END %] [% ELSE %] no one [% END %] [% END %] Index: next.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/process/next.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** next.html.tmpl 28 Jun 2004 00:55:12 -0000 1.1 --- next.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,32 **** [%# INTERFACE: ! # next_id : number; the ID of the next bug in the user's bug list. #%] <hr> <p> ! The next bug in your list is bug ! <a href="show_bug.cgi?id=[% next_id %]">[% next_id %]</a>: </p> --- 21,67 ---- [%# INTERFACE: ! # bug : Bug object; the next bug to show #%] + [% PROCESS global/variables.none.tmpl %] + <hr> <p> ! The next [% terms.bug %] in your list is [% terms.bug %] ! <a href="show_bug.cgi?id=[% bug.bug_id %]">[% bug.bug_id %]</a>: </p> + <hr> + <table border="0" cellspacing="0" width="100%"> + <tr> + <td valign="top" align="left" nowrap="nowrap"> + <font size="+1"> + <b>[%+ terms.Bugzilla %] [%+ terms.Bug %] [%+ bug.bug_id %]</b> + </font> + </td> + <td valign="middle" align="left"> + + </td> + <td valign="middle" align="left"> + [% bug.short_desc FILTER html %] + </td> + <td valign="middle" align="right"> + Last modified: [% bug.delta_ts FILTER time %] + </td> + </tr> + </table> + + [% PROCESS bug/navigate.html.tmpl %] + + <hr> + + [% PROCESS "bug/edit.html.tmpl" %] + + <hr> + + [% PROCESS bug/navigate.html.tmpl %] + + <br> + + [% PROCESS global/footer.html.tmpl %] --- NEW FILE: header.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...> #%] [%# INTERFACE: # As global/header.html.tmpl. #%] [% PROCESS global/variables.none.tmpl %] [% IF title_tag == "bug_processed" %] [% title = "$terms.Bug processed" %] [% ELSIF title_tag == "mid_air" %] [% title = "Mid-air collision!" %] [% END %] [% PROCESS global/header.html.tmpl %] Index: verify-new-product.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/process/verify-new-product.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** verify-new-product.html.tmpl 28 Jun 2004 00:55:12 -0000 1.1 --- verify-new-product.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 *************** *** 23,27 **** # form: hash; the form values submitted to the script # mform: hash; the form multi-values submitted to the script ! # verify_fields: boolean; whether or not to verify # the version, component, and target milestone fields # versions: array; versions for the new product. --- 23,27 ---- # form: hash; the form values submitted to the script # mform: hash; the form multi-values submitted to the script ! # verify_fields: boolean; whether or not to verify # the version, component, and target milestone fields # versions: array; versions for the new product. *************** *** 32,42 **** # verify_bug_group: boolean; whether or not to ask the user # if they want to add the bug to its new product's group ! # use_target_milestone: boolean; whether or not to use # the target milestone field #%] ! <form action="process_bug.cgi" method="post"> ! [% PROCESS "global/hidden-fields.html.tmpl" exclude=(verify_fields ? "^version|component|target_milestone$" : "") %] --- 32,46 ---- # verify_bug_group: boolean; whether or not to ask the user # if they want to add the bug to its new product's group ! # use_target_milestone: boolean; whether or not to use # the target milestone field #%] ! ! [% PROCESS global/variables.none.tmpl %] ! ! [% PROCESS global/header.html.tmpl %] ! <form action="process_bug.cgi" method="post"> ! [% PROCESS "global/hidden-fields.html.tmpl" exclude=(verify_fields ? "^version|component|target_milestone$" : "") %] *************** *** 47,56 **** <p> [% IF use_target_milestone %] ! You are moving the bug(s) to the product <b>[% form.product %]</b>, and the version, component, and/or target milestone fields are no longer correct. Please set the correct version, component, and target milestone now: [% ELSE %] ! You are moving the bug(s) to the product <b>[% form.product %]</b>, ! and the version and component fields are no longer correct. Please set the correct version and component now: [% END %] --- 51,62 ---- <p> [% IF use_target_milestone %] ! You are moving the [% terms.bug %](s) to the product ! <b>[% form.product FILTER html %]</b>, and the version, component, and/or target milestone fields are no longer correct. Please set the correct version, component, and target milestone now: [% ELSE %] ! You are moving the [% terms.bug %](s) to the product ! <b>[% form.product FILTER html %]</b>, ! and the version and component fields are no longer correct. Please set the correct version and component now: [% END %] *************** *** 77,86 **** [% END %] ! [% IF verify_bug_group %] ! <h3>Verify Bug Group</h3> <p> ! Do you want to add the bug to its new product's group (if any)? </p> --- 83,92 ---- [% END %] ! [% IF verify_bug_group %] ! <h3>Verify [% terms.Bug %] Group</h3> <p> ! Do you want to add the [% terms.bug %] to its new product's default groups (if any)? </p> *************** *** 89,93 **** <input type="radio" name="addtonewgroup" value="yes"><b>yes</b><br> <input type="radio" name="addtonewgroup" value="yesifinold" checked="checked"> ! <b>yes, but only if the bug was in its old product's group</b><br> </p> [% END %] --- 95,99 ---- <input type="radio" name="addtonewgroup" value="yes"><b>yes</b><br> <input type="radio" name="addtonewgroup" value="yesifinold" checked="checked"> ! <b>yes, but only if the [% terms.bug %] was in any of its old product's default groups</b><br> </p> [% END %] *************** *** 97,101 **** </form> <hr> ! <a href="query.cgi">Cancel and Return to the Query Page</a> [% PROCESS global/footer.html.tmpl %] --- 103,107 ---- </form> <hr> ! <a href="query.cgi">Cancel and Return to the Search Page</a> [% PROCESS global/footer.html.tmpl %] Index: results.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/process/results.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** results.html.tmpl 28 Jun 2004 00:55:12 -0000 1.1 --- results.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 *************** *** 26,41 **** # is changed, "dupe" when a duplication notation is added to a bug, # and "dep" when a bug is checked for changes to its dependencies. #%] [% DEFAULT type="bug" %] ! [% title = { ! 'bug' => "Changes submitted for bug $id" , ! 'dupe' => "Duplicate notation added to bug $id" , ! 'dep' => "Checking for dependency changes on bug $id" , ! 'votes' => "Bug $id confirmed by number of votes" , ! 'created' => "Bug $id has been added to the database" , ! } %] --- 26,49 ---- # is changed, "dupe" when a duplication notation is added to a bug, # and "dep" when a bug is checked for changes to its dependencies. + # + # mailrecipients: hash; BugMail recipient params. Optional. #%] + [% PROCESS global/variables.none.tmpl %] + + [% UNLESS header_done %] + [% PROCESS bug/process/header.html.tmpl %] + [% END %] + [% DEFAULT type="bug" %] ! [% title = { ! 'bug' => "Changes submitted for $terms.bug $id" , ! 'dupe' => "Duplicate notation added to $terms.bug $id" , ! 'dep' => "Checking for dependency changes on $terms.bug $id" , ! 'votes' => "$terms.Bug $id confirmed by number of votes" , ! 'created' => "$terms.Bug $id has been added to the database" , ! } %] *************** *** 44,51 **** <td> <h2>[% title.$type %]</h2> ! [% mail %] </td> <td> ! <a href="show_bug.cgi?id=[% id %]">Back To BUG# [% id %]</a> </td> </tr> --- 52,59 ---- <td> <h2>[% title.$type %]</h2> ! [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = id %] </td> <td> ! <a href="show_bug.cgi?id=[% id %]">Back To [% terms.Bug %]# [% id %]</a> </td> </tr> Index: midair.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/process/midair.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** midair.html.tmpl 28 Jun 2004 00:55:12 -0000 1.1 --- midair.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 *************** *** 34,42 **** # bug_id: number; the ID of the bug being changed. #%] ! <h1>Mid-air collision detected!</h1> <p> ! Someone else has made changes to this bug at the same time you were trying to. The changes made were: </p> --- 34,48 ---- # bug_id: number; the ID of the bug being changed. #%] ! ! [% PROCESS global/variables.none.tmpl %] ! ! [% UNLESS header_done %] ! [% PROCESS bug/process/header.html.tmpl %] ! [% END %] ! <h1>Mid-air collision detected!</h1> <p> ! Someone else has made changes to this [% terms.bug %] at the same time you were trying to. The changes made were: </p> *************** *** 45,49 **** [% PROCESS "bug/activity/table.html.tmpl" incomplete_data=0 %] </p> ! [% IF comments.size > start_at %] <p> --- 51,55 ---- [% PROCESS "bug/activity/table.html.tmpl" incomplete_data=0 %] </p> ! [% IF comments.size > start_at %] <p> *************** *** 61,66 **** <ul> <li> ! <form method="post"> ! [% PROCESS "global/hidden-fields.html.tmpl" exclude="^(Bugzilla|LDAP)_(login|password)$" %] <input type="submit" value="Submit my changes anyway"> This will cause all of the above changes to be overwritten --- 67,72 ---- <ul> <li> ! <form method="post" action="process_bug.cgi"> ! [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %] <input type="submit" value="Submit my changes anyway"> This will cause all of the above changes to be overwritten *************** *** 69,74 **** </li> <li> ! <a href="show_bug.cgi?id=[% bug_id %]">Throw away my changes, ! and revisit bug [% bug_id %]</a> </li> </ul> --- 75,80 ---- </li> <li> ! <a href="show_bug.cgi?id=[% bug_id %]">Throw away my changes, ! and revisit [% terms.bug %] [%+ bug_id %]</a> </li> </ul> Index: confirm-duplicate.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/process/confirm-duplicate.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** confirm-duplicate.html.tmpl 28 Jun 2004 00:55:12 -0000 1.1 --- confirm-duplicate.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 *************** *** 27,45 **** # duplicate_bug_id: number; the bug number for the bug # being duped ! # cclist_accessible: boolean; whether or not users on the cc: list # of the original bug can access that bug. #%] ! [% PROCESS global/header.html.tmpl title="Duplicate Warning" %] ! <p> ! When marking a bug as a duplicate, the reporter of the duplicate ! is normally added to the CC list of the original. The permissions ! on bug [% original_bug_id %] (the original) are currently set such that the reporter would not normally be able to see it. </p> <p> ! <b>Adding the reporter to the CC list of bug [% original_bug_id %] [% IF cclist_accessible %] will immediately --- 27,48 ---- # duplicate_bug_id: number; the bug number for the bug # being duped ! # cclist_accessible: boolean; whether or not users on the cc: list # of the original bug can access that bug. #%] ! ! [% PROCESS global/variables.none.tmpl %] ! [% PROCESS global/header.html.tmpl title="Duplicate Warning" %] ! <p> ! When marking [% terms.abug %] as a duplicate, the reporter of the duplicate ! is normally added to the CC list of the original. The permissions ! on [% terms.bug %] [%+ original_bug_id %] (the original) are currently set such that the reporter would not normally be able to see it. </p> <p> ! <b>Adding the reporter to the CC list of [% terms.bug %] ! [%+ original_bug_id %] [% IF cclist_accessible %] will immediately *************** *** 47,69 **** might, in the future, [% END %] ! allow him/her access to view this bug.</b> Do you wish to do this? </p> - - <form method="post"> ! [% PROCESS "global/hidden-fields.html.tmpl" exclude="^(Bugzilla|LDAP)_(login|password)$" %] <p> ! <input type="radio" name="confirm_add_duplicate" value="1"> ! Yes, add the reporter to CC list on bug [% original_bug_id %] </p> <p> ! <input type="radio" name="confirm_add_duplicate" value="0" checked="checked"> ! No, do not add the reporter to CC list on bug [% original_bug_id %] </p> <p> ! <a href="show_bug.cgi?id=[% duplicate_bug_id %]">Throw away my changes, ! and revisit bug [% duplicate_bug_id %]</a> <p> <input type="submit" value="Submit"> --- 50,73 ---- might, in the future, [% END %] ! allow him/her access to view this [% terms.bug %].</b> Do you wish to do this? </p> ! <form method="post" action="process_bug.cgi"> ! ! [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %] <p> ! <input type="radio" name="confirm_add_duplicate" value="1"> ! Yes, add the reporter to CC list on [% terms.bug %] [%+ original_bug_id %] </p> <p> ! <input type="radio" name="confirm_add_duplicate" value="0" checked="checked"> ! No, do not add the reporter to CC list on [% terms.bug %] ! [%+ original_bug_id %] </p> <p> ! <a href="show_bug.cgi?id=[% duplicate_bug_id %]">Throw away my changes, ! and revisit [% terms.bug %] [%+ duplicate_bug_id %]</a> <p> <input type="submit" value="Submit"> |
Update of /cvsroot/openfirst/www/htdocs/bugzilla/bug/create In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32743/bug/create Modified Files: create.html.tmpl created.html.tmpl make-template.html.tmpl user-message.html.tmpl Added Files: comment-guided.txt.tmpl create-guided.html.tmpl Log Message: Bring templates up to date for Bugzilla 2.18.1 --- NEW FILE: create-guided.html.tmpl --- [%# 1....@mo... %] [%# 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...> # Christine Begle <cb...@mo...> #%] [%# INTERFACE: # This template has the same interface as create.html.tmpl #%] [% PROCESS global/variables.none.tmpl %] [% USE Bugzilla %] [% cgi = Bugzilla.cgi %] [% PROCESS global/header.html.tmpl title = "Enter $terms.ABug" onload = "PutDescription()" %] <p> <font color="red"> This is a template used on mozilla.org - it, along with the comment-guided.txt.tmpl template, are included as a demo of what it's possible to do with custom templates in general, and custom [% terms.bug %] entry templates in particular. You will need to alter the text of this template if you want to use it on your [% terms.Bugzilla %] installation. </font> </p> [% tablecolour = "#FFFFCC" %] [%# This script displays the descriptions for selected components. %] <script type="text/javascript"> var descriptions = [ [% FOREACH c = component_ %] '[% c.description FILTER js %]', [% END %] ]; function PutDescription() { if ((document.getElementById) && (document.body.innerHTML)) { var componentIndex = document.getElementById('component').selectedIndex; if (componentIndex != -1) { var description = document.getElementById('description'); description.innerHTML = descriptions[componentIndex]; } } } </script> [%# Browser sniff to try and reduce the incidence of 4.x and NS 6/7 bugs %] [% IF cgi.user_agent("Mozilla/4") AND NOT cgi.user_agent("compatible") %] <div style="background-color: lightgrey; border: 1px solid black; padding: 2px"> <font color="#990000"> <b> Note: This is a tool for reporting [% terms.bugs %] in software from mozilla.org. Use Netscape's <a href="http://help.netscape.com/forms/bug-client.html">[% terms.bug %] reporting form</a> to report [% terms.bugs %] with Netscape products like Navigator 4.x. Netscape products have a blue and black N in the top right hand corner. </b> </font> </div> [% END %] [% IF cgi.user_agent('Netscape(\d)') %] [% matches = cgi.user_agent().match('Netscape(\d)') %] <div style="background-color: lightgrey; border: 1px solid black; padding: 2px"> <font color="#990000"> <b> You are using Netscape [% matches.0 %]. Report [% terms.bugs %] with this browser to the <a href="http://home.netscape.com/browsers/[% matches.0 %]/feedback/index.html"> Netscape [% matches.0 %] Feedback Center.</a> </b> </font> This form is only for reporting [% terms.bugs %] in the Mozilla web browser and other products from mozilla.org. To report [% terms.abug %] you find in Netscape [% matches.0 %] with this form, you must reproduce it first in a recent build of <a href="http://ftp.mozilla.org/pub/mozilla.org/mozilla/nightly/latest/">Mozilla</a>, <a href="http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/">Firefox</a> or <a href="http://ftp.mozilla.org/pub/mozilla.org/camino/nightly/latest/">Camino</a> to make sure the problem hasn't been fixed already. </div> [% END %] <p> This form prompts you for the information required to file a good [% terms.bug %] report (or enhancement request.) It may seem lengthy, but developers need all this information to understand and reproduce the [% terms.bug %], which is the first step towards fixing it. Please note that <strong>we do not accept [% terms.bug %] reports by email</strong> - please do not email developers or mozilla.org staff with [% terms.bug %] reports. <font color="red">Also, please do not file [% terms.bugs %] on browser/email software older than two weeks - first, download a newer build of <a href="http://ftp.mozilla.org/pub/mozilla.org/mozilla/nightly/latest/">Mozilla</a>, <a href="http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/">Firefox</a>, <a href="http://ftp.mozilla.org/pub/mozilla.org/camino/nightly/latest/">Camino</a> or <a href="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/">Thunderbird</a> and check that the problem is still present. </font> </p> <a name="step1"></a> <h3>Step 1 - search for your [% terms.bug %]</h3> <p> Please see if your [% terms.bug %] has already been reported. <font color="red">Please don't skip this step.</font> 50% of the [% terms.bugs %] filed in [%+ terms.Bugzilla %] are duplicates, and this wastes a lot of our QA engineers' time. </p> [%# Stop NS 4.x and all v.3 browsers from getting <iframe> code %] [% IF (cgi.user_agent("Mozilla/4") AND NOT cgi.user_agent("compatible")) OR (cgi.user_agent("Mozilla/[123]")) %] <p> Visit the <a href="duplicates.cgi">most-frequently-reported [% terms.bugs %] page</a> and see if your [% terms.bug %] is there. If not, go to the <a href="query.cgi?format=modern">search page</a> and search [% terms.Bugzilla %] by entering two or three of the main words having to do with your [% terms.bug %] in the top box. For example: <tt><b>pop3 mail</b></tt> or <tt><b>copy paste</b></tt>. </p> [% ELSE %] <p> Check the list of most-frequently-reported [% terms.bugs %] below. If your [% terms.bug %] isn't there, search [% terms.Bugzilla %] by entering two or three of the main words having to do with your [% terms.bug %] in this box. For example: <tt><b>pop3 mail</b></tt> or <tt><b>copy paste</b></tt>. </p> <form action="buglist.cgi" method="get" target="somebugs"> <input type="hidden" name="format" value="simple"> <input type="hidden" name="order" value="relevance desc"> <input type="hidden" name="bug_status" value="__open__"> <input type="hidden" name="product" value="[% product FILTER html %]"> <input type="text" name="content" size="40"> <input type="submit" value="Search"> </form> <iframe name="somebugs" width="100%" height="80%" style="border: 2px black solid" src="duplicates.cgi?product=[% product FILTER uri %]&format=simple"> </iframe> [% END %] <p> Look through the search results. If you get the <tt><b>Zarro Boogs</b></tt> message, [% terms.Bugzilla %] found no [% terms.bugs %] that match. Check for typos, or add fewer or different keywords. </p> <p> If you find [% terms.abug %] that looks the same as yours, you can add useful comments to that [% terms.bug %], but please don't open a new one. Please don't add comments like "please fix this [% terms.bug %]" - this tends to annoy engineers and slow, rather than speed, the fixing of it. </p> <p> If you find [% terms.bugs %] similar to yours, read them and note which component they are in. You should file your [% terms.bug %] in that same component. </p> <a name="step2"></a> <h3>Step 2 - give information</h3> <p> If you're pretty certain that your [% terms.bug %] isn't in there already, then please try to complete this form as accurately as you can. The more you can tell us, the better our chance of being able to understand and reproduce your [% terms.bug %]. </p> <form method="post" action="post_bug.cgi"> <input type="hidden" name="format" value="guided"> <input type="hidden" name="assigned_to" value=""> <input type="hidden" name="priority" value="[% default.priority FILTER html %]"> <input type="hidden" name="version" value="[% default.version FILTER html %]"> <table valign="top" cellpadding="5" cellspacing="5" border="0"> <tr bgcolor="[% tablecolour %]"> <td align="right" valign="middle"> <b>Product</b> </td> <td valign="top"> <input type="hidden" name="product" value="[% product FILTER html %]"> [% product FILTER html %] </td> </tr> <tr> <td align="right" valign="middle"> <b>Component</b> </td> <td valign="top"> <p> The area where the problem occurs. To pick the right component, you could use the same one as similar [% terms.bugs %] you found in your search, or read the full list of <a href="describecomponents.cgi?product= [% product FILTER url_quote %]">component descriptions</a> if you need more help. </p> <table border="0" cellpadding="0" cellspacing="0"> <tr> <td valign="top"> <select name="component" id="component" size="5" onchange="PutDescription()"> [% FOREACH c = component_ %] <option value="[% c.name FILTER html %]" [% " selected=\"selected\"" IF c == default.component_ %]> [% c.name FILTER html %] </option> [% END %] </select> </td> <td valign="top" width="100%"> <div id="description" style="color: green; margin-left: 10px; height: 5em; overflow: auto;"> <script type="text/javascript" language="JavaScript"> if ((document.getElementById) && (document.body.innerHTML)) { document.write("\ Select a component to see its description here."); } </script> </div> </td> </tr> </table> </td> </tr> [%# We override rep_platform and op_sys for simplicity. The values chosen are based on which are most common in the b.m.o database %] [% rep_platform = [ "PC", "Macintosh", "All", "Other" ] %] <tr bgcolor="[% tablecolour %]"> <td align="right" valign="middle"> <b>Hardware Platform</b> </td> <td valign="top"> [% PROCESS select sel = 'rep_platform' %] </td> </tr> [% op_sys = [ "Windows 98", "Windows NT", "Windows 2000", "Windows XP", "Mac System 9.x", "MacOS X", "Linux", "All", "other" ] %] <tr> <td align="right" valign="middle"> <b>Operating System</b> </td> <td valign="top"> [% PROCESS select sel = 'op_sys' %] </td> </tr> [% matches = cgi.user_agent('Gecko/(\d+)') %] [% buildid = cgi.user_agent() IF matches %] <tr bgcolor="[% tablecolour %]"> <td align="right" valign="middle"> <b>Build Identifier<br>(User Agent)</b> </td> <td valign="top"> <p> If reporting [% terms.abug %] in Mozilla, this is the line beginning <tt>"Mozilla/5.0"</tt> in <tt>Help | About Mozilla</tt>. It identifies exactly the version of Mozilla you were using. If you are using the problem copy of Mozilla, this will be filled in correctly for you already. If Mozilla won't start, just enter the URL of the directory you downloaded it from. </p> <input type="text" size="80" name="buildid" value="[% buildid %]"> </td> </tr> <tr> <td align="right" valign="middle"> <b>URL</b> </td> <td valign="top"> <p> URL that demonstrates the problem you are seeing (optional.) <b>IMPORTANT</b>: If you are filing [% terms.abug %] about a broken web page, please read the <a href="http://www.mozilla.org/docs/web-developer/faq.html">Mozilla Web Developer FAQ</a>, which explains how we handle old or badly-coded web pages. </p> <input type="text" size="80" name="bug_file_loc" value="http://"> </td> </tr> <tr bgcolor="[% tablecolour %]"> <td align="right" valign="middle"> <b>Summary</b> </td> <td valign="top"> <p> A sentence which summarises the problem. Please be descriptive and use lots of keywords. </p> <p> <tt> <font color="#990000">Bad example</font>: mail crashed </tt> <br> <tt> <font color="#009900">Good example</font>: crash if I close the mail window while checking for new POP mail </tt> </p> <input type="text" size="80" name="short_desc" id="short_desc"> </td> </tr> <tr> <td align="right" valign="middle"> <b>Details</b> </td> <td valign="top"> <p> Expand on the Summary. Please be as specific as possible about what is wrong. </p> <p> <tt> <font color="#990000">Bad example</font>: This page looks wrong in Mozilla. Other browsers display it correctly. You suck! </tt> <br> <tt> <font color="#009900">Good example</font>: In the page at http://www.foo.com/, text in the first column should be fully justified -- text should be aligned with both the left and right margins. In Mozilla, the text is only left-justified. </tt> </p> <textarea rows="6" cols="80" name="comment" wrap="hard"></textarea> </td> </tr> <tr bgcolor="[% tablecolour %]"> <td align="right" valign="middle"> <b>Reproducibility</b> </td> <td valign="top"> <p> How often can you reproduce the problem? </p> <select name="reproducible"> <option name="AlwaysReproducible" value="Always"> Every time. </option> <option name="Sometimes" value="Sometimes"> Sometimes, but not always. </option> <option name="DidntTry" value="Didn't try"> Haven't tried to reproduce it. </option> <option name="NotReproducible" value="Couldn't Reproduce"> Tried, but couldn't reproduce it. </option> </select> </td> </tr> <tr> <td align="right" valign="middle"> <b>Steps to Reproduce</b> </td> <td valign="top"> <p> Describe how to reproduce the problem, step by step. Include any special setup steps. </p> <textarea rows="4" cols="80" name="reproduce_steps" wrap="hard"> 1. 2. 3. </textarea> </td> </tr> <tr bgcolor="[% tablecolour %]"> <td valign="middle" align="right"> <b>Actual Results</b> </td> <td valign="top"> <p> What happened after you performed the steps above? </p> <textarea rows="4" cols="80" name="actual_results" wrap="hard"></textarea> </td> </tr> <tr> <td valign="middle" align="right"> <b>Expected Results</b> </td> <td valign="top"> <p> What should the software have done instead? </p> <textarea rows="4" cols="80" name="expected_results" wrap="hard"></textarea> </td> </tr> <tr bgcolor="[% tablecolour %]"> <td valign="middle" align="right"> <b>Additional Information</b> </td> <td valign="top"> <p> Add any additional information you feel may be relevant to this [% terms.bug %], such as the <b>theme</b> you were using (does the [% terms.bug %] still occur with the default theme?), a <b>Talkback crash ID</b>, or special information about <b>your computer's configuration</b>. Any information longer than a few lines, such as a <b>stack trace</b> or <b>HTML testcase</b>, should be added using the "Create a new Attachment" link on the [% terms.bug %], after it is filed. If you believe that it's relevant, please also include your build configuration, obtained by typing <tt>about:buildconfig</tt> into your URL bar. <br> <br> If you are reporting a crash, note the module in which the software crashed (e.g., <tt>Application Violation in gkhtml.dll</tt>). </p> <textarea rows="8" cols="80" name="additional_info" wrap="hard"></textarea> </td> </tr> <tr> <td valign="middle" align="right"> <b>Severity</b> </td> <td valign="top"> <p> How serious the problem is. Also, if your [% terms.bug %] is a request for a new feature or enhancement, say so here. </p> <select name="bug_severity"> <option name="blocker" value="blocker"> Blocker: This [% terms.bug %] prevents Mozilla developers from testing or developing the software. </option> <option name="critical" value="critical"> Critical: The software crashes, hangs, or causes you to lose data. </option> <option name="major" value="major"> Major: A major feature is broken. </option> <option name="normal" value="normal" selected="selected"> Normal: It's [% terms.abug %] that should be fixed. </option> <option name="minor" value="minor"> Minor: Minor loss of function, and there's an easy workaround. </option> <option name="trivial" value="trivial"> Trivial: A cosmetic problem, such as a misspelled word or misaligned text. </option> <option name="enhancement" value="enhancement"> Enhancement: Request for new feature or enhancement. </option> </select> </td> </tr> </table> <a name="step3"></a> <h3>Step 3 - submit the [% terms.bug %]</h3> <p> <input type="submit" value=" Submit [% terms.Bug %] Report " onclick="if (this.form.comment.value == '') { alert('Please enter some details about this [% terms.bug %].'); this.form.comment.focus(); return false; } return true;"> </p> <p> That's it! Thanks very much. You'll be notified by email about any progress that is made on fixing your [% terms.bug %]. </p> </form> [% PROCESS global/footer.html.tmpl %] [%############################################################################%] [%# Block for SELECT fields #%] [%############################################################################%] [% BLOCK select %] <select name="[% sel %]"> [%- IF default.$sel %] <option value="[% default.$sel FILTER html %]" selected="selected"> [% default.$sel FILTER html -%] </option> [% END %] [%- FOREACH x = $sel %] [% NEXT IF x == default.$sel %] <option value="[% x FILTER html %]"> [% x FILTER html -%] </option> [%- END %] </select> [% END %] --- NEW FILE: comment-guided.txt.tmpl --- [%# 1....@mo... %] [%# 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...> #%] [%# INTERFACE: # form: hash. This is the $::FORM variable from a bug submission (i.e. the # fields on a template from enter_bug.cgi.) It can be used to pull out # various custom fields and format an initial Description entry from them. #%] [% USE Bugzilla %] User-Agent: [%+ Bugzilla.cgi.user_agent() %] Build Identifier: [%+ form.buildid %] [%+ form.comment IF form.comment %] [%+ IF form.reproducible != "Choose one..." -%] Reproducible: [%+ form.reproducible %] [% END -%] [%# I can't make TT check for "1.\n2.\n3." so this is not conditional. -%] Steps to Reproduce: [%+ form.reproduce_steps %] [% IF form.actual_results -%] Actual Results: [%+ form.actual_results %] [% END %] [% IF form.expected_results %] Expected Results: [%+ form.expected_results %] [% END %] [%+ form.additional_info %] Index: create.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/create/create.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** create.html.tmpl 28 Jun 2004 00:54:11 -0000 1.1 --- create.html.tmpl 15 May 2005 15:04:53 -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,30 **** # # Contributor(s): Gervase Markham <ge...@ge...> ! # Ville Skyttä <vil...@ik...> #%] [% PROCESS global/header.html.tmpl ! title = "Enter Bug" ! h2 = "This page lets you enter a new bug into Bugzilla." %] ! <form method="post" action="post_bug.cgi"> <input type="hidden" name="product" value="[% product FILTER html %]"> --- 18,73 ---- # # Contributor(s): Gervase Markham <ge...@ge...> ! # Ville Skyttä <vil...@ik...> ! # Shane H. W. Travis <tr...@se...> #%] + [% PROCESS global/variables.none.tmpl %] + [% PROCESS global/header.html.tmpl ! title = "Enter $terms.Bug" ! h2 = "This page lets you enter a new $terms.bug into ${terms.Bugzilla}." ! onload="set_assign_to();" %] + [% USE Bugzilla %] ! <script type="text/javascript" language="JavaScript"> ! <!-- ! ! var default_owners = new Array([% component_.size %]); ! var components = new Array([% component_.size %]); ! [% count = 0 %] ! [%- FOREACH c = component_ %] ! components[[% count %]] = "[% c.name FILTER js %]"; ! default_owners[[% count %]] = "[% c.default_login FILTER js %]"; ! [% count = count + 1 %] ! [%- END %] ! var last_default_owner; ! function set_assign_to() { ! // Based on the selected component, fill the "Assign To:" field ! // with the default component owner. ! var form = document.Create; ! var assigned_to = form.assigned_to.value; ! var index = -1; ! if (form.component.type == 'select-one') { ! index = form.component.selectedIndex; ! } else if (form.component.type == 'hidden') { ! // Assume there is only one component in the list ! index = 0; ! } ! if (index != -1) { ! var owner = default_owners[index]; ! var component = components[index]; ! if (assigned_to == last_default_owner ! || assigned_to == owner ! || assigned_to == '') { ! form.assigned_to.value = owner; ! last_default_owner = owner; ! } ! } ! } ! --> ! </script> ! ! <form name="Create" id="Create" method="post" action="post_bug.cgi"> <input type="hidden" name="product" value="[% product FILTER html %]"> *************** *** 44,48 **** </td> </tr> ! <tr> <td><br></td> --- 87,91 ---- </td> </tr> ! <tr> <td><br></td> *************** *** 51,60 **** <tr> <td align="right" valign="top"><strong>Reporter:</strong></td> ! <td valign="top">[% reporter FILTER html %]</td> ! <td align="right" valign="top"><strong>Product:</strong></td> <td valign="top">[% product FILTER html %]</td> </tr> ! [%# We can't use the select block in these two cases for various reasons. %] <tr> --- 94,103 ---- <tr> <td align="right" valign="top"><strong>Reporter:</strong></td> ! <td valign="top">[% Bugzilla.user.login FILTER html %]</td> ! <td align="right" valign="top"><strong>Product:</strong></td> <td valign="top">[% product FILTER html %]</td> </tr> ! [%# We can't use the select block in these two cases for various reasons. %] <tr> *************** *** 70,75 **** [%- END %] </select> ! </td> ! <td align="right" valign="top"> <strong> --- 113,118 ---- [%- END %] </select> ! </td> ! <td align="right" valign="top"> <strong> *************** *** 79,83 **** </td> <td> ! <select name="component" size="5"> [%- FOREACH c = component_ %] <option value="[% c.name FILTER html %]" --- 122,126 ---- </td> <td> ! <select name="component" onchange="set_assign_to();" size="5"> [%- FOREACH c = component_ %] <option value="[% c.name FILTER html %]" *************** *** 87,119 **** [%- END %] </select> ! </td> </tr> ! <tr> <td> </td> <td colspan="3"></td> </tr> ! <tr> [% sel = { description => 'Platform', name => 'rep_platform' } %] [% INCLUDE select %] ! [% sel = { description => 'OS', name => 'op_sys' } %] [% INCLUDE select %] </tr> ! ! <tr> [% IF Param('letsubmitterchoosepriority') %] [% sel = { description => 'Priority', name => 'priority' } %] [% INCLUDE select %] [% ELSE %] ! <input type="hidden" name="priority" value="[% default.priority FILTER html %]"> [% END %] [% sel = { description => 'Severity', name => 'bug_severity' } %] ! [% INCLUDE select %] </tr> ! <tr> <td> </td> --- 130,162 ---- [%- END %] </select> ! </td> </tr> ! <tr> <td> </td> <td colspan="3"></td> </tr> ! <tr> [% sel = { description => 'Platform', name => 'rep_platform' } %] [% INCLUDE select %] ! [% sel = { description => 'OS', name => 'op_sys' } %] [% INCLUDE select %] </tr> ! ! <tr> [% IF Param('letsubmitterchoosepriority') %] [% sel = { description => 'Priority', name => 'priority' } %] [% INCLUDE select %] [% ELSE %] ! <input type="hidden" name="priority" value="[% default.priority FILTER html %]"> [% END %] [% sel = { description => 'Severity', name => 'bug_severity' } %] ! [% INCLUDE select %] </tr> ! <tr> <td> </td> *************** *** 121,139 **** </tr> - [% IF bug_status.size > 1 %] <tr> [% sel = { description => 'Initial State', name => 'bug_status' } %] [% INCLUDE select %] ! <td colspan="2"></td> </tr> - [% ELSE %] - <input type="hidden" name="bug_status" value="[% default.bug_status %]"> - [% END %] <tr> <td align="right"> <strong> ! <a href="bug_status.html#assigned_to">Assigned To</a>: </strong> </td> --- 164,184 ---- </tr> <tr> + [% IF bug_status.size <= 1 %] + <input type="hidden" name="bug_status" + value="[% default.bug_status FILTER html %]"> + <td align="right" valign="top"><strong>Initial State:</strong></td> + <td valign="top">[% default.bug_status FILTER html %]</td> + [% ELSE %] [% sel = { description => 'Initial State', name => 'bug_status' } %] [% INCLUDE select %] ! [% END %] <td colspan="2"></td> </tr> <tr> <td align="right"> <strong> ! <a href="page.cgi?id=fields.html#assigned_to">Assign To</a>: </strong> </td> *************** *** 141,145 **** <input name="assigned_to" size="32" value="[% assigned_to FILTER html %]"> ! (Leave blank to assign to default component owner) </td> </tr> --- 186,190 ---- <input name="assigned_to" size="32" value="[% assigned_to FILTER html %]"> ! <noscript>(Leave blank to assign to default component owner)</noscript> </td> </tr> *************** *** 157,168 **** </tr> <tr> <td align="right"><strong>URL:</strong></td> <td colspan="3"> ! <input name="bug_file_loc" size="60" value="[% bug_file_loc FILTER html %]"> </td> </tr> ! <tr> <td align="right"><strong>Summary:</strong></td> --- 202,227 ---- </tr> + [% IF UserInGroup(Param('timetrackinggroup')) %] + <tr> + <td align="right"><strong>Estimated Hours:</strong></td> + <td colspan="3"> + <input name="estimated_time" size="6" maxlength="6" value="0.0"> + </td> + </tr> + + <tr> + <td> </td> + <td colspan="3"></td> + </tr> + [% END %] + <tr> <td align="right"><strong>URL:</strong></td> <td colspan="3"> ! <input name="bug_file_loc" size="60" value="[% bug_file_loc FILTER html %]"> </td> </tr> ! <tr> <td align="right"><strong>Summary:</strong></td> *************** *** 171,175 **** </td> </tr> ! <tr><td align="right" valign="top"><strong>Description:</strong></td> <td colspan="3"> --- 230,234 ---- </td> </tr> ! <tr><td align="right" valign="top"><strong>Description:</strong></td> <td colspan="3"> *************** *** 179,183 **** </td> </tr> ! <tr> <td></td> --- 238,289 ---- </td> </tr> ! ! [% IF Param("insidergroup") && UserInGroup(Param("insidergroup")) %] ! <tr> ! <td></td> ! <td colspan="3"> ! ! <input type="checkbox" id="commentprivacy" name="commentprivacy" ! [% " checked=\"checked\"" IF commentprivacy %]> ! <label for="commentprivacy"> ! Initial Description is Private ! </label> ! </td> ! </tr> ! [% ELSE %] ! <input type="hidden" name="commentprivacy" value="0"> ! [% END %] ! ! [% IF UserInGroup('editbugs') %] ! [% IF use_keywords %] ! <tr> ! <td align="right" valign="top"> ! <strong> ! <a href="describekeywords.cgi">Keywords</a>: ! </strong> ! </td> ! <td colspan="3"> ! <input name="keywords" size="60" value="[% keywords FILTER html %]"> (optional) ! </td> ! </tr> ! [% END %] ! <tr> ! <td align="right"> ! <strong>Depends on:</strong> ! </td> ! <td> ! <input name="dependson" accesskey="d" value="[% dependson FILTER html %]"> ! </td> ! </tr> ! <tr> ! <td align="right"> ! <strong>Blocks:</strong> ! </td> ! <td> ! <input name="blocked" accesskey="b" value="[% blocked FILTER html %]"> ! </td> ! </tr> ! [% END %] ! <tr> <td></td> *************** *** 186,194 **** <br> <strong> ! Only users in all of the selected groups can view this bug: </strong> <br> <font size="-1"> ! (Leave all boxes unchecked to make this a public bug.) </font> <br> --- 292,300 ---- <br> <strong> ! Only users in all of the selected groups can view this [% terms.bug %]: </strong> <br> <font size="-1"> ! (Leave all boxes unchecked to make this a public [% terms.bug %].) </font> <br> *************** *** 198,203 **** [% FOREACH g = group %] ! <input type="checkbox" name="bit-[% g.bit %]" value="1" ! [% " checked=\"checked\"" IF g.checked %]>[% g.description %]<br> [% END %] <br> --- 304,311 ---- [% FOREACH g = group %] ! <input type="checkbox" id="bit-[% g.bit %]" ! name="bit-[% g.bit %]" value="1" ! [% " checked=\"checked\"" IF g.checked %]> ! <label for="bit-[% g.bit %]">[% g.description %]</label><br> [% END %] <br> *************** *** 205,218 **** </td> </tr> ! <tr> <td></td> <td colspan="3"> ! <input type="submit" value=" Commit " ! onclick="if (this.form.short_desc.value == '') ! { alert('Please enter a summary sentence for this bug.'); return false; } return true;"> ! <input type="submit" name="maketemplate" value="Remember values as bookmarkable template"> </td> --- 313,326 ---- </td> </tr> ! <tr> <td></td> <td colspan="3"> ! <input type="submit" value=" Commit " ! onclick="if (this.form.short_desc.value == '') ! { alert('Please enter a summary sentence for this [% terms.bug %].'); return false; } return true;"> ! <input type="submit" name="maketemplate" value="Remember values as bookmarkable template"> </td> *************** *** 224,230 **** <td colspan="3"> <br> ! We've made a guess at your operating system and platform. ! Please check them and, if we got it wrong, email ! [% Param('maintainer') %]. </td> </tr> --- 332,338 ---- <td colspan="3"> <br> ! We've made a guess at your operating system and platform. ! Please check them and, if we got it wrong, email ! [%+ Param('maintainer') %]. </td> </tr> *************** *** 245,253 **** <td align="right"> <strong> ! <a href="bug_status.html#[% sel.name %]">[% sel.description %]</a>: </strong> </td> [% END %] ! <td> <select name="[% sel.name %]"> --- 353,362 ---- <td align="right"> <strong> ! <a href="page.cgi?id=fields.html#[% sel.name %]"> ! [% sel.description %]</a>: </strong> </td> [% END %] ! <td> <select name="[% sel.name %]"> Index: user-message.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/create/user-message.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** user-message.html.tmpl 28 Jun 2004 00:54:11 -0000 1.1 --- user-message.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 *************** *** 29,34 **** #%] ! Before reporting a bug, please read the <a href="bugwritinghelp.html"> ! bug writing guidelines</a>, please look at the list of ! <a href="duplicates.cgi">most frequently reported bugs</a>, and please ! <a href="query.cgi">search</a> for the bug. --- 29,37 ---- #%] ! [% PROCESS global/variables.none.tmpl %] ! ! Before reporting [% terms.abug %], please read the ! <a href="page.cgi?id=bug-writing.html"> ! [% terms.bug %] writing guidelines</a>, please look at the list of ! <a href="duplicates.cgi">most frequently reported [% terms.bugs %]</a>, and please ! <a href="query.cgi">search</a> for the [% terms.bug %]. Index: make-template.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/create/make-template.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** make-template.html.tmpl 28 Jun 2004 00:54:11 -0000 1.1 --- make-template.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,24 **** #%] ! [% PROCESS global/header.html.tmpl title = "Bookmarks are your friend" h1 = "Template constructed" --- 20,26 ---- #%] ! [% PROCESS global/variables.none.tmpl %] ! ! [% PROCESS global/header.html.tmpl title = "Bookmarks are your friend" h1 = "Template constructed" *************** *** 27,31 **** <p> If you bookmark <a href="enter_bug.cgi?[% url FILTER html %]">this link</a>, ! going to the bookmark will bring up the enter bug page with the fields initialized as you've requested. </p> --- 29,33 ---- <p> If you bookmark <a href="enter_bug.cgi?[% url FILTER html %]">this link</a>, ! going to the bookmark will bring up the enter [% terms.bug %] page with the fields initialized as you've requested. </p> Index: created.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/create/created.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** created.html.tmpl 28 Jun 2004 00:54:11 -0000 1.1 --- created.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,30 **** #%] ! [% PROCESS global/header.html.tmpl ! title = "Bug $id Submitted" %] ! [% PROCESS bug/process/results.html.tmpl %] <br> ! [%# post_bug.cgi will add a copy of the filed bug below here %] --- 20,50 ---- #%] ! [% PROCESS global/variables.none.tmpl %] ! ! [% PROCESS global/header.html.tmpl ! title = "$terms.Bug $id Submitted" %] ! [% header_done = 1 %] ! ! [% FOREACH item = sentmail %] ! [% PROCESS bug/process/results.html.tmpl ! type = item.type ! id = item.id ! mail = item.mail ! %] ! [% END %] <br> ! <hr> ! ! [% PROCESS bug/edit.html.tmpl %] ! ! <hr> ! ! [% PROCESS bug/navigate.html.tmpl %] ! ! <br> ! ! [% PROCESS global/footer.html.tmpl %] |
Update of /cvsroot/openfirst/www/htdocs/bugzilla/list In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32743/list Modified Files: change-columns.html.tmpl edit-multiple.html.tmpl list-simple.html.tmpl list.html.tmpl quips.html.tmpl server-push.html.tmpl table.html.tmpl Log Message: Bring templates up to date for Bugzilla 2.18.1 Index: list-simple.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/list/list-simple.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** list-simple.html.tmpl 28 Jun 2004 00:44:16 -0000 1.1 --- list-simple.html.tmpl 15 May 2005 15:04:55 -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 *************** *** 24,32 **** #%] [%############################################################################%] [%# Initialization #%] [%############################################################################%] ! [% DEFAULT title = "Bug List" %] [% title = title FILTER html %] --- 24,34 ---- #%] + [% PROCESS global/variables.none.tmpl %] + [%############################################################################%] [%# Initialization #%] [%############################################################################%] ! [% DEFAULT title = "$terms.Bug List" %] [% title = title FILTER html %] *************** *** 40,43 **** --- 42,46 ---- <head> <title>[% title %]</title> + <base href="[% Param("urlbase") %]"> <link href="css/buglist.css" rel="stylesheet" type="text/css"> </head> *************** *** 45,49 **** <body> [% IF bugs.size == 0 %] ! <h3>Zarro Boogs found.</h3> [% ELSE %] [% PROCESS list/table.html.tmpl %] --- 48,52 ---- <body> [% IF bugs.size == 0 %] ! <h3>[% terms.zeroSearchResults %].</h3> [% ELSE %] [% PROCESS list/table.html.tmpl %] Index: quips.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/list/quips.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** quips.html.tmpl 28 Jun 2004 00:44:19 -0000 1.1 --- quips.html.tmpl 15 May 2005 15:04:55 -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: ! # added_quip: string. Defined if the CGI added a quip data before # displaying anything; if defined, its value is that quip. # show_quips: boolean. True if we are showing the entire quip list. --- 21,25 ---- [%# INTERFACE: ! # added_quip: string. Defined if the CGI added a quip data before # displaying anything; if defined, its value is that quip. # show_quips: boolean. True if we are showing the entire quip list. *************** *** 27,32 **** #%] [% PROCESS global/header.html.tmpl ! title = "Bugzilla Quip System" h1 = "Add your own clever headline" %] --- 27,34 ---- #%] + [% PROCESS global/variables.none.tmpl %] + [% PROCESS global/header.html.tmpl ! title = "$terms.Bugzilla Quip System" h1 = "Add your own clever headline" %] *************** *** 36,47 **** <font color="red"> Your quip '<tt>[% added_quip FILTER html %]</tt>' has been added. </font> </p> [% END %] <p> ! Bugzilla will pick a random quip for the headline on each bug list, and ! you can extend the quip list. Type in something clever or funny or boring (but not obscene or offensive, please) and bonk on the button. </p> --- 38,67 ---- <font color="red"> Your quip '<tt>[% added_quip FILTER html %]</tt>' has been added. + [% IF Param("enablequips") == "approved" AND !user.groups.admin %] + It will be used as soon as it gets approved. + [% END %] </font> </p> [% END %] + [% IF deleted_quip %] + <p> + <font color="red"> + The quip '<tt>[% deleted_quip FILTER html %]</tt>' has been deleted. + </font> + </p> + [% END %] + + [% IF approved or unapproved %] + <p>[% approved.size %] quips approved and [% unapproved.size %] quips unapproved</p> + [% END %] + <p> ! [% terms.Bugzilla %] will pick a random quip for the headline on each [% terms.bug %] list, and ! you can extend the quip list. Type in something clever or funny or boring (but not obscene or offensive, please) and bonk on the button. + [% IF Param("enablequips") == "approved" AND !user.groups.admin %] + Note that your quip has to be approved before it is used. + [% END %] </p> *************** *** 55,70 **** [% IF show_quips %] ! <h2> ! Existing quips: ! </h2> ! <ul> ! [% FOREACH quip = quips %] ! <li>[% quip FILTER html %]</li> ! [% END %] ! </ul> [% ELSE %] <p> ! Those who like their wisdom in large doses can ! <a href="quips.cgi?action=show">view the whole quip list</a>. </p> [% END %] --- 75,153 ---- [% IF show_quips %] ! [% IF !UserInGroup('admin') %] ! <h2> ! Existing quips: ! </h2> ! <ul> ! [% FOREACH quipid = quipids %] ! [% NEXT IF NOT quips.$quipid.approved %] ! <li>[% quips.$quipid.quip FILTER html %]</li> ! [% END %] ! </ul> ! [% ELSE %] ! <h2>Edit existing quips:</h2> ! <p> ! <strong>Note:</strong> Only approved quips will be shown. ! If enablequips is set to <q>on</q>, entered quips are automatically ! approved. ! </p> ! <form name="editform" method="post" action="quips.cgi"> ! <input type="hidden" name="action" value="approve"> ! <table border="1"> ! <thead><tr> ! <th>Quip</th> ! <th>Author</th> ! <th>Action</th> ! <th>Approved</th> ! </tr></thead><tbody> ! [% FOREACH quipid = quipids %] ! <tr> ! <td>[% quips.$quipid.quip FILTER html %]</td> ! <td> ! [% userid = quips.$quipid.userid %] ! [% users.$userid FILTER html %] ! [% "Unknown" IF NOT users.$userid %] ! </td> ! <td> ! <a href="quips.cgi?action=delete&quipid=[% quipid FILTER uri%]"> ! Delete ! </a> ! </td> ! <td> ! <input type="checkbox" name="quipid_[% quipid FILTER uri%]" ! id="quipid_[% quipid FILTER uri%]" ! [%- ' checked="checked"' IF quips.$quipid.approved %]> ! </td> ! </tr> ! [% END %] ! </tbody> ! </table> ! <script type="text/javascript" language="JavaScript"><!-- ! var numelements = document.forms.editform.elements.length; ! function SetCheckboxes(value) { ! var item; ! for (var i=0 ; i<numelements ; i++) { ! item = document.forms.editform.elements[i]; ! item.checked = value; ! } ! } ! document.write(' <input type="button" name="uncheck_all" ' ! +'value="Uncheck All" onclick="SetCheckboxes(false);">'); ! document.write(' <input type="button" name="check_all" ' ! +'value="Check All" onclick="SetCheckboxes(true);">'); ! //--></script> ! ! <input type="submit" value="Update"> ! </form> ! <br> ! [% END %] [% ELSE %] <p> ! Those who like their wisdom in large doses can ! <a href="quips.cgi?action=show">view ! [% IF UserInGroup('admin') %] ! and edit ! [% END %] ! the whole quip list</a>. </p> [% END %] Index: table.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/list/table.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** table.html.tmpl 28 Jun 2004 00:44:19 -0000 1.1 --- table.html.tmpl 15 May 2005 15:04:55 -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 *************** *** 32,53 **** # by the browser. #%] [% abbrev = { ! "severity" => { maxlength => 3 , title => "Sev" } , ! "priority" => { maxlength => 3 , title => "Pri" } , ! "platform" => { maxlength => 3 , title => "Plt" } , ! "status" => { maxlength => 4 } , ! "reporter" => { maxlength => 30 , ellipsis => "..." } , ! "owner" => { maxlength => 30 , ellipsis => "..." } , ! "qa_contact" => { maxlength => 30 , ellipsis => "..." , title => "QAContact" } , "resolution" => { maxlength => 4 } , ! "summary" => { maxlength => 60 , ellipsis => "..." , wrap => 1 } , ! "summaryfull" => { wrap => 1 } , "status_whiteboard" => { title => "StatusSummary" , wrap => 1 } , "component" => { maxlength => 8 , title => "Comp" } , "product" => { maxlength => 8 } , "version" => { maxlength => 5 , title => "Vers" } , ! "os" => { maxlength => 4 } , "target_milestone" => { title => "TargetM" } , } %] --- 32,64 ---- # by the browser. #%] + + [% PROCESS "global/field-descs.none.tmpl" %] + [% field_descs.short_short_desc = field_descs.short_desc %] + [% field_descs.assigned_to_realname = field_descs.assigned_to %] + [% field_descs.reporter_realname = field_descs.reporter %] + [% field_descs.qa_contact_realname = field_descs.qa_contact %] + [% abbrev = { ! "bug_severity" => { maxlength => 3 , title => "Sev" } , ! "priority" => { maxlength => 3 , title => "Pri" } , ! "rep_platform" => { maxlength => 3 , title => "Plt" } , ! "bug_status" => { maxlength => 4 } , ! "assigned_to" => { maxlength => 30 , ellipsis => "..." } , ! "assigned_to_realname" => { maxlength => 20 , ellipsis => "..." } , ! "reporter" => { maxlength => 30 , ellipsis => "..." } , ! "reporter_realname" => { maxlength => 20 , ellipsis => "..." } , ! "qa_contact" => { maxlength => 30 , ellipsis => "..." , title => "QAContact" } , ! "qa_contact_realname" => { maxlength => 20 , ellipsis => "..." , title => "QAContact" } , "resolution" => { maxlength => 4 } , ! "short_desc" => { wrap => 1 } , ! "short_short_desc" => { maxlength => 60 , ellipsis => "..." , wrap => 1 } , "status_whiteboard" => { title => "StatusSummary" , wrap => 1 } , "component" => { maxlength => 8 , title => "Comp" } , "product" => { maxlength => 8 } , "version" => { maxlength => 5 , title => "Vers" } , ! "op_sys" => { maxlength => 4 } , "target_milestone" => { title => "TargetM" } , + "percentage_complete" => { format_value => "%d %%" } , } %] *************** *** 55,58 **** --- 66,71 ---- [% qorder = order FILTER url_quote IF order %] + [% PROCESS bug/time.html.tmpl %] + [%############################################################################%] [%# Table Header #%] *************** *** 62,74 **** <table class="bz_buglist" cellspacing="0" cellpadding="4" width="100%"> <colgroup> <col class="bz_id_column"> [% FOREACH id = displaycolumns %] ! <col class="bz_[% id %]_column"> [% END %] </colgroup> <tr align="left"> ! <th colspan="[% splitheader ? 2 : 1 %]"> ! <a href="buglist.cgi?[% urlquerypart FILTER html %]&order=bugs.bug_id">ID</a> </th> --- 75,100 ---- <table class="bz_buglist" cellspacing="0" cellpadding="4" width="100%"> <colgroup> + [% IF dotweak %] + <col class="bz_checkbox_column"> + [% END %] <col class="bz_id_column"> [% FOREACH id = displaycolumns %] ! <col class="bz_[% id FILTER css_class_quote %]_column"> [% END %] </colgroup> <tr align="left"> ! [% IF dotweak %] ! <th> </th> ! [% END %] ! <th colspan="[% splitheader ? 2 : 1 %]" class="first-child"> ! [% IF sorted_by_relevance %] ! ID ! [% ELSE %] ! <a href="buglist.cgi? ! [% urlquerypart FILTER html %]&order=bugs.bug_id ! [%-#%]&query_based_on= ! [% defaultsavename OR searchname FILTER html %]">ID</a> ! [% END %] </th> *************** *** 103,110 **** [% BLOCK columnheader %] <th colspan="[% splitheader ? 2 : 1 %]"> ! <a href="buglist.cgi?[% urlquerypart FILTER html %]&order= ! [% column.name FILTER url_quote FILTER html %] ! [% ",$qorder" FILTER html IF order %]"> ! [%- abbrev.$id.title || column.title -%]</a> </th> [% END %] --- 129,142 ---- [% BLOCK columnheader %] <th colspan="[% splitheader ? 2 : 1 %]"> ! [% IF sorted_by_relevance %] ! [%- abbrev.$id.title || field_descs.$id || column.title -%] ! [% ELSE %] ! <a href="buglist.cgi?[% urlquerypart FILTER html %]&order= ! [% column.name FILTER url_quote FILTER html %] ! [% ",$qorder" FILTER html IF order %] ! [%-#%]&query_based_on= ! [% defaultsavename OR searchname FILTER html %]"> ! [%- abbrev.$id.title || field_descs.$id || column.title -%]</a> ! [% END %] </th> [% END %] *************** *** 116,131 **** [% FOREACH bug = bugs %] ! [% FLUSH IF loop.count() % 10 == 1 %] [%# At the beginning of every hundred bugs in the list, start a new table. %] ! [% IF loop.count() % 100 == 1 %] [% tableheader %] [% END %] ! <tr class="bz_[% bug.severity %] bz_[% bug.priority %] [%+ "bz_secure" IF (bug.groupset && !usebuggroups) %]"> <td> ! [% IF dotweak %]<input type="checkbox" name="id_[% bug.id %]">[% END %] ! <a href="show_bug.cgi?id=[% bug.id %]">[% bug.id %]</a> </td> --- 148,176 ---- [% FOREACH bug = bugs %] ! [% count = loop.count() %] ! [% FLUSH IF count % 10 == 1 %] [%# At the beginning of every hundred bugs in the list, start a new table. %] ! [% IF count % 100 == 1 %] [% tableheader %] [% END %] ! <tr class="bz_[% bug.bug_severity FILTER css_class_quote -%] ! bz_[% bug.priority FILTER css_class_quote -%] ! bz_[% bug.bug_status FILTER css_class_quote -%] ! [%+ "bz_$bug.resolution" FILTER css_class_quote IF bug.resolution -%] ! [%+ "bz_secure" IF bug.isingroups -%] ! [%+ count % 2 == 1 ? "bz_odd" : "bz_even" -%] ! "> ! + [% IF dotweak %] <td> ! <input type="checkbox" name="id_[% bug.bug_id %]"> ! </td> ! [% END %] ! <td class="first-child"> ! <a href="show_bug.cgi?id=[% bug.bug_id %]">[% bug.bug_id %]</a> ! <span style="display: none">[%+ '[SEC]' IF bug.secure_mode %]</span> </td> *************** *** 133,137 **** <td> [% '<nobr>' IF NOT abbrev.$column.wrap %] ! [%- bug.$column.truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html -%] [%- '</nobr>' IF NOT abbrev.$column.wrap %] </td> --- 178,190 ---- <td> [% '<nobr>' IF NOT abbrev.$column.wrap %] ! [% IF abbrev.$column.format_value %] ! [%- bug.$column FILTER format(abbrev.$column.format_value) FILTER html -%] ! [% ELSIF column == 'actual_time' || ! column == 'remaining_time' || ! column == 'estimated_time' %] ! [% PROCESS formattimeunit time_unit=bug.$column %] ! [% ELSE %] ! [%- bug.$column.truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html -%] ! [% END %] [%- '</nobr>' IF NOT abbrev.$column.wrap %] </td> *************** *** 148,150 **** [% END %] - --- 201,202 ---- Index: change-columns.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/list/change-columns.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** change-columns.html.tmpl 28 Jun 2004 00:44:16 -0000 1.1 --- change-columns.html.tmpl 15 May 2005 15:04:55 -0000 1.2 *************** *** 1,8 **** ! <!-- 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 --- 1,8 ---- ! [%# 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 *************** *** 20,50 **** #%] [% PROCESS global/header.html.tmpl title = "Change Columns" %] - Check which columns you wish to appear on the list, and then click - on submit. (Cookies are required.) <p> <form action="colchange.cgi"> ! <input type="hidden" name="rememberedquery" value="[% buffer FILTER html %]"> ! [% FOREACH column = masterlist %] ! <input type="checkbox" id="[% column %]" name="column_[% column %]" [% "CHECKED" IF lsearch(collist, column) != -1 %]> ! <label for="[% column %]">[% desc.${column} %]</label><br> ! [% END %] ! </p><p> ! <input id="nosplitheader" type="radio" name="splitheader" value="0" [% "CHECKED" IF ! splitheader %]> ! <label for="nosplitheader">Normal headers (prettier)</label><br> ! <input id="splitheader" type="radio" name="splitheader" value="1" [% "CHECKED" IF splitheader %]> ! <label for="splitheader">Stagger headers (often makes list more compact)</label> ! </p><p> ! <input type="submit" value="Submit"> </form> <form action="colchange.cgi"> ! <input type="hidden" name="rememberedquery" value="[% buffer FILTER html %]"> ! <input type="hidden" name="resetit" value="1"> ! <input type="submit" value="Reset to Bugzilla default"> </form> - </p> [% PROCESS global/footer.html.tmpl %] --- 20,77 ---- #%] + [% PROCESS global/variables.none.tmpl %] + [% PROCESS global/header.html.tmpl title = "Change Columns" %] <p> + Select the columns you wish to appear in your [% terms.bug %] lists. Note that + this feature requires cookies to work. + </p> + + [% PROCESS "global/field-descs.none.tmpl" %] + [% field_descs.short_short_desc = "Summary (first 60 characters)" %] + [% field_descs.short_desc = "Full Summary" %] + [% field_descs.assigned_to_realname = "Assignee Realname" %] + [% field_descs.reporter_realname = "Reporter Realname" %] + [% field_descs.qa_contact_realname = "QA Contact Realname" %] + <form action="colchange.cgi"> ! <input type="hidden" name="rememberedquery" value="[% buffer FILTER html %]"> ! [% FOREACH column = masterlist %] ! <input type="checkbox" id="[% column %]" name="column_[% column %]" ! [% "checked='checked'" IF lsearch(collist, column) != -1 %]> ! <label for="[% column %]"> ! [% (field_descs.${column} || column) FILTER html %] ! </label> ! <br> ! [% END %] ! ! <p> ! <input id="nosplitheader" type="radio" name="splitheader" value="0" ! [% "checked='checked'" IF NOT splitheader %]> ! <label for="nosplitheader"> ! Normal headers (prettier) ! </label> ! <br> ! ! <input id="splitheader" type="radio" name="splitheader" value="1" ! [% "checked='checked'" IF splitheader %]> ! <label for="splitheader"> ! Stagger headers (often makes list more compact) ! </label> ! </p> ! ! <p> ! <input type="submit" value="Change Columns"> ! </p> </form> + <form action="colchange.cgi"> ! <input type="hidden" name="rememberedquery" value="[% buffer FILTER html %]"> ! <input type="hidden" name="resetit" value="1"> ! <input type="submit" value="Reset to [% terms.Bugzilla %] default"> </form> [% PROCESS global/footer.html.tmpl %] Index: edit-multiple.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/list/edit-multiple.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** edit-multiple.html.tmpl 28 Jun 2004 00:44:16 -0000 1.1 --- edit-multiple.html.tmpl 15 May 2005 15:04:55 -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,23 **** --- 20,28 ---- #%] + [% PROCESS global/variables.none.tmpl %] + + [% dontchange = "--do_not_change--" %] + <input type="hidden" name="dontchange" value="[% dontchange FILTER html %]"> + <script type="text/javascript" language="JavaScript"> var numelements = document.forms.changeform.elements.length; *************** *** 36,42 **** <p><font size="-1"> ! To change multiple bugs: <ol> ! <li>Check the bugs you want to change above.</li> <li>Make your changes in the form fields below. If the change you are making requires an explanation, include it in --- 41,47 ---- <p><font size="-1"> ! To change multiple [% terms.bugs %]: <ol> ! <li>Check the [% terms.bugs %] you want to change above.</li> <li>Make your changes in the form fields below. If the change you are making requires an explanation, include it in *************** *** 51,55 **** <th><label for="product">Product:</label></th> <td> ! [% PROCESS selectmenu menuname = "product" menuitems = products %] </td> --- 56,60 ---- <th><label for="product">Product:</label></th> <td> ! [% PROCESS selectmenu menuname = "product" menuitems = products %] </td> *************** *** 57,61 **** <th><label for="version">Version:</label></th> <td> ! [% PROCESS selectmenu menuname = "version" menuitems = versions %] </td> --- 62,66 ---- <th><label for="version">Version:</label></th> <td> ! [% PROCESS selectmenu menuname = "version" menuitems = versions %] </td> *************** *** 66,74 **** <th> <label for="rep_platform"> ! <a href="bug_status.html#rep_platform">Platform</a>: </label> </th> <td> ! [% PROCESS selectmenu menuname = "rep_platform" menuitems = platforms %] </td> --- 71,79 ---- <th> <label for="rep_platform"> ! <a href="page.cgi?id=fields.html#rep_platform">Platform</a>: </label> </th> <td> ! [% PROCESS selectmenu menuname = "rep_platform" menuitems = platforms %] </td> *************** *** 76,84 **** <th> <label for="priority"> ! <a href="bug_status.html#priority">Priority</a>: </label> </th> <td> ! [% PROCESS selectmenu menuname = "priority" menuitems = priorities %] </td> --- 81,89 ---- <th> <label for="priority"> ! <a href="page.cgi?id=fields.html#priority">Priority</a>: </label> </th> <td> ! [% PROCESS selectmenu menuname = "priority" menuitems = priorities %] </td> *************** *** 89,93 **** <th><label for="component">Component:</label></th> <td> ! [% PROCESS selectmenu menuname = "component" menuitems = components %] </td> --- 94,98 ---- <th><label for="component">Component:</label></th> <td> ! [% PROCESS selectmenu menuname = "component" menuitems = components %] </td> *************** *** 95,116 **** <th> <label for="bug_severity"> ! <a href="bug_status.html#severity">Severity</a>: </label> </th> <td> ! [% PROCESS selectmenu menuname = "bug_severity" menuitems = severities %] </td> </tr> - <tr> ! <th><label for="target_milestone">Target Milestone:</label></th> ! <td colspan="3"> ! [% PROCESS selectmenu menuname = "target_milestone" ! menuitems = targetmilestones %] ! </td> ! </tr> [% IF Param("useqacontact") %] --- 100,141 ---- <th> <label for="bug_severity"> ! <a href="page.cgi?id=fields.html#bug_severity">Severity</a>: </label> </th> <td> ! [% PROCESS selectmenu menuname = "bug_severity" menuitems = severities %] </td> </tr> ! [% IF Param("usetargetmilestone") %] ! <tr> ! <th><label for="target_milestone">Target Milestone:</label></th> ! <td colspan="3"> ! [% PROCESS selectmenu menuname = "target_milestone" ! menuitems = targetmilestones %] ! </td> ! </tr> ! [% END %] ! [% IF UserInGroup(Param("timetrackinggroup")) %] ! <tr> ! <th><label for="estimated_time">Estimated Hours:</label></th> ! <td> ! <input id="estimated_time" ! name="estimated_time" ! value="[% dontchange FILTER html %]" ! size="6"> ! </td> ! <th><label for="remaining_time">Remaining Hours:</label></th> ! <td> ! <input id="remaining_time" ! name="remaining_time" ! value="[% dontchange FILTER html %]" ! size="6"> ! </td> ! </tr> ! [% END %] [% IF Param("useqacontact") %] *************** *** 118,124 **** <th><label for="qa_contact">QA Contact:</label></th> <td colspan="3"> ! <input id="qa_contact" ! name="qa_contact" ! value="[% dontchange FILTER html %]" size="32"> </td> --- 143,149 ---- <th><label for="qa_contact">QA Contact:</label></th> <td colspan="3"> ! <input id="qa_contact" ! name="qa_contact" ! value="[% dontchange FILTER html %]" size="32"> </td> *************** *** 161,166 **** </table> - <input type="hidden" name="multiupdate" value="Y"> - <label for="comment"><b>Additional Comments:</b></label><br> <textarea id="comment" name="comment" rows="5" cols="80" wrap="hard"></textarea><br> --- 186,189 ---- *************** *** 171,177 **** <table border="1"> <tr> ! <th>Don't<br>change<br>this group<br>restriction</td> ! <th>Remove<br>bugs<br>from this<br>group</td> ! <th>Add<br>bugs<br>to this<br>group</td> <th>Group Name:</td> </tr> --- 194,200 ---- <table border="1"> <tr> ! <th>Don't<br>change<br>this group<br>restriction</td> ! <th>Remove<br>[% terms.bugs %]<br>from this<br>group</td> ! <th>Add<br>[% terms.bugs %]<br>to this<br>group</td> <th>Group Name:</td> </tr> *************** *** 180,191 **** <tr> <td align="center"> ! <input type="radio" name="bit-[% group.bit %]" value="-1" checked="checked"> </td> <td align="center"> ! <input type="radio" name="bit-[% group.bit %]" value="0"> </td> [% IF group.isactive %] <td align="center"> ! <input type="radio" name="bit-[% group.bit %]" value="1"> </td> [% ELSE %] --- 203,214 ---- <tr> <td align="center"> ! <input type="radio" name="bit-[% group.id %]" value="-1" checked="checked"> </td> <td align="center"> ! <input type="radio" name="bit-[% group.id %]" value="0"> </td> [% IF group.isactive %] <td align="center"> ! <input type="radio" name="bit-[% group.id %]" value="1"> </td> [% ELSE %] *************** *** 198,202 **** [% group.description %] [% ELSE %] ! [% group.description FILTER strike %] [% END %] </td> --- 221,225 ---- [% group.description %] [% ELSE %] ! [% group.description FILTER inactive %] [% END %] </td> *************** *** 208,213 **** [% IF foundinactive %] ! <font size="-1">(Note: Bugs may not be added to <strike>inactive ! groups</strike>, only removed.)</font><br> [% END %] --- 231,236 ---- [% IF foundinactive %] ! <font size="-1">(Note: [% terms.Bugs %] may not be added to [% FILTER inactive %]inactive ! groups[% END %], only removed.)</font><br> [% END %] *************** *** 224,240 **** <input id="knob-confirm" type="radio" name="knob" value="confirm"> <label for="knob-confirm"> ! Confirm bugs (change status to <b>NEW</b>) </label><br> [% END %] ! [% knum = knum + 1 %] ! <input id="knob-accept" type="radio" name="knob" value="accept"> ! <label for="knob-accept"> ! Accept bugs (change status to <b>ASSIGNED</b>) ! </label><br> ! ! [%# If all the bugs being changed are open, allow the user to close them. %] [% IF !bugstatuses.containsany(closedstates) %] [% knum = knum + 1 %] <input id="knob-clearresolution" type="radio" name="knob" value="clearresolution"> <label for="knob-clearresolution">Clear the resolution</label><br> --- 247,264 ---- <input id="knob-confirm" type="radio" name="knob" value="confirm"> <label for="knob-confirm"> ! Confirm [% terms.bugs %] (change status to <b>NEW</b>) </label><br> [% END %] ! [%# If all the bugs being changed are open, allow the user to accept them, ! clear their resolution or resolve them. %] [% IF !bugstatuses.containsany(closedstates) %] [% knum = knum + 1 %] + <input id="knob-accept" type="radio" name="knob" value="accept"> + <label for="knob-accept"> + Accept [% terms.bugs %] (change status to <b>ASSIGNED</b>) + </label><br> + + [% knum = knum + 1 %] <input id="knob-clearresolution" type="radio" name="knob" value="clearresolution"> <label for="knob-clearresolution">Clear the resolution</label><br> *************** *** 243,252 **** <input id="knob-resolve" type="radio" name="knob" value="resolve"> <label for="knob-resolve"> ! Resolve bugs, changing <a href="bug_status.html">resolution</a> to </label> <select name="resolution" onchange="document.forms.changeform.knob[[% knum %]].checked=true"> [% FOREACH resolution = resolutions %] [% NEXT IF !resolution %] ! <option value="[% resolution FILTER html %]" [% selected IF resolution == "FIXED" %]> [% resolution FILTER html %] </option> --- 267,276 ---- <input id="knob-resolve" type="radio" name="knob" value="resolve"> <label for="knob-resolve"> ! Resolve [% terms.bugs %], changing <a href="page.cgi?id=fields.html#resolution">resolution</a> to </label> <select name="resolution" onchange="document.forms.changeform.knob[[% knum %]].checked=true"> [% FOREACH resolution = resolutions %] [% NEXT IF !resolution %] ! <option value="[% resolution FILTER html %]" [% 'selected="selected"' IF resolution == "FIXED" %]> [% resolution FILTER html %] </option> *************** *** 260,264 **** [% knum = knum + 1 %] <input id="knob-reopen" type="radio" name="knob" value="reopen"> ! <label for="knob-reopen">Reopen bugs</label><br> [% END %] --- 284,288 ---- [% knum = knum + 1 %] <input id="knob-reopen" type="radio" name="knob" value="reopen"> ! <label for="knob-reopen">Reopen [% terms.bugs %]</label><br> [% END %] *************** *** 267,284 **** [% knum = knum + 1 %] <input id="knob-verify" type="radio" name="knob" value="verify"> ! <label for="knob-verify">Mark bugs as <b>VERIFIED</b></label><br> ! [% ELSIF bugstatuses.contains('VERIFIED') %] ! [% knum = knum + 1 %] ! <input id="knob-close" type="radio" name="knob" value="close"> ! <label for="knob-close">Mark bugs as <b>CLOSED</b></label><br> [% END %] [% END %] [% knum = knum + 1 %] <input id="knob-reassign" type="radio" name="knob" value="reassign"> ! <label for="knob-reassign"><a href="bug_status.html#assigned_to"> ! Reassign</a> bugs to </label> ! <input name="assigned_to" value="[% user.login FILTER html %]" onchange="document.forms.changeform.knob[[% knum %]].checked = true;" --- 291,310 ---- [% knum = knum + 1 %] <input id="knob-verify" type="radio" name="knob" value="verify"> ! <label for="knob-verify">Mark [% terms.bugs %] as <b>VERIFIED</b></label><br> [% END %] [% END %] + [% IF !bugstatuses.containsany(openstates) AND !bugstatuses.contains('CLOSED') %] + [% knum = knum + 1 %] + <input id="knob-close" type="radio" name="knob" value="close"> + <label for="knob-close">Mark [% terms.bugs %] as <b>CLOSED</b></label><br> + [% END %] + [% knum = knum + 1 %] <input id="knob-reassign" type="radio" name="knob" value="reassign"> ! <label for="knob-reassign"><a href="page.cgi?id=fields.html#assigned_to"> ! Reassign</a> [% terms.bugs %] to </label> ! <input name="assigned_to" value="[% user.login FILTER html %]" onchange="document.forms.changeform.knob[[% knum %]].checked = true;" *************** *** 286,295 **** [% knum = knum + 1 %] ! <input id="knob-reassignbycomponent" ! type="radio" ! name="knob" value="reassignbycomponent"> <label for="knob-reassignbycomponent"> ! Reassign bugs to owner of selected component </label><br> --- 312,321 ---- [% knum = knum + 1 %] ! <input id="knob-reassignbycomponent" ! type="radio" ! name="knob" value="reassignbycomponent"> <label for="knob-reassignbycomponent"> ! Reassign [% terms.bugs %] to owner of selected component </label><br> Index: list.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/list/list.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** list.html.tmpl 28 Jun 2004 00:44:16 -0000 1.1 --- list.html.tmpl 15 May 2005 15:04:55 -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,30 **** #%] [%############################################################################%] [%# Template Initialization #%] [%############################################################################%] ! [% DEFAULT title = "Bug List" %] [% style_urls = [ "css/buglist.css" ] %] [% qorder = order FILTER url_quote IF order %] --- 20,43 ---- #%] + [%# INTERFACE: + # searchtype: string. Type of search - either "series", "saved" or undef. + # ... + # defaultsavename: string. The default name for saving the query. + #%] + [%############################################################################%] [%# Template Initialization #%] [%############################################################################%] ! [% PROCESS global/variables.none.tmpl %] ! ! [% title = "$terms.Bug List" %] ! [% IF searchname %] ! [% title = title _ ": " _ searchname %] ! [% END %] ! [% style_urls = [ "css/buglist.css" ] %] [% qorder = order FILTER url_quote IF order %] + [% message = "buglist_sorted_by_relevance" IF sorted_by_relevance %] *************** *** 39,43 **** <div align="center"> ! <b>[% currenttime %]</b><br> [% IF debug %] --- 52,60 ---- <div align="center"> ! [% IF Param('timezone') %] ! <b>[% time2str("%a %b %e %Y %T %Z", currenttime, Param('timezone')) %]</b><br> ! [% ELSE %] ! <b>[% time2str("%a %b %e %Y %T", currenttime) %]</b><br> ! [% END %] [% IF debug %] *************** *** 45,49 **** [% END %] ! [% IF quip %] <a href="quips.cgi"><i>[% quip FILTER html %]</i></a> [% END %] --- 62,67 ---- [% END %] ! [% IF Param('enablequips') != 'off' %] ! [% DEFAULT quip = "$terms.Bugzilla would like to put a random quip here, but no one has entered any." %] <a href="quips.cgi"><i>[% quip FILTER html %]</i></a> [% END %] *************** *** 53,58 **** [% IF toolong %] <h2> ! This list is too long for Bugzilla's little mind; the ! Next/Prev/First/Last buttons won't appear on individual bugs. </h2> [% END %] --- 71,76 ---- [% IF toolong %] <h2> ! This list is too long for [% terms.Bugzilla %]'s little mind; the ! Next/Prev/First/Last buttons won't appear on individual [% terms.bugs %]. </h2> [% END %] *************** *** 60,64 **** <hr> - [%############################################################################%] [%# Preceding Status Line #%] --- 78,81 ---- *************** *** 66,73 **** [% IF bugs.size > 9 %] ! [% bugs.size %] bugs found. [% END %] - [%############################################################################%] [%# Start of Change Form #%] --- 83,89 ---- [% IF bugs.size > 9 %] ! [% bugs.size %] [%+ terms.bugs %] found. [% END %] [%############################################################################%] [%# Start of Change Form #%] *************** *** 78,82 **** [% END %] - [%############################################################################%] [%# Bug Table #%] --- 94,97 ---- *************** *** 91,112 **** [% IF bugs.size == 0 %] ! Zarro Boogs found. ! <p> ! <a href="query.cgi">Query Page</a> ! <a href="enter_bug.cgi">Enter New Bug</a> ! <a href="query.cgi?[% urlquerypart FILTER html %]">Edit this query</a> ! </p> ! [% ELSIF bugs.size == 1 %] ! One bug found. ! [% ELSE %] ! [% bugs.size %] bugs found. ! [% END %] <br> - [%############################################################################%] [%# Rest of Change Form #%] --- 106,118 ---- [% IF bugs.size == 0 %] ! [% terms.zeroSearchResults %]. [% ELSIF bugs.size == 1 %] ! One [% terms.bug %] found. [% ELSE %] ! [% bugs.size %] [%+ terms.bugs %] found. [% END %] <br> [%############################################################################%] [%# Rest of Change Form #%] *************** *** 114,156 **** [% IF dotweak %] - [% PROCESS "list/edit-multiple.html.tmpl" %] - </form> - <hr> - [% END %] - [%############################################################################%] [%# Navigation Bar #%] [%############################################################################%] ! [% IF bugs.size > 0 %] ! <form method="post" action="long_list.cgi"> ! <input type="hidden" name="buglist" value="[% buglist %]"> ! <input type="submit" value="Long Format"> ! ! <a href="query.cgi">Query Page</a> ! <a href="enter_bug.cgi">Enter New Bug</a> ! <a href="colchange.cgi?[% urlquerypart FILTER html %]">Change Columns</a> ! [% IF bugs.size > 1 && caneditbugs && !dotweak %] ! <a href="buglist.cgi?[% urlquerypart FILTER html %] ! [%- "&order=$qorder" FILTER html IF order %]&tweak=1">Change Several ! Bugs at Once</a> ! ! [% END %] ! [% IF bugowners %] ! <a href="mailto:[% bugowners %]">Send Mail to Bug Owners</a> [% END %] ! ! <a href="query.cgi?[% urlquerypart FILTER html %]">Edit this Query</a> ! ! </form> ! ! [% END %] --- 120,200 ---- [% IF dotweak %] [% PROCESS "list/edit-multiple.html.tmpl" %] </form> <hr> [% END %] [%############################################################################%] [%# Navigation Bar #%] [%############################################################################%] ! <p> ! <table> ! <tr> ! [% IF bugs.size > 0 %] ! <td valign="middle"> ! <form method="post" action="long_list.cgi"> ! <input type="hidden" name="buglist" value="[% buglist %]"> ! <input type="submit" value="Long Format"> ! </form> ! </td> ! ! <td> </td> ! ! <td valign="middle"> ! <a href="buglist.cgi? ! [% urlquerypart FILTER html %]&ctype=csv">CSV</a> | ! <a href="buglist.cgi? ! [% urlquerypart FILTER html %]&ctype=ics">iCalendar</a> | ! <a href="colchange.cgi? ! [% urlquerypart FILTER html %]">Change Columns</a> | ! [% IF bugs.size > 1 && caneditbugs && !dotweak %] ! <a href="buglist.cgi?[% urlquerypart FILTER html %] ! [%- "&order=$qorder" FILTER html IF order %]&tweak=1" ! >Change Several [% terms.Bugs %] at Once</a> ! | ! [% END %] ! [% IF bugowners %] ! <a href="mailto: ! [% bugowners FILTER html %]">Send Mail to [% terms.Bug %] Owners</a> | ! [% END %] ! </td> [% END %] ! ! <td valign="middle"> ! [% editqueryname = searchname OR defaultsavename OR '' %] ! <a href="query.cgi?[% urlquerypart FILTER html %] ! [% IF editqueryname != '' %]&known_name= ! [% editqueryname FILTER url_quote %] ! [% END %]">Edit Search</a> ! </td> ! ! [% IF searchtype == "saved" %] ! <td valign="middle" nowrap="nowrap"> ! | ! <a href="buglist.cgi?cmdtype=dorem&remaction=forget&namedcmd= ! [% searchname FILTER url_quote %]">Forget Search ' ! [% searchname FILTER html %]'</a> ! </td> ! [% ELSE %] ! <td> </td> ! ! <td valign="middle"> ! <form method="get" action="buglist.cgi"> ! <input type="submit" value="Remember search"> as ! <input type="hidden" name="newquery" ! value="[% urlquerypart FILTER html %]"> ! <input type="hidden" name="cmdtype" value="doit"> ! <input type="hidden" name="remtype" value="asnamed"> ! <input type="text" name="newqueryname" size="20" ! value="[% defaultsavename FILTER html %]"> ! </form> ! </td> ! [% END %] ! </tr> ! </table> ! </p> Index: server-push.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/list/server-push.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** server-push.html.tmpl 28 Jun 2004 00:44:19 -0000 1.1 --- server-push.html.tmpl 15 May 2005 15:04:55 -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,31 **** [%# INTERFACE: ! # debug: boolean. True if we want the query displayed while we wait. # query: string. The SQL query which makes the buglist. #%] ! <html> <head> ! <title>Bugzilla is pondering your query</title> </head> <body> --- 21,33 ---- [%# INTERFACE: ! # debug: boolean. True if we want the search displayed while we wait. # query: string. The SQL query which makes the buglist. #%] ! ! [% PROCESS global/variables.none.tmpl %] ! <html> <head> ! <title>[% terms.Bugzilla %] is pondering your search</title> </head> <body> |
Update of /cvsroot/openfirst/www/htdocs/bugzilla/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32743/reports Modified Files: components.html.tmpl duplicates-simple.html.tmpl duplicates-table.html.tmpl duplicates.html.tmpl keywords.html.tmpl Log Message: Bring templates up to date for Bugzilla 2.18.1 Index: duplicates.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/reports/duplicates.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** duplicates.html.tmpl 28 Jun 2004 00:43:39 -0000 1.1 --- duplicates.html.tmpl 15 May 2005 15:04:55 -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,44 **** [%# INTERFACE: # products: list of strings. The products this user can see. ! # # sortby: string. the column on which we are sorting the buglist. # reverse: boolean. True if we are reversing the current sort. # maxrows: integer. Max number of rows to display. # changedsince: integer. The number of days ago for the changedsince column. ! # openonly: boolean. True if we are only showing open bugs. ! # product: string. Restrict to this product only. # # Additionally, you need to fulfill the interface to # duplicates-table.html.tmpl. #%] ! ! [% IF product %] ! [% title = "Most Frequently Reported Bugs for $product" %] ! [% ELSE %] ! [% title = "Most Frequently Reported Bugs" %] [% END%] ! [% PROCESS global/header.html.tmpl %] <p> --- 22,48 ---- [%# INTERFACE: # products: list of strings. The products this user can see. ! # # sortby: string. the column on which we are sorting the buglist. # reverse: boolean. True if we are reversing the current sort. # maxrows: integer. Max number of rows to display. # changedsince: integer. The number of days ago for the changedsince column. ! # openonly: boolean. True if we are only showing open bugs. ! # query_products: list of strings. The set of products we check for dups. # # Additionally, you need to fulfill the interface to # duplicates-table.html.tmpl. #%] ! ! [% PROCESS global/variables.none.tmpl %] ! ! [% IF query_products.size %] ! [% title = "Most Frequently Reported $terms.Bugs for ${query_products.join(', ')}" %] ! [% ELSE %] ! [% title = "Most Frequently Reported $terms.Bugs" %] [% END%] ! [% PROCESS global/header.html.tmpl ! style = ".resolved { background-color: #d9d9d9; color: #000000; }" ! %] <p> *************** *** 50,56 **** [% PROCESS "reports/duplicates-table.html.tmpl" %] - <br> - <br> - [%# *** Parameters *** %] --- 54,57 ---- *************** *** 68,79 **** work with:</td> <td> ! <input type="radio" name="sortvisible" id="entirelist" value="0" ! [% "checked" IF NOT sortvisible %]> <label for="entirelist"> entire list </label> ! <br> ! <input type="radio" name="sortvisible" id="visiblelist" value="1" ! [% "checked" IF sortvisible %]> <label for="visiblelist"> currently visible list --- 69,80 ---- work with:</td> <td> ! <input type="radio" name="sortvisible" id="entirelist" value="0" ! [% "checked" IF NOT sortvisible %]> <label for="entirelist"> entire list </label> ! <br> ! <input type="radio" name="sortvisible" id="visiblelist" value="1" ! [% "checked" IF sortvisible %]> <label for="visiblelist"> currently visible list *************** *** 85,89 **** [% FOREACH p = products %] <option name="[% p FILTER html %]" ! [% " selected" IF product == p %]>[% p FILTER html %]</option> [% END %] </select> --- 86,91 ---- [% FOREACH p = products %] <option name="[% p FILTER html %]" ! [% " selected" IF lsearch(query_products, p) != -1 %] ! >[% p FILTER html %]</option> [% END %] </select> *************** *** 108,117 **** <td> <label for="openonly"> ! Open bugs only: </label> </td> <td> ! <input type="checkbox" name="openonly" id="openonly" value="1" ! [% "checked" IF openonly %]> </td> </tr> --- 110,119 ---- <td> <label for="openonly"> ! Open [% terms.bugs %] only: </label> </td> <td> ! <input type="checkbox" name="openonly" id="openonly" value="1" ! [% "checked" IF openonly %]> </td> </tr> *************** *** 119,123 **** </table> ! <input type="submit" value="Change"> </form> --- 121,125 ---- </table> ! <input type="submit" value="Change"> </form> *************** *** 125,129 **** <input type="hidden" name="bug_id" value="[% bug_ids_string %]"> <input type="hidden" name="order" value="Reuse same sort as last time"> ! Or just give this to me as a <input type="submit" value="bug list">. (Note: the order may not be the same.) </form> --- 127,131 ---- <input type="hidden" name="bug_id" value="[% bug_ids_string %]"> <input type="hidden" name="order" value="Reuse same sort as last time"> ! Or just give this to me as a <input type="submit" value="[% terms.bug %] list">. (Note: the order may not be the same.) </form> *************** *** 132,146 **** <b> ! <a name="explanation">What are "Most Frequently Reported Bugs"?</a> </b> <blockquote> ! The Most Frequent Bugs page lists the known open bugs which ! are reported most frequently in recent builds. It is ! automatically generated from the Bugzilla database every 24 hours, by ! counting the number of direct and indirect duplicates of bugs. This information is provided in order to assist in minimizing ! the amount of duplicate bugs entered into Bugzilla which in turn cuts down ! on development time. </blockquote> --- 134,148 ---- <b> ! <a name="explanation">What are "Most Frequently Reported [% terms.Bugs %]"?</a> </b> <blockquote> ! The Most Frequent [% terms.Bugs %] page lists the known open [% terms.bugs %] which ! are reported most frequently. It is ! automatically generated from the [% terms.Bugzilla %] database every 24 hours, by ! counting the number of direct and indirect duplicates of [% terms.bugs %]. This information is provided in order to assist in minimizing ! the amount of duplicate [% terms.bugs %] entered into [% terms.Bugzilla %], which ! saves time for Quality Assurance engineers who have to triage the [% terms.bugs %]. </blockquote> *************** *** 148,173 **** <ul> ! <li>Review the most frequent bugs list.</li> ! <li>If problem is listed:</li> <ul> ! <li>Click on Bug # link to confirm that you have found the same bug and ! comment if you have additional information. Or move on with your testing ! of the product. </li> </ul> ! <li>If problem not listed:</li> <ul> ! <li>Go to the <a href="query.cgi">Bugzilla Search</a> ! page to try and locate a similar bug that has already been written.</li> ! <li>If you find your bug in Bugzilla, feel free to comment with any new or ! additional data you may have.</li> ! <li>If you cannot find your problem already documented in Bugzilla, go to ! the ! <a href="http://www.mozilla.org/quality/help/bug-form.html">Bugzilla ! Helper</a> ! and post a new bug.</li> </ul> </ul> --- 150,172 ---- <ul> ! <li>Review the most frequent [% terms.bugs %] list.</li> ! <li>If your problem is listed:</li> <ul> ! <li>Click on the [% terms.bug %] number to confirm that you have found the ! same [% terms.bug %], and comment if you have additional information ! or move on with your testing of the product. </li> </ul> ! <li>If your problem not listed:</li> <ul> ! <li><a href="query.cgi">Try and locate a similar [% terms.bug %]</a> ! that has already been filed.</li> ! <li>If you find your [% terms.bug %] in [% terms.Bugzilla %], ! feel free to comment with any new or additional data you may have.</li> ! <li>If you cannot find your problem already documented in [% terms.Bugzilla %], ! <a href="enter_bug.cgi">file a new [% terms.bug %]</a>.</li> </ul> </ul> Index: duplicates-table.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/reports/duplicates-table.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** duplicates-table.html.tmpl 28 Jun 2004 00:43:39 -0000 1.1 --- duplicates-table.html.tmpl 15 May 2005 15:04:55 -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 *************** *** 31,142 **** # short_desc: string. The bug's summary. # bug_status: string. The bug's status. ! # # bug_ids: list of integers. May be empty. The IDs of the bugs in $bugs. ! # # sortby: string. the column on which we are sorting the buglist. # reverse: boolean. True if we are reversing the current sort. # maxrows: integer. Max number of rows to display. # changedsince: integer. The number of days ago for the changedsince column. ! # openonly: boolean. True if we are only showing open bugs. ! # product: string. Restrict to this product only. #%] ! [%# *** Column Headers *** %] ! <table border> ! <tr bgcolor="#CCCCCC"> ! [% FOREACH column = [ { name => "id", description => "Bug #" }, ! { name => "count", description => "Dupe<br>Count" }, ! { name => "delta", ! description => "Change in last<br>$changedsince day(s)" }, ! { name => "component", description => "Component" }, ! { name => "bug_severity", description => "Severity" }, ! { name => "op_sys", description => "Op Sys" }, ! { name => "target_milestone", ! description => "Target<br>Milestone" }, ! { name => "short_desc", description => "Summary" } ] ! %] ! ! [%# Small hack to keep delta column out if we don't need it %] ! [% NEXT IF column.name == "delta" AND NOT dobefore %] ! <td> ! <center> ! <b> ! [% bug_ids_string = bug_ids.join(',') %] ! <a href="duplicates.cgi?sortby=[% column.name %] ! [% IF sortby == column.name %] ! [% "&reverse=1" IF NOT reverse %] ! [% ELSE %] ! [%-# Some columns start off reversed %] ! [% "&reverse=1" IF column.name.match('delta|count') %] ! [% END %] ! [% "&maxrows=$maxrows" IF maxrows %] ! [% "&changedsince=$changedsince" IF changedsince %] ! [% "&openonly=1" IF openonly %] ! [% "&product=$product" IF product %] ! [% "&format=$format" IF format %] ! [% "&bug_id=$bug_ids_string&sortvisible=1" IF sortvisible %]"> ! [% column.description %]</a> ! </b> ! </center> ! </td> ! [% END %] ! </tr> ! ! [% IF NOT sortby %] ! [% sortby = "count"; reverse = "1" %] ! [% END %] ! [% IF sortby == "id" OR sortby == "count" OR sortby == "delta" %] ! [%# Numeric sort %] ! [% sortedbugs = bugs.nsort(sortby) %] ! [% ELSE %] ! [% sortedbugs = bugs.sort(sortby) %] ! [% END %] ! [% IF reverse %] ! [% bugs = sortedbugs.reverse %] ! [% ELSE %] ! [% bugs = sortedbugs %] ! [% END %] ! [%# *** Buglist *** %] ! [%# We need to keep track of the bug IDs we are actually displaying, because ! # if the user decides to sort the visible list, we need to know what that ! # list actually is. %] ! [% vis_bug_ids = [] %] ! [% FOREACH bug = bugs %] ! [% LAST IF loop.index() >= maxrows %] ! [% vis_bug_ids.push(bug.id) %] ! <tr> ! <td> ! <center> ! [% "<strike>" IF bug.resolution != "" %] ! <a href="show_bug.cgi?id=[% bug.id %]">[% bug.id %]</a> ! [% "</strike>" IF bug.resolution != "" %] ! </center> ! </td> ! <td> ! <center> ! [% bug.count %] ! </center> ! </td> ! [% IF dobefore %] ! <td><center>[% bug.delta %]</center></td> ! [% END %] ! <td>[% bug.component %]</td> ! <td><center>[% bug.bug_severity %]</center></td> ! <td><center>[% bug.op_sys %]</center></td> ! <td><center>[% bug.target_milestone %]</center></td> ! <td>[% bug.short_desc FILTER html %]</td> ! </tr> ! [% END %] ! </table> --- 31,149 ---- # short_desc: string. The bug's summary. # bug_status: string. The bug's status. ! # resolution: string. The bug's resolution, if any. ! # # bug_ids: list of integers. May be empty. The IDs of the bugs in $bugs. ! # # sortby: string. the column on which we are sorting the buglist. # reverse: boolean. True if we are reversing the current sort. # maxrows: integer. Max number of rows to display. # changedsince: integer. The number of days ago for the changedsince column. ! # openonly: boolean. True if we are only showing open bugs. ! # query_products: list of strings. Restrict to these products only. #%] ! ! [% PROCESS global/variables.none.tmpl %] ! [%# *** Column Headers *** %] ! [% IF bug_ids.size > 0 %] ! <table border> ! <tr bgcolor="#CCCCCC"> ! [% FOREACH column = [ { name => "id", description => "$terms.Bug #" }, ! { name => "count", description => "Dupe<br>Count" }, ! { name => "delta", ! description => "Change in last<br>$changedsince day(s)" }, ! { name => "component", description => "Component" }, ! { name => "bug_severity", description => "Severity" }, ! { name => "op_sys", description => "Op Sys" }, ! { name => "target_milestone", ! description => "Target<br>Milestone" }, ! { name => "short_desc", description => "Summary" } ] ! %] ! [%# Small hack to keep delta column out if we don't need it %] ! [% NEXT IF column.name == "delta" AND NOT dobefore %] ! <td> ! <center> ! <b> ! [% bug_ids_string = bug_ids.join(',') %] ! <a href="duplicates.cgi?sortby=[% column.name %] ! [% IF sortby == column.name %] ! [% "&reverse=1" IF NOT reverse %] ! [% ELSE %] ! [%-# Some columns start off reversed %] ! [% "&reverse=1" IF column.name.match('delta|count') %] ! [% END %] ! [% "&maxrows=$maxrows" IF maxrows %] ! [% "&changedsince=$changedsince" IF changedsince %] ! [% "&openonly=1" IF openonly %] ! [% FOREACH p = query_products %]&product=[% p FILTER html %][% END %] ! [% IF format %]&format=[% format FILTER html %][% END %] ! [% "&bug_id=$bug_ids_string&sortvisible=1" ! IF sortvisible %]"> ! [% column.description %]</a> ! </b> ! </center> ! </td> ! [% END %] ! </tr> ! [% IF NOT sortby %] ! [% sortby = "count"; reverse = "1" %] ! [% END %] ! [% IF sortby == "id" OR sortby == "count" OR sortby == "delta" %] ! [%# Numeric sort %] ! [% sortedbugs = bugs.nsort(sortby) %] ! [% ELSE %] ! [% sortedbugs = bugs.sort(sortby) %] ! [% END %] ! [% IF reverse %] ! [% bugs = sortedbugs.reverse %] ! [% ELSE %] ! [% bugs = sortedbugs %] ! [% END %] ! [%# *** Buglist *** %] ! [%# We need to keep track of the bug IDs we are actually displaying, because ! # if the user decides to sort the visible list, we need to know what that ! # list actually is. %] ! [% vis_bug_ids = [] %] ! [% FOREACH bug = bugs %] ! [% LAST IF loop.index() >= maxrows %] ! [% vis_bug_ids.push(bug.id) %] ! <tr [% "class='resolved'" IF bug.resolution != "" %]> ! <td> ! <center> ! [% isclosed = bug.resolution != "" %] ! <a href="show_bug.cgi?id=[% bug.id %]">[% bug.id FILTER closed(isclosed) %]</a> ! </center> ! </td> ! <td> ! <center> ! [% bug.count %] ! </center> ! </td> ! [% IF dobefore %] ! <td><center>[% bug.delta %]</center></td> ! [% END %] ! ! <td>[% bug.component FILTER html %]</td> ! <td><center>[% bug.bug_severity FILTER html %]</center></td> ! <td><center>[% bug.op_sys FILTER html %]</center></td> ! <td><center>[% bug.target_milestone FILTER html %]</center></td> ! <td>[% bug.short_desc FILTER html %]</td> ! </tr> ! [% END %] ! ! </table> ! [% ELSE %] ! <h3>No duplicate [% terms.bugs %] found.</h3> ! [% END %] Index: components.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/reports/components.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** components.html.tmpl 28 Jun 2004 00:43:39 -0000 1.1 --- components.html.tmpl 15 May 2005 15:04:55 -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 *************** *** 80,90 **** </td> <td> ! <a href="mailto:[% comp.initialowner %][% Param('emailsuffix') %]"> [% comp.initialowner FILTER html %]</a> </td> [% IF Param("useqacontact") %] <td> ! <a href="mailto:[% comp.initialqacontact %][% Param('emailsuffix') %]"> ! [% comp.initialqacontact %]</a> </td> [% END %] --- 80,92 ---- </td> <td> ! <a href="mailto:[% comp.initialowner FILTER html %] ! [% Param('emailsuffix') %]"> [% comp.initialowner FILTER html %]</a> </td> [% IF Param("useqacontact") %] <td> ! <a href="mailto:[% comp.initialqacontact FILTER html %] ! [% Param('emailsuffix') %]"> ! [% comp.initialqacontact FILTER html %]</a> </td> [% END %] Index: duplicates-simple.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/reports/duplicates-simple.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** duplicates-simple.html.tmpl 28 Jun 2004 00:43:39 -0000 1.1 --- duplicates-simple.html.tmpl 15 May 2005 15:04:55 -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 *************** *** 23,37 **** # You need to fulfill the interface to duplicates-table.html.tmpl. #%] ! <html> [% IF product %] ! [% title = "Most Frequently Reported Bugs for $product" %] ! [% ELSE %] ! [% title = "Most Frequently Reported Bugs" %] [% END%] <head> ! <title>[% title %]</title> </head> --- 23,39 ---- # You need to fulfill the interface to duplicates-table.html.tmpl. #%] ! ! [% PROCESS global/variables.none.tmpl %] ! <html> [% IF product %] ! [% title = "Most Frequently Reported $terms.Bugs for $product" %] ! [% ELSE %] ! [% title = "Most Frequently Reported $terms.Bugs" %] [% END%] <head> ! <title>[% title FILTER html %]</title> </head> Index: keywords.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/reports/keywords.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** keywords.html.tmpl 28 Jun 2004 00:43:39 -0000 1.1 --- keywords.html.tmpl 15 May 2005 15:04:55 -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 *************** *** 27,33 **** # caneditkeywords: boolean. True if this user can edit keywords %] ! ! [% PROCESS global/header.html.tmpl ! title = "Bugzilla Keyword Descriptions" %] --- 27,35 ---- # caneditkeywords: boolean. True if this user can edit keywords %] ! ! [% PROCESS global/variables.none.tmpl %] ! ! [% PROCESS global/header.html.tmpl ! title = "$terms.Bugzilla Keyword Descriptions" %] *************** *** 37,49 **** </table> [% END %] ! <table border="1" cellpadding="4" cellspacing="0"> <tr bgcolor="#6666FF"> <th align="left">Name</th> <th align="left">Description</th> ! <th align="left">Bugs</th> </tr> ! [% END %] ! <tr> <th> --- 39,51 ---- </table> [% END %] ! <table border="1" cellpadding="4" cellspacing="0"> <tr bgcolor="#6666FF"> <th align="left">Name</th> <th align="left">Description</th> ! <th align="left">[% terms.Bugs %]</th> </tr> ! [% END %] ! <tr> <th> |
|
From: Tim G. <xt...@us...> - 2005-05-15 15:05:07
|
Update of /cvsroot/openfirst/www/htdocs/bugzilla/global In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32743/global Modified Files: banner.html.tmpl choose-product.html.tmpl code-error.html.tmpl footer.html.tmpl header.html.tmpl hidden-fields.html.tmpl message.html.tmpl select-menu.html.tmpl useful-links.html.tmpl user-error.html.tmpl Log Message: Bring templates up to date for Bugzilla 2.18.1 Index: select-menu.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/global/select-menu.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** select-menu.html.tmpl 28 Jun 2004 00:47:42 -0000 1.1 --- select-menu.html.tmpl 15 May 2005 15:04:55 -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 *************** *** 23,26 **** --- 23,30 ---- # name: string; the name of the menu. # + # multiple: boolean; whether or not the menu is multi-select + # + # size: integer; if multi-select, the number of items to display at once + # # options: array or hash; the items with which to populate the array. # If a hash is passed, the hash keys become the names displayed *************** *** 29,32 **** --- 33,38 ---- # default: string; the item selected in the menu by default. # + # onchange: code; JavaScript to be run when the user changes the value + # selected in the menu. #%] *************** *** 38,42 **** [% options_type = BLOCK %][% options %][% END %] ! <select name="[% name FILTER html %]"> [% IF options_type.search("ARRAY") %] [% FOREACH value = options %] --- 44,50 ---- [% options_type = BLOCK %][% options %][% END %] ! <select name="[% name FILTER html %]" ! [% IF onchange %]onchange="[% onchange FILTER html %]"[% END %] ! [% IF multiple %] multiple [% IF size %] size="[% size %]" [% END %] [% END %]> [% IF options_type.search("ARRAY") %] [% FOREACH value = options %] *************** *** 46,50 **** </option> [% END %] ! [% ELSIF values_type.search("HASH") %] [% FOREACH option = options %] <option value="[% option.value FILTER html %]" --- 54,58 ---- </option> [% END %] ! [% ELSIF options_type.search("HASH") %] [% FOREACH option = options %] <option value="[% option.value FILTER html %]" Index: footer.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/global/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:47:42 -0000 1.1 --- footer.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 *************** *** 18,21 **** --- 18,22 ---- # # Contributor(s): Gervase Markham <ge...@ge...> + # Svetlana Harisova <li...@ra...> #%] *************** *** 24,47 **** # global/useful-links.html.tmpl. #%] - - [%# Migration note: this whole file corresponds to the old Param 'footerhtml' %] - - <table border="0"> - <tr> - <td bgcolor="#000000" valign="top"> - <table border="0" cellpadding="10" cellspacing="0" width="100%" - bgcolor="lightyellow"> - <tr> - <td> - - [%# Migration note: this section corresponds to the old Param 'blurbhtml' %] - - This is <b>Bugzilla</b>: the Mozilla bug system. For more - information about what Bugzilla is and what it can do, see - <a href="http://www.bugzilla.org/">bugzilla.org</a>. - - [%# End section %] ! <br> [%# Migration note: useful-links.html.tmpl corresponds to %commandmenu% %] --- 25,39 ---- # global/useful-links.html.tmpl. #%] ! [% INCLUDE "global/help.html.tmpl" %] ! ! [%# Migration note: below this point, this file corresponds to the old Param ! # 'footerhtml' ! #%] ! ! <div id="footer"> ! <div class="intro"></div> ! ! [%# Migration note: the old param 'blurbhtml' goes here %] [%# Migration note: useful-links.html.tmpl corresponds to %commandmenu% %] *************** *** 49,61 **** [% PROCESS "global/useful-links.html.tmpl" %] ! </td> ! </tr> ! </table> ! </td> ! </tr> ! </table> </body> </html> - - [% CALL SyncAnyPendingShadowChanges() IF SyncAnyPendingShadowChanges %] --- 41,47 ---- [% PROCESS "global/useful-links.html.tmpl" %] ! <div class="outro"></div> ! </div> </body> </html> Index: choose-product.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/global/choose-product.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** choose-product.html.tmpl 28 Jun 2004 00:47:41 -0000 1.1 --- choose-product.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,28 **** --- 25,38 ---- #%] + [% PROCESS global/variables.none.tmpl %] + + [% IF target == "enter_bug.cgi" %] + [% title = "Enter $terms.Bug" %] + [% h2 = BLOCK %]First, you must pick a product on which to enter [% terms.abug %]. [% END %] + [% ELSIF target == "describecomponents.cgi" %] + [% title = "$terms.Bugzilla Component Descriptions" %] + [% h2 = "Please specify the product whose components you want described." %] + [% END %] + [% DEFAULT title = "Choose a Product" %] [% PROCESS global/header.html.tmpl %] *************** *** 33,38 **** <tr> <th align="right" valign="top"> ! <a href="[% target %]?product=[% p FILTER url_quote %] ! [% IF format %]&format=[% format FILTER url_quote %][% END %]"> [% p FILTER html %]</a>: </th> --- 43,48 ---- <tr> <th align="right" valign="top"> ! <a href="[% target %]?product=[% p FILTER url_quote -%] ! [%- IF format %]&format=[% format FILTER url_quote %][% END %]"> [% p FILTER html %]</a>: </th> *************** *** 43,47 **** </tr> [% END %] ! </table> --- 53,57 ---- </tr> [% END %] ! </table> Index: user-error.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/global/user-error.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** user-error.html.tmpl 28 Jun 2004 00:47:42 -0000 1.1 --- user-error.html.tmpl 15 May 2005 15:04:55 -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,28 **** [%# INTERFACE: # header_done: boolean. True if the header has already been printed. ! # error: string. The error message to be displayed. May contain HTML. #%] [% UNLESS header_done %] [% PROCESS global/header.html.tmpl %] --- 22,776 ---- [%# INTERFACE: # header_done: boolean. True if the header has already been printed. ! # error: string. The tag of the error, or the error message to be displayed ! # (deprecated). May contain HTML if it's an error message. #%] + + [%# This is a list of all the possible user errors. Please keep them in + # alphabetical order by error tag, and leave a blank line between errors. + # + # Note that you must explicitly filter every single template variable + # in this file; if you do not wish to change it, use the "none" filter. + #%] + + [% PROCESS global/variables.none.tmpl %] + + [% PROCESS "global/field-descs.none.tmpl" %] + + [% DEFAULT title = "Error" %] + + [% error_message = BLOCK %] + [% IF error == "account_creation_disabled" %] + [% title = "Account Creation Disabled" %] + User account creation has been disabled or restricted. + <hr> + New accounts must be created by an administrator. + + [% ELSIF error == "account_disabled" %] + [% title = "Account Disabled" %] + [% disabled_reason FILTER none %] + <hr> + If you believe your account should be restored, please + send email to [% Param("maintainer") %] explaining why. + + [% ELSIF error == "account_exists" %] + [% title = "Account Already Exists" %] + There is already an account with + [% IF email %] + the login name [% email FILTER html %]. + [% ELSE %] + that login name. + [% END %] + + [% ELSIF error == "account_inexistent" %] + [% title = "Account Does Not Exist" %] + There is no [% terms.Bugzilla %] account with that login name. + + [% ELSIF error == "alias_has_comma_or_space" %] + [% title = "Invalid Characters In Alias" %] + The alias you entered, <em>[% alias FILTER html %]</em>, + contains one or more commas or spaces. Aliases cannot contain + commas or spaces because those characters are used to separate + aliases from each other in lists. Please choose another alias + that does not contain commas and spaces. + + [% ELSIF error == "alias_in_use" %] + [% title = "Alias In Use" %] + [% bug_link FILTER none %] has already taken the alias + <em>[% alias FILTER html %]</em>. Please choose another one. + + [% ELSIF error == "alias_is_numeric" %] + [% title = "Alias Is Numeric" %] + You tried to give this [% terms.bug %] the alias <em>[% alias FILTER html %]</em>, + but aliases cannot be merely numbers, since they could + then be confused with [% terms.bug %] IDs. Please choose another + alias containing at least one letter. + + [% ELSIF error == "alias_too_long" %] + [% title = "Alias Too Long" %] + [% terms.Bug %] aliases cannot be longer than 20 characters. + Please choose a shorter alias. + + [% ELSIF error == "auth_cant_create_account" %] + [% title = "Can't create accounts" %] + This site is using an authentication scheme which does not permit + account creation. Please contact an administrator to get a new account + created. + + [% ELSIF error == "authorization_failure" %] + [% title = "Authorization Failed" %] + You are not allowed to [% action FILTER html %]. + + [% ELSIF error == "attachment_access_denied" %] + [% title = "Access Denied" %] + You are not authorized to access this attachment. + + [% ELSIF error == "bug_access_denied" %] + [% title = "Access Denied" %] + You are not authorized to access [% terms.bug %] #[% bug_id FILTER html %]. + + [% ELSIF error == "bug_access_query" %] + [% title = "Access Denied" %] + You are not authorized to access [% terms.bug %] #[% bug_id FILTER html %]. + To see this [% terms.bug %], you must + first <a href="show_bug.cgi?id= + [% bug_id FILTER url_quote %]&GoAheadAndLogIn=1">log + in to an account</a> with the appropriate permissions. + + [% ELSIF error == "buglist_parameters_required" %] + [% title = "Parameters Required" %] + You may not search, or create saved searches, without any search terms. + + [% ELSIF error == "bugs_not_changed" %] + [% title = BLOCK %][% terms.Bugs %] Not Changed[% END %] + Um, you apparently did not change anything on the selected [% terms.bugs %]. + + [% ELSIF error == "chart_too_large" %] + [% title = "Chart Too Large" %] + Sorry, but 2000 x 2000 is the maximum size for a chart. + + [% ELSIF error == "comment_required" %] + [% title = "Comment Required" %] + You have to specify a <b>comment</b> on this change. + Please give some words on the reason for your change. + + [% ELSIF error == "comment_too_long" %] + [% title = "Comment Too Long" %] + Comments cannot be longer than 65,535 characters. + + [% ELSIF error == "dependency_loop_multi" %] + [% title = "Dependency Loop Detected" %] + The following [% terms.bug %](s) would appear on both the "depends on" + and "blocks" parts of the dependency tree if these changes + are committed: [% both FILTER none %]. This would create a circular + dependency, which is not allowed. + + [% ELSIF error == "dependency_loop_single" %] + [% title = "Dependency Loop Detected" %] + You can't make [% terms.abug %] blocked or dependent on itself. + + [% ELSIF error == "description_required" %] + [% title = "Description Required" %] + You must provide a description of the [% terms.bug %]. + + [% ELSIF error == "dupe_of_self_disallowed" %] + [% title = "Cannot mark $terms.abug as a duplicate of itself" %] + You can't mark [% terms.abug %] as a duplicate of itself. + + [% ELSIF error == "email_change_in_progress" %] + [% title = "Email Change Already In Progress" %] + Email change already in progress; please check your email. + + [% ELSIF error == "email_confirmation_failed" %] + [% title = "Email Address Confirmation Failed" %] + Email address confirmation failed. + + [% ELSIF error == "entry_access_denied" %] + [% title = "Permission Denied" %] + Sorry, either the product <em>[% product FILTER html %]</em> does not + exist, or you don't have the required permissions to + enter [% terms.abug %] against that product. + + [% ELSIF error == "file_not_specified" %] + [% title = "No File Specified" %] + You did not specify a file to attach. + + [% ELSIF error == "file_too_large" %] + [% title = "File Too Large" %] + The file you are trying to attach is [% filesize FILTER html %] + kilobytes (KB) in size. + Non-patch attachments cannot be more than [% Param('maxattachmentsize') %] + KB. + If your attachment is an image, try converting it to a compressable + format like JPG or PNG, or put it elsewhere on the web and + link to it from the [% terms.bug %]'s URL field or a comment in + the [% terms.bug %]. + + [% ELSIF error == "flag_requestee_unauthorized" %] + [% title = "Flag Requestee Not Authorized" %] + + You asked [% requestee.identity FILTER html %] + for <code>[% flag_type.name FILTER html %]</code> on [% terms.bug %] + [% bug_id FILTER html -%] + [% IF attach_id %], attachment [% attach_id FILTER html %][% END %], + but that [% terms.bug %] has been restricted to users in certain groups, + and the user you asked isn't in all the groups to which + the [% terms.bug %] has been restricted. + Please choose someone else to ask, or make the [% terms.bug %] accessible to users + on its CC: list and add that user to the list. + + [% ELSIF error == "flag_requestee_unauthorized_attachment" %] + [% title = "Flag Requestee Not Authorized" %] + + You asked [% requestee.identity FILTER html %] + for <code>[% flag_type.name FILTER html %]</code> on + [%+ terms.bug %] [%+ bug_id FILTER html %], + attachment [% attach_id FILTER html %], but that attachment is restricted + to users + in the [% Param("insidergroup") FILTER html %] group, and the user + you asked isn't in that group. Please choose someone else to ask, + or ask an administrator to add the user to the group. + + [% ELSIF error == "flag_type_cc_list_invalid" %] + [% title = "Flag Type CC List Invalid" %] + The CC list [% cc_list FILTER html %] must be less than 200 characters long. + + [% ELSIF error == "flag_type_description_invalid" %] + [% title = "Flag Type Description Invalid" %] + The description must be less than 32K. + + [% ELSIF error == "flag_type_name_invalid" %] + [% title = "Flag Type Name Invalid" %] + The name <em>[% name FILTER html %]</em> must be 1-50 characters long + and must not contain any spaces or commas. + + [% ELSIF error == "format_not_found" %] + [% title = "Format Not Found" %] + The requested format <em>[% format FILTER html %]</em> does not exist with + a content type of <em>[% ctype FILTER html %]</em>. + + [% ELSIF error == "flag_type_sortkey_invalid" %] + [% title = "Flag Type Sort Key Invalid" %] + The sort key must be an integer between 0 and 32767 inclusive. + It cannot be <em>[% sortkey FILTER html %]</em>. + [% ELSIF error == "illegal_at_least_x_votes" %] + [% title = "Your Search Makes No Sense" %] + The <em>At least ___ votes</em> field must be a simple number. + You entered <tt>[% value FILTER html %]</tt>, which isn't. + + [% ELSIF error == "illegal_attachment_edit" %] + [% title = "Unauthorised Action" %] + You are not authorised to edit attachment [% attach_id FILTER html %]. + + [% ELSIF error == "illegal_attachment_edit_bug" %] + [% title = "Unauthorised Action" %] + You are not authorised to edit attachments on [% terms.bug %] + [%+ bug_id FILTER html %]. + + [% ELSIF error == "illegal_attachment_is_patch" %] + [% title = "Your Search Makes No Sense" %] + The only legal values for the <em>Attachment is patch</em> field are + 0 and 1. + + [% ELSIF error == "illegal_change" %] + [% title = "Not allowed" %] + You tried to change the + <strong>[% field_descs.$field FILTER html %]</strong> field + from <em>[% oldvalue FILTER html %]</em> to + <em>[% newvalue FILTER html %]</em>, + but only the owner or submitter of the [% terms.bug %], or a + sufficiently empowered user, may change that field. + + [% ELSIF error == "illegal_changed_in_last_x_days" %] + [% title = "Your Search Makes No Sense" %] + The <em>Changed in last ___ days</em> field must be a simple number. + You entered <tt>[% value FILTER html %]</tt>, which isn't. + + [% ELSIF error == "illegal_date" %] + [% title = "Illegal Date" %] + '<tt>[% date FILTER html %]</tt>' is not a legal date. + + [% ELSIF error == "illegal_email_address" %] + [% title = "Invalid Email Address" %] + The e-mail address you entered (<b>[% addr FILTER html %]</b>) + didn't pass our syntax checking for a legal email address. + [%+ Param('emailregexpdesc') %] + It must also not contain any of these special characters: + <tt>\ ( ) & < > , ; : " [ ]</tt>, or any whitespace. + + [% ELSIF error == "illegal_frequency" %] + [% title = "Too Frequent" %] + Unless you are an administrator, you may not create series which are + run more often than once every [% minimum FILTER html %] days. + + [% ELSIF error == "illegal_group_control_combination" %] + [% title = "Your Group Control Combination Is Illegal" %] + Your group control combination for group " + [% groupname FILTER html %]" is illegal. + + [% ELSIF error == "illegal_is_obsolete" %] + [% title = "Your Search Makes No Sense" %] + The only legal values for the <em>Attachment is obsolete</em> field are + 0 and 1. + + [% ELSIF error == "illegal_query_name" %] + [% title = "Illegal Search Name" %] + The name of your search cannot contain any of the following characters: + <, >, &. + + [% ELSIF error == "illegal_series_creation" %] + You are not authorised to create series. + + [% ELSIF error == "illegal_series_edit" %] + You are not authorised to edit this series. To do this, you must either + be its creator, or an administrator. + + [% ELSIF error == "insufficient_data" %] + [% title = "Insufficient Data" %] + None of the series you selected have any data associated with them, so a + chart cannot be plotted. + + [% ELSIF error == "insufficient_data_points" %] + We don't have enough data points to make a graph (yet). + + [% ELSIF error == "insufficient_privs_for_multi" %] + [% title = "Insufficient Privileges" %] + Sorry, you do not have sufficient privileges to edit multiple + [% terms.bugs %]. + + [% ELSIF error == "invalid_attach_id" %] + [% title = "Invalid Attachment ID" %] + The attachment id [% attach_id FILTER html %] is invalid. + + [% ELSIF error == "invalid_bug_id_non_existent" %] + [% title = BLOCK %]Invalid [% terms.Bug %] ID[% END %] + [% terms.Bug %] #[% bug_id FILTER html %] does not exist. + + [% ELSIF error == "invalid_bug_id_or_alias" %] + [% title = BLOCK %]Invalid [% terms.Bug %] ID[% END %] + [% IF bug_id %] + '[% bug_id FILTER html %]' is not a valid [% terms.bug %] number + [% IF Param("usebugaliases") %] + nor an alias to [% terms.abug %] number + [% END %]. + [% ELSE %] + [% IF field %] + The '[% field_descs.$field FILTER html %]' field + cannot be empty. + [% END %] + You must enter a valid [% terms.bug %] number! + [% END %] + <noscript> + If you are trying to use QuickSearch, you need to enable + JavaScript in your browser. + </noscript> + + [% ELSIF error == "invalid_changedsince" %] + [% title = "Invalid 'Changed Since'" %] + The 'changed since' value, '[% changedsince FILTER html %]', must be an + integer >= 0. + + [% ELSIF error == "invalid_content_type" %] + [% title = "Invalid Content-Type" %] + The content type <em>[% contenttype FILTER html %]</em> is invalid. + Valid types must be of the form <em>foo/bar</em> where <em>foo</em> + is either <em>application, audio, image, message, model, multipart, + text,</em> or <em>video</em>. + + [% ELSIF error == "invalid_context" %] + [% title = "Invalid Context" %] + The context [% context FILTER html %] is invalid (must be a number, + "file" or "patch"). + + [% ELSIF error == "invalid_format" %] + [% title = "Invalid Format" %] + The format "[% format FILTER html %]" is invalid (must be one of + [% FOREACH my_format = formats %] + "[% my_format FILTER html %]" + [% END %] + ). + + [% ELSIF error == "invalid_maxrows" %] + [% title = "Invalid Max Rows" %] + The maximum number of rows, '[% maxrows FILTER html %]', must be + a positive integer. + + [% ELSIF error == "invalid_product_name" %] + [% title = "Invalid Product Name" %] + The product name '[% product FILTER html %]' is invalid or does not exist. + + [% ELSIF error == "invalid_username" %] + [% title = "Invalid Username" %] + The name <tt>[% name FILTER html %]</tt> is not a valid username. + Either you misspelled it, or the person has not + registered for a [% terms.Bugzilla %] account. + + [% ELSIF error == "invalid_username_or_password" %] + [% title = "Invalid Username Or Password" %] + The username or password you entered is not valid. + + [% ELSIF error == "keyword_access_denied" %] + [% title = "Access Denied" %] + Sorry, you aren't a member of the 'editkeywords' group, and so + you aren't allowed to add, modify or delete keywords. + + [% ELSIF error == "keyword_already_exists" %] + [% title = "Keyword Already Exists" %] + A keyword with the name [% name FILTER html %] already exists. + + [% ELSIF error == "keyword_blank_description" %] + [% title = "Blank Keyword Description Not Allowed" %] + You must enter a non-blank description for the keyword. + + [% ELSIF error == "keyword_blank_name" %] + [% title = "Blank Keyword Name Not Allowed" %] + You must enter a non-blank name for the keyword. + + [% ELSIF error == "keyword_invalid_name" %] + [% title = "Invalid Keyword Name" %] + You may not use commas or whitespace in a keyword name. + + [% ELSIF error == "login_needed_for_password_change" %] + [% title = "Login Name Required" %] + You must enter a login name when requesting to change your password. + + [% ELSIF error == "milestone_required" %] + [% title = "Milestone Required" %] + You must determine a target milestone for [% terms.bug %] + [%+ bug_id FILTER html %] + if you are going to accept it. Part of accepting + [% terms.abug %] is giving an estimate of when it will be fixed. + + [% ELSIF error == "misarranged_dates" %] + [% title = "Misarranged Dates" %] + Your start date ([% datefrom FILTER html %]) is after + your end date ([% dateto FILTER html %]). + + [% ELSIF error == "missing_attachment_description" %] + [% title = "Missing Attachment Description" %] + You must enter a description for the attachment. + + [% ELSIF error == "missing_category" %] + [% title = "Missing Category" %] + You did not specify a category for this series. + + [% ELSIF error == "missing_content_type" %] + [% title = "Missing Content-Type" %] + You asked [% terms.Bugzilla %] to auto-detect the content type, but + your browser did not specify a content type when uploading the file, + so you must enter a content type manually. + + [% ELSIF error == "missing_content_type_method" %] + [% title = "Missing Content-Type Determination Method" %] + You must choose a method for determining the content type, + either <em>auto-detect</em>, <em>select from list</em>, or <em>enter + manually</em>. + + [% ELSIF error == "missing_cookie" %] + [% title = "Missing Cookie" %] + Sorry, I seem to have lost the cookie that recorded + the results of your last search. I'm afraid you will have to start + again on the <a href="query.cgi">search page</a>. + + [% ELSIF error == "missing_datasets" %] + [% title = "No Datasets Selected" %] + You must specify one or more datasets to plot. + + [% ELSIF error == "missing_email_type" %] + [% title = "Your Search Makes No Sense" %] + You must specify one or more fields in which to search for + <tt>[% email FILTER html %]</tt>. + + [% ELSIF error == "missing_frequency" %] + [% title = "Missing Frequency" %] + You did not specify a valid frequency for this series. + + [% ELSIF error == "missing_name" %] + [% title = "Missing Name" %] + You did not specify a name for this series. + + [% ELSIF error == "missing_query" %] + [% title = "Missing Search" %] + The search named <em>[% queryname FILTER html %]</em> does not + exist. + + [% ELSIF error == "must_be_patch" %] + [% title = "Attachment Must Be Patch" %] + Attachment #[% attach_id FILTER html %] must be a patch. + + [% ELSIF error == "missing_subcategory" %] + [% title = "Missing Subcategory" %] + You did not specify a subcategory for this series. + + [% ELSIF error == "need_component" %] + [% title = "Component Required" %] + You must specify a component to help determine the new owner of these + [% terms.bugs %]. + + [% ELSIF error == "need_product" %] + [% title = "Product Required" %] + You must specify a product to help determine the new owner of these [% terms.bugs %]. + + [% ELSIF error == "need_quip" %] + [% title = "Quip Required" %] + Please enter a quip in the text field. + + [% ELSIF error == "new_password_missing" %] + [% title = "New Password Missing" %] + You must enter a new password. + + [% ELSIF error == "no_axes_defined" %] + [% title = "No Axes Defined" %] + You didn't define any axes to plot. + + [% ELSIF error == "no_bugs_chosen" %] + [% title = BLOCK %]No [% terms.Bugs %] Chosen[% END %] + You apparently didn't choose any [% terms.bugs %] to modify. + + [% ELSIF error == "no_component_change_for_multiple_products" %] + [% title = "Action Not Permitted" %] + You cannot change the component for a list of [% terms.bugs %] covering more than + one product. + + [% ELSIF error == "no_components" %] + [% title = "No Components" %] + Sorry; there needs to be at least one component for this product in order + to create a new [% terms.bug %]. + [% IF UserInGroup("editcomponents") %] + <a href="editcomponents.cgi?product=[% product FILTER url_quote %]">Create + a new component</a>. + [% ELSE %] + Please contact [% Param("maintainer") %], giving the name of + the product in which you tried to create a new [% terms.bug %]. + [% END %] + + [% ELSIF error == "no_dupe_stats" %] + [% title = "Cannot Find Duplicate Statistics" %] + There are no duplicate statistics for today ([% today FILTER html %]) + or yesterday. + + [% ELSIF error == "no_dupe_stats_error_today" %] + [% title = "Error Reading Today's Dupes File" %] + An error occurred opening today's dupes file: [% error_msg FILTER html %]. + + [% ELSIF error == "no_dupe_stats_error_whenever" %] + [% title = "Error Reading Previous Dupes File" %] + An error occurred opening [% changedsince FILTER html %] days ago + ([% whenever FILTER html %])'s dupes file: + [% error_msg FILTER html %]. + + [% ELSIF error == "no_dupe_stats_error_yesterday" %] + [% title = "Error Reading Yesterday's Dupes File" %] + There are no duplicate statistics for today ([% today FILTER html %]), + and an error + occurred opening yesterday's dupes file: [% error_msg FILTER html %]. + + [% ELSIF error == "no_html_in_quips" %] + [% title = "No HTML In Quips" %] + Sorry - for security reasons, support for HTML tags has been turned off + in quips. + + [% ELSIF error == "no_new_quips" %] + [% title = "No New Quips" %] + This site does not permit the addition of new quips. + + [% ELSIF error == "no_page_specified" %] + [% title = "No Page Specified" %] + You did not specify the id of a page to display. + + [% ELSIF error == "no_products" %] + [% title = "No Products" %] + Either no products have been defined to enter [% terms.bugs %] against or you have not + been given access to any. + + [% ELSIF error == "number_not_numeric" %] + [% title = "Numeric Value Required" %] + The value '[% num FILTER html %]' in the + <em>[% field_descs.$field FILTER html %]</em> field + is not a numeric value. + + [% ELSIF error == "number_too_large" %] + [% title = "Number Too Large" %] + The value '[% num FILTER html %]' in the + <em>[% field_descs.$field FILTER html %]</em> field + is more than the maximum allowable value of '[% max_num FILTER html %]'. + + [% ELSIF error == "number_too_small" %] + [% title = "Number Too Small" %] + The value '[% num FILTER html %]' + in the <em>[% field_descs.$field FILTER html %]</em> field + is less than the minimum allowable value of '[% min_num FILTER html %]'. + + [% ELSIF error == "old_password_incorrect" %] + [% title = "Incorrect Old Password" %] + You did not enter your old password correctly. + + [% ELSIF error == "old_password_required" %] + [% title = "Old Password Required" %] + You must enter your old password to change your email address. + + [% ELSIF error == "passwords_dont_match" %] + [% title = "Passwords Don't Match" %] + The two passwords you entered did not match. + + [% ELSIF error == "password_too_long" %] + [% title = "Password Too Long" %] + The password is more than 16 characters long. It must be no more than + 16 characters. + + [% ELSIF error == "password_too_short" %] + [% title = "Password Too Short" %] + The password is less than three characters long. It must be at least + three characters. + + [% ELSIF error == "patch_too_large" %] + [% title = "File Too Large" %] + The file you are trying to attach is [% filesize FILTER html %] + kilobytes (KB) in size. + Patches cannot be more than [% Param('maxpatchsize') %] KB in size. + Try breaking your patch into several pieces. + + [% ELSIF error == "product_disabled" %] + [% title = BLOCK %]Product closed for [% terms.Bugs %] Entry[% END %] + Sorry, entering [% terms.bugs %] into + product <em>[% product FILTER html %]</em> has been disabled. + + [% ELSIF error == "product_edit_denied" %] + [% title = "Product Edit Access Denied" %] + You are not permitted to edit [% terms.bugs %] in product + [% product FILTER html %]. + + [% ELSIF error == "query_name_missing" %] + [% title = "No Search Name Specified" %] + You must enter a name for your search. + + [% ELSIF error == "quips_disabled" %] + [% title = "Quips Disabled" %] + Quips are disabled. + + [% ELSIF error == "quips_edit_denied" %] + [% title = "Permission Denied" %] + You do not have permission to edit quips. + + [% ELSIF error == "reassign_to_empty" %] + [% title = "Illegal Reassignment" %] + To reassign [% terms.abug %], you must provide an address for + the new owner. If you did not intentionally clear out the + "Reassign [% terms.bug %] to" field, [% Param("browserbugmessage") %] + + [% ELSIF error == "report_access_denied" %] + [% title = "Access Denied" %] + You do not have the permissions necessary to view reports for this product. + + [% ELSIF error == "require_component" %] + [% title = "Component Needed" %] + You must choose a component to file this [% terms.bug %] in. If necessary, + just guess. + + [% ELSIF error == "require_new_password" %] + [% title = "New Password Needed" %] + You cannot change your password without choosing a new one. + + [% ELSIF error == "require_summary" %] + [% title = "Summary Needed" %] + You must enter a summary for this [% terms.bug %]. + + [% ELSIF error == "resolving_remaining_time" %] + [% title = "Trying to Resolve with Hours Remaining" %] + You cannot resolve [% terms.abug %] with hours still remaining. Set + Remaining Hours to zero if you want to resolve the [% terms.bug %]. + + [% ELSIF error == "sanity_check_access_denied" %] + [% title = "Access Denied" %] + You do not have the permissions necessary to run a sanity check. + + [% ELSIF error == "search_content_without_matches" %] + [% title = "Illegal Search" %] + The "content" field can only be used with "matches" search + and the "matches" search can only be used with the "content" + field. + + [% ELSIF error == "series_already_exists" %] + [% title = "Series Already Exists" %] + A series named <em>[% series.category FILTER html %] / + [%+ series.subcategory FILTER html %] / + [%+ series.name FILTER html %]</em> + already exists. + + [% ELSIF error == "sidebar_supports_mozilla_only" %] + Sorry - sidebar.cgi currently only supports Mozilla based web browsers. + <a href="http://www.mozilla.org">Upgrade today</a>. :-) + + [% ELSIF error == "still_unresolved_bugs" %] + [% IF dependency_count == 1 %] + [% terms.Bug %]# <a href="show_bug.cgi?id=[% dependencies.0.bug_id FILTER none %]">[% dependencies.0.bug_id FILTER none %]</a> + has still [% dependencies.0.dependencies FILTER html %] unresolved + [% IF dependencies.0.dependencies == 1 %] + dependency + [% ELSE %] + dependencies + [% END %]. Show + <a href="showdependencytree.cgi?id=[% dependencies.0.bug_id FILTER none %]">Dependency Tree</a>. + [% ELSE %] + There are [% dependency_count FILTER none %] open [% terms.bugs %] which + have unresolved dependencies. + <br> + [% FOREACH bug = dependencies %] + [% terms.Bug %]# <a href="show_bug.cgi?id=[% bug.bug_id FILTER none %]">[% bug.bug_id FILTER none %]</a> + has [% bug.dependencies FILTER html %] open + [% IF bug.dependencies == 1 %] + dependency. + [% ELSE %] + dependencies. + [% END %] + (<a href="showdependencytree.cgi?id=[% bug.bug_id FILTER none %]">Dependency Tree</a>)<br> + [% END %] + [% END %] + + [% ELSIF error == "too_many_votes_for_bug" %] + [% title = "Illegal Vote" %] + You may only use at most [% max FILTER html %] votes for a single + [%+ terms.bug %] in the + <tt>[% prod FILTER html %]</tt> product, but you are trying to + use [% votes FILTER html %]. + + [% ELSIF error == "too_many_votes_for_product" %] + [% title = "Illegal Vote" %] + You tried to use [% votes FILTER html %] votes, + which exceeds the [% max FILTER html %] vote per [% terms.bug %] limit + for the <tt>[% prod FILTER html %]</tt> product. + + [% ELSIF error == "token_inexistent" %] + [% title = "Token Does Not Exist" %] + The token you submitted does not exist, has expired, or has + been cancelled. + + [% ELSIF error == "too_soon_for_new_token" %] + [% title = "Too Soon For New Token" %] + You have requested a password token too recently to request + another. Please wait a while and try again. + + [% ELSIF error == "unknown_keyword" %] + [% title = "Unknown Keyword" %] + <code>[% keyword FILTER html %]</code> is not a known keyword. + The legal keyword names are <a href="describekeywords.cgi">listed here</a>. + + [% ELSIF error == "unknown_tab" %] + [% title = "Unknown Tab" %] + <code>[% current_tab_name FILTER html %]</code> is not a legal tab name. + + [% ELSIF error == "votes_must_be_nonnegative" %] + [% title = "Votes Must Be Non-negative" %] + Only use non-negative numbers for your [% terms.bug %] votes. + + [% ELSIF error == "wrong_token_for_cancelling_email_change" %] + [% title = "Wrong Token" %] + That token cannot be used to cancel an email address change. + + [% ELSIF error == "wrong_token_for_changing_passwd" %] + [% title = "Wrong Token" %] + That token cannot be used to change your password. + + [% ELSIF error == "wrong_token_for_confirming_email_change" %] + [% title = "Wrong Token" %] + That token cannot be used to change your email address. + + [% ELSIF error == "value_out_of_range" %] + [% title = "Value Out Of Range" %] + Value is out of range for field + <em>[% field_descs.$field FILTER html %]</em>. + + [% ELSIF error == "zero_length_file" %] + [% title = "File Is Empty" %] + The file you are trying to attach is empty! + + [% ELSE %] + [% title = "Error string not found" %] + The user error string <code>[% error FILTER html %]</code> was not found. + Please send email to [% Param("maintainer") %] describing the steps taken + to obtain this message. + [% END %] + [% END %] + [% UNLESS header_done %] [% PROCESS global/header.html.tmpl %] *************** *** 33,37 **** <td bgcolor="#ff0000"> <font size="+2"> ! [% error %] </font> </td> --- 781,785 ---- <td bgcolor="#ff0000"> <font size="+2"> ! [% error_message FILTER none %] </font> </td> *************** *** 43,45 **** --- 791,815 ---- </p> + [%# If a saved search fails, people want the ability to edit or delete it. + # This is the best way of getting information about that possible saved + # search from any error call location. %] + + [% USE Bugzilla %] + [% namedcmd = Bugzilla.cgi.param("namedcmd") %] + [% IF namedcmd AND error != "missing_query" %] + <p> + Alternatively, you can + <a href="buglist.cgi?cmdtype=dorem&remaction=forget&namedcmd= + [% namedcmd FILTER html %]">forget</a> + + [% FOREACH q = Bugzilla.user.queries %] + [% IF q.name == namedcmd %] + or <a href="query.cgi?[% q.query FILTER html %]">edit</a> + [% END %] + [% END %] + + the saved search '[% namedcmd FILTER html %]'. + </p> + [% END %] + [% PROCESS global/footer.html.tmpl %] Index: header.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/global/header.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** header.html.tmpl 28 Jun 2004 00:47:42 -0000 1.1 --- header.html.tmpl 15 May 2005 15:04:55 -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,21 **** --- 18,22 ---- # # Contributor(s): Gervase Markham <ge...@ge...> + # Vaskin Kissoyan <vki...@ya...> #%] *************** *** 25,30 **** # h1: string. Main page header. # h2: string. Page subheader. ! # header_html: string. Any other HTML to go inside the <head> tags. # javascript: string. Javascript to go in the header. # style: string. CSS style. # style_urls: list. List of URLs to CSS style sheets. --- 26,36 ---- # h1: string. Main page header. # h2: string. Page subheader. ! # h3: string. Right-aligned subheader. ! # bgcolor: string. the page's background color ("#rrggbb"). ! # bodyattrs: any extra attributes for the <body> tag ! # bodyclasses: array of extra CSS classes for the <body> ! # onload: string. JavaScript code to run when the page finishes loading. # javascript: string. Javascript to go in the header. + # javascript_urls: list. List of URLs to Javascript # style: string. CSS style. # style_urls: list. List of URLs to CSS style sheets. *************** *** 32,50 **** #%] [% DEFAULT - h1 = title h2 = "" ! bgcolor = "#FFFFFF" onload = "" %] <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <title>[% title FILTER html %]</title> ! [%# Migration note: contents of the old Param 'headerhtml' would go here %] ! [% header_html %] ! [% IF javascript %] <script type="text/javascript" language="JavaScript"> --- 38,71 ---- #%] + [% IF message %] + [% PROCESS global/messages.html.tmpl %] + [% END %] + [% DEFAULT h2 = "" ! h3 = "" ! bgcolor = "#ffffff" onload = "" + bodyattrs = "" %] + + [%# We should be able to set the default value of the h1 variable + # to the value of the title variable using the DEFAULT directive, + # but that doesn't work if a caller sets h1 to the empty string + # to avoid h1 inheriting the value of title, since DEFAULT + # mistakenly treats empty strings as undefined and gives h1 the + # value of title anyway. To get around that problem we explicitly + # set h1's default value here only if it is undefined. %] + [% IF !h1.defined %][% h1 = title %][% END %] + <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <title>[% title FILTER html %]</title> ! [%# Migration note: contents of the old Param 'headerhtml' would go here %] ! [% PROCESS "global/site-navigation.html.tmpl" %] ! [% IF javascript %] <script type="text/javascript" language="JavaScript"> *************** *** 53,56 **** --- 74,87 ---- [% END %] + [% IF javascript_urls %] + [% FOREACH javascript_url = javascript_urls %] + <script src="[% javascript_url FILTER html %]" type="text/javascript" language="JavaScript"></script> + [% END %] + [% END %] + + [%+ INCLUDE "global/help-header.html.tmpl" %] + + <link href="css/global.css" rel="stylesheet" type="text/css"> + [% IF style %] <style type="text/css"> *************** *** 58,62 **** </style> [% END %] ! [% IF style_urls %] [% FOREACH style_url = style_urls %] --- 89,93 ---- </style> [% END %] ! [% IF style_urls %] [% FOREACH style_url = style_urls %] *************** *** 64,84 **** [% END %] [% END %] ! </head> ! [%# Migration note: contents of the old Param 'bodyhtml' go in the body tag, # but set the bgcolor and onload attributes in the DEFAULT directive above. #%] ! <body bgcolor="[% bgcolor %]" onload="[% onload %]"> [%# Migration note: the following file corresponds to the old Param # 'bannerhtml' #%] ! [% INCLUDE global/banner.html.tmpl %] ! [% IF h1 || h2 %] ! <table border="0" cellspacing="0"> <tr> <td valign="top" align="left"> --- 95,120 ---- [% END %] [% END %] ! </head> ! [%# Migration note: contents of the old Param 'bodyhtml' go in the body tag, # but set the bgcolor and onload attributes in the DEFAULT directive above. #%] ! <body bgcolor="[% bgcolor %]" onload="[% onload %]" ! class="[% Param('urlbase').replace('^https?://','').replace('/$','').replace('[-~@:/.]+','-') %] ! [% FOREACH class = bodyclasses %] ! [% ' ' %][% class FILTER css_class_quote %] ! [% END %]" ! [% bodyattrs %]> [%# Migration note: the following file corresponds to the old Param # 'bannerhtml' #%] ! [% INCLUDE global/banner.html.tmpl %] ! [% IF h1 || h2 %] ! <table border="0" cellspacing="0" width="100%"> <tr> <td valign="top" align="left"> *************** *** 91,96 **** </table> </td> ! <td valign="middle"> </td> <td valign="middle" align="left">[% h2 %]</td> </tr> </table> --- 127,135 ---- </table> </td> ! <td valign="middle" align="left"> </td> <td valign="middle" align="left">[% h2 %]</td> + [% IF h3 %] + <td valign="middle" align="right">[% h3 %]</td> + [% END %] </tr> </table> Index: message.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/global/message.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** message.html.tmpl 28 Jun 2004 00:47:42 -0000 1.1 --- message.html.tmpl 15 May 2005 15:04:55 -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 *************** *** 19,23 **** # Contributor(s): #%] ! [%# INTERFACE: # url: string. An optional URL to go to. --- 19,23 ---- # Contributor(s): #%] ! [%# INTERFACE: # url: string. An optional URL to go to. *************** *** 25,37 **** #%] ! [% DEFAULT title = "Bugzilla Message" %] [% PROCESS global/header.html.tmpl %] ! [%# The "header" template automatically displays the contents of a "message" ! variable if it finds one, so it is not necessary to display the message ! here. %] ! [%# Display a URL if the calling script has included one. %] [% IF url && link %] <p> --- 25,38 ---- #%] ! [% PROCESS global/variables.none.tmpl %] ! ! [% DEFAULT title = "$terms.Bugzilla Message" %] [% PROCESS global/header.html.tmpl %] ! [%# The "header" template automatically displays a message if it finds one. ! Note that the global messages list is in messages.html.tmpl. %] ! [%# Display a URL if the calling script or message block has included one. %] [% IF url && link %] <p> Index: code-error.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/global/code-error.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** code-error.html.tmpl 28 Jun 2004 00:47:42 -0000 1.1 --- code-error.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 *************** *** 22,30 **** [%# INTERFACE: # header_done: boolean. True if the header has already been printed. ! # error: string. The error message to be printed. May contain HTML. # variables: hash. Useful data about the problem. The keys are the variable # names, and the values the variable values. #%] [% UNLESS header_done %] [% PROCESS global/header.html.tmpl %] --- 22,244 ---- [%# INTERFACE: # header_done: boolean. True if the header has already been printed. ! # error: string. The tag of the error. # variables: hash. Useful data about the problem. The keys are the variable # names, and the values the variable values. #%] + + [%# This is a list of all the possible code errors. Please keep them in + # alphabetical order by error tag, and leave a blank line between errors. + # + # Note that you must explicitly filter every single template variable + # in this file; if you do not wish to change it, use the "none" filter. + #%] + + [% PROCESS global/variables.none.tmpl %] + + [% DEFAULT title = "Internal Error" %] + + [% error_message = BLOCK %] + [% IF error == "action_unrecognized" %] + I don't recognize the value (<em>[% action FILTER html %]</em>) + of the <em>action</em> variable. + + [% ELSIF error == "attachment_already_obsolete" %] + Attachment #[% attach_id FILTER html %] ([% description FILTER html %]) + is already obsolete. + + [% ELSIF error == "auth_err" %] + [% title = "Internal Authentication Error" %] + [%# Authentication errors are in a template depending on the auth method, + for pluggability. + #%] + [% INCLUDE "account/auth/$authmethod-error.html.tmpl" %] + + [% ELSIF error == "authres_unhandled" %] + An authorization handler return value was not handled by the login code. + + [% ELSIF error == "bad_page_cgi_id" %] + [% title = "Invalid Page ID" %] + The ID <code>[% page_id FILTER html %]</code> is not a + valid page identifier. + + [% ELSIF error == "bug_error" %] + Trying to retrieve [% terms.bug %] [%+ bug.bug_id FILTER html %] returned + the error [% bug.error FILTER html %]. + + [% ELSIF error == "chart_data_not_generated" %] + The tool which gathers [% terms.bug %] counts has not been run yet. + + [% ELSIF error == "chart_datafile_corrupt" %] + The chart data file [% file FILTER html %] is corrupt. + + [% ELSIF error == "chart_dir_nonexistent" %] + One of the directories <tt>[% dir FILTER html %]</tt> and + <tt>[% graphdir FILTER html %]</tt> does not exist. + [% ELSIF error == "chart_file_open_fail" %] + Unable to open the chart datafile <tt>[% filename FILTER html %]</tt>. + + [% ELSIF error == "chart_lines_not_installed" %] + Charts will not work without the Chart::Lines Perl module being installed. + Run checksetup.pl for installation instructions. + + [% ELSIF error == "field_type_mismatch" %] + Cannot seem to handle <code>[% field FILTER html %]</code> + and <code>[% type FILTER html %]</code> together. + + [% ELSIF error == "gd_not_installed" %] + Charts will not work without the GD Perl module being installed. + Run checksetup.pl for installation instructions. + + [% ELSIF error == "illegal_content_type_method" %] + Your form submission got corrupted somehow. The <em>content + method</em> field, which specifies how the content type gets determined, + should have been either <em>autodetect</em>, <em>list</em>, + or <em>manual</em>, but was instead + <em>[% contenttypemethod FILTER html %]</em>. + + [% ELSIF error == "illegal_field" %] + A legal [% field FILTER html %] was not set. + + [% ELSIF error == "inactive_group" %] + Attempted to add [% terms.bug %] to an inactive group, identified by the bit + '[% bit FILTER html %]'. + + [% ELSIF error == "bad_arg" %] + Bad argument <code>[% argument FILTER html %]</code> sent to + <code>[% function FILTER html %]</code> function. + + [% ELSIF error == "invalid_attach_id_to_obsolete" %] + The attachment number of one of the attachments you wanted to obsolete, + [% attach_id FILTER html %], is invalid. + + [% ELSIF error == "invalid_column_name_cookie" %] + [% title = "Invalid Column Name" %] + The custom sort order specified in your cookie contains an invalid + column name <em>[% fragment FILTER html %]</em>. + The cookie has been cleared. + + [% ELSIF error == "invalid_column_name_form" %] + [% title = "Invalid Column Name" %] + The custom sort order specified in your form submission contains an + invalid column name <em>[% fragment FILTER html %]</em>. + + [% ELSIF error == "invalid_component" %] + [% title = "Invalid Component" %] + The [% name FILTER html %] component doesn't exist in the + [% product FILTER html %] product. + + [% ELSIF error == "invalid_dimensions" %] + [% title = "Invalid Dimensions" %] + The width or height specified is not a positive integer. + + [% ELSIF error == "invalid_series_id" %] + [% title = "Invalid Series" %] + The series_id [% series_id FILTER html %] is not valid. It may be that + this series has been deleted. + + [% ELSIF error == "mismatched_bug_ids_on_obsolete" %] + Attachment [% attach_id FILTER html %] ([% description FILTER html %]) + is attached to [% terms.bug %] [%+ attach_bug_id FILTER html %], + but you tried to flag it as obsolete while creating a new attachment to + [% terms.bug %] [%+ my_bug_id FILTER html %]. + + [% ELSIF error == "flag_nonexistent" %] + There is no flag with ID #[% id FILTER html %]. + + [% ELSIF error == "flag_status_invalid" %] + The flag status <em>[% status FILTER html %]</em> + [% IF id %] + for flag ID #[% id FILTER html %] + [% END %] + is invalid. + + [% ELSIF error == "flag_type_component_nonexistent" %] + The component <em>[% name FILTER html %]</em> does not exist + in the product <em>[% product FILTER html %]</em>. + + [% ELSIF error == "flag_type_component_without_product" %] + A component was selected without a product being selected. + + [% ELSIF error == "flag_type_id_invalid" %] + The flag type ID <em>[% id FILTER html %]</em> is not + a positive integer. + + [% ELSIF error == "flag_type_nonexistent" %] + There is no flag type with the ID <em>[% id FILTER html %]</em>. + + [% ELSIF error == "flag_type_product_nonexistent" %] + The product <em>[% product FILTER html %]</em> does not exist. + + [% ELSIF error == "flag_type_target_type_invalid" %] + The target type was neither <em>[% terms.bug %]</em> nor <em>attachment</em> + but rather <em>[% variables.target_type FILTER html %]</em>. + + [% ELSIF error == "invalid_field_name" %] + Can't use [% field FILTER html %] as a field name. + + [% ELSIF error == "invalid_keyword_id" %] + The keyword ID <em>[% id FILTER html %]</em> couldn't be + found. + + [% ELSIF error == "missing_bug_id" %] + No [% terms.bug %] ID was given. + + [% ELSIF error == "missing_series_id" %] + Having inserted a series into the database, no series_id was returned for + it. Series: [% series.category FILTER html %] / + [%+ series.subcategory FILTER html %] / + [%+ series.name FILTER html %]. + + [% ELSIF error == "no_y_axis_defined" %] + No Y axis was defined when creating report. The X axis is optional, + but the Y axis is compulsory. + + [% ELSIF error == "need_quipid" %] + A valid quipid is needed. + + [% ELSIF error == "request_queue_group_invalid" %] + The group field <em>[% group FILTER html %]</em> is invalid. + + [% ELSIF error == "report_axis_invalid" %] + <em>[% val FILTER html %]</em> is not a valid value for + [%+ IF fld == "x" %]the horizontal axis + [%+ ELSIF fld == "y" %]the vertical axis + [%+ ELSIF fld == "z" %]the multiple tables/images + [%+ ELSE %]a report axis[% END %] field. + + [% ELSIF error == "token_generation_error" %] + Something is seriously wrong with the token generation system. + + [% ELSIF error == "template_error" %] + [% template_error_msg FILTER html %] + + [% ELSIF error == "unable_to_retrieve_password" %] + I was unable to retrieve your old password from the database. + + [% ELSIF error == "undefined_field" %] + Form field [% field FILTER html %] was not defined; [% Param('browserbugmessage') %] + [%# Useful message if browser did not select show_bug radio button %] + [% IF field == "knob" %] + Check that the "Leave as..." radio button was selected. + [% END %] + + [% ELSIF error == "unknown_action" %] + [% IF action %] + Unknown action [% action FILTER html %]! + [% ELSE %] + I could not figure out what you wanted to do. + [% END %] + + [% ELSE %] + [% title = "Internal error" %] + An internal error has occured, but [% terms.Bugzilla %] doesn't know + what <code>[% error FILTER html %]</code> means. + + If you are a [% terms.Bugzilla %] end-user seeing this message, please save + this page and send it to [% Param('maintainer') %]. + [% END %] + [% END %] + [% UNLESS header_done %] [% PROCESS global/header.html.tmpl %] *************** *** 33,42 **** <tt> <p> ! Bugzilla has suffered an internal error. Please save this page and send ! it to [% Param("maintainer") %] with details of what you were doing at the time this message appeared. </p> ! <script> <!-- ! document.write("<p>URL: " + document.location + "</p>"); // --> </script> --- 247,259 ---- <tt> <p> ! [% terms.Bugzilla %] has suffered an internal error. Please save this page and send ! it to [% Param("maintainer") %] with details of what you were doing at the time this message appeared. </p> ! <script type="text/javascript"> <!-- ! document.write("<p>URL: " + ! document.location.href.replace(/&/g,"&") ! .replace(/</g,"<") ! .replace(/>/g,">") + "</p>"); // --> </script> *************** *** 47,51 **** <td bgcolor="#ff0000"> <font size="+2"> ! [% error %] </font> </td> --- 264,268 ---- <td bgcolor="#ff0000"> <font size="+2"> ! [% error_message FILTER none %] </font> </td> Index: useful-links.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/global/useful-links.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** useful-links.html.tmpl 28 Jun 2004 00:47:42 -0000 1.1 --- useful-links.html.tmpl 15 May 2005 15:04:55 -0000 1.2 *************** *** 1,3 **** ! <!-- 1....@bu... --> [%# The contents of this file are su... [truncated message content] |
|
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> |
|
From: Tim G. <xt...@us...> - 2005-05-15 15:05:02
|
Update of /cvsroot/openfirst/www/htdocs/bugzilla/bug/activity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32743/bug/activity Modified Files: show.html.tmpl table.html.tmpl Log Message: Bring templates up to date for Bugzilla 2.18.1 Index: show.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/activity/show.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** show.html.tmpl 28 Jun 2004 00:52:56 -0000 1.1 --- show.html.tmpl 15 May 2005 15:04:53 -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 *************** *** 26,34 **** # activity.html.tmpl template fulfilled. #%] ! ! [% PROCESS global/header.html.tmpl ! title = "Changes made to bug $bug_id" h1 = "Activity log" ! h2 = "Bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>" %] --- 26,36 ---- # activity.html.tmpl template fulfilled. #%] ! ! [% PROCESS global/variables.none.tmpl %] ! ! [% PROCESS global/header.html.tmpl ! title = "Changes made to $terms.bug $bug_id" h1 = "Activity log" ! h2 = "$terms.Bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>" %] *************** *** 38,42 **** <p> ! <a href="show_bug.cgi?id=[% bug_id %]">Back to bug [% bug_id %]</a> </p> --- 40,45 ---- <p> ! <a href="show_bug.cgi?id=[% bug_id %]">Back to [% terms.bug %] ! [%+ bug_id %]</a> </p> Index: table.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/bug/activity/table.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** table.html.tmpl 28 Jun 2004 00:52:56 -0000 1.1 --- table.html.tmpl 15 May 2005 15:04:53 -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 *************** *** 24,28 **** # 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 --- 24,28 ---- # 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 *************** *** 33,44 **** # it was affected by an old Bugzilla bug.) #%] ! [% IF incomplete_data %] <p> ! 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 '?'. </p> [% END %] --- 33,48 ---- # it was affected by an old Bugzilla bug.) #%] ! ! [% PROCESS global/variables.none.tmpl %] ! ! [% PROCESS bug/time.html.tmpl %] ! [% IF incomplete_data %] <p> ! There used to be an issue in <a href="http://www.bugzilla.org/">Bugzilla</a> ! which caused activity data to be lost if there were a large number of cc's ! or dependencies. That has been fixed, but some data was already lost in ! your activity table that could not be regenerated. The changes that the ! script could not reliably determine are prefixed by '?'. </p> [% END %] *************** *** 54,64 **** </tr> ! [% FOREACH operation = operations %] <tr> <td rowspan="[% operation.changes.size %]" valign="top"> ! [% operation.who %] </td> <td rowspan="[% operation.changes.size %]" valign="top"> ! [% operation.when %] </td> [% FOREACH change = operation.changes %] --- 58,68 ---- </tr> ! [% FOREACH operation = operations %] <tr> <td rowspan="[% operation.changes.size %]" valign="top"> ! [% operation.who FILTER html %] </td> <td rowspan="[% operation.changes.size %]" valign="top"> ! [% operation.when FILTER time %] </td> [% FOREACH change = operation.changes %] *************** *** 67,71 **** [% IF change.attachid %] <a href="attachment.cgi?id=[% change.attachid %]&action=view"> ! Attachment #[% change.attachid %]</a> [% END %] [% change.field %] --- 71,75 ---- [% IF change.attachid %] <a href="attachment.cgi?id=[% change.attachid %]&action=view"> ! Attachment #[% change.attachid %]</a> [% END %] [% change.field %] *************** *** 73,77 **** <td> [% IF change.removed %] ! [% change.removed FILTER html %] [% ELSE %] --- 77,87 ---- <td> [% IF change.removed %] ! [% IF change.fieldname == 'estimated_time' || ! change.fieldname == 'remaining_time' || ! change.fieldname == 'work_time' %] ! [% PROCESS formattimeunit time_unit=change.removed %] ! [% ELSE %] ! [% change.removed FILTER html %] ! [% END %] [% ELSE %] *************** *** 80,84 **** <td> [% IF change.added %] ! [% change.added FILTER html %] [% ELSE %] --- 90,100 ---- <td> [% IF change.added %] ! [% IF change.fieldname == 'estimated_time' || ! change.fieldname == 'remaining_time' || ! change.fieldname == 'work_time' %] ! [% PROCESS formattimeunit time_unit=change.added %] ! [% ELSE %] ! [% change.added FILTER html %] ! [% END %] [% ELSE %] |
|
From: Tim G. <xt...@us...> - 2005-05-15 15:05:02
|
Update of /cvsroot/openfirst/www/htdocs/bugzilla/admin/groups In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32743/admin/groups Added Files: create.html.tmpl Log Message: Bring templates up to date for Bugzilla 2.18.1 --- NEW FILE: create.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): Dave Miller <jus...@sy...> # Joel Peshkin <bug...@pe...> # Jacob Steenhagen <ja...@bu...> # Vlad Dascalu <jo...@so...> #%] [% PROCESS global/header.html.tmpl title = "Add group" h2 = "This page allows you to define a new user group." %] <form method="post" action="editgroups.cgi"> <table border="1" cellpadding="4" cellspacing="0"><tr> <th>New Name</th> <th>New Description</th> <th>New User RegExp</th> <th>Use For [% terms.Bugs %]</th> </tr><tr> <td><input size="20" name="name"></td> <td><input size="40" name="desc"></td> <td><input size="30" name="regexp"></td> <td><input type="checkbox" name="isactive" value="1" checked></td> </tr></table><hr> <input type="checkbox" name="insertnew" value="1" [% IF Param("makeproductgroups") %] checked[% END %]> Insert new group into all existing products.<p> <input type="submit" value="Add"> <input type="hidden" name="action" value="new"> </form> <p><b>Name</b> is what is used with the UserInGroup() function in any customized cgi files you write that use a given group. It can also be used by people submitting [% terms.bugs %] by email to limit [% terms.abug %] to a certain set of groups. It may not contain any spaces.</p> <p><b>Description</b> is what will be shown in the [% terms.bug %] reports to members of the group where they can choose whether the [% terms.bug %] will be restricted to others in the same group.</p> <p>The <b>Use For [% terms.Bugs %]</b> flag determines whether or not the group is eligible to be used for [% terms.bugs %]. If you clear this, it will no longer be possible for users to add [% terms.bugs %] to this group, although [% terms.bugs %] already in the group will remain in the group. Doing so is a much less drastic way to stop a group from growing than deleting the group would be. <b>Note: If you are creating a group, you probably want it to be usable for [% terms.bugs %], in which case you should leave this checked.</b></p> <p><b>User RegExp</b> is optional, and if filled in, will automatically grant membership to this group to anyone with an email address that matches this regular expression.</p> <p>By default, the new group will be associated with existing products. Unchecking the "Insert new group into all existing products" option will prevent this and make the group become visible only when its controls have been added to a product.</p> <p>Back to the <a href="./">main [% terms.bugs %] page</a> or to the <a href="editgroups.cgi">group list</a>. [% PROCESS global/footer.html.tmpl %] |
|
From: Tim G. <xt...@us...> - 2005-05-15 15:05:01
|
Update of /cvsroot/openfirst/www/htdocs/bugzilla/admin/products/groupcontrol In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32743/admin/products/groupcontrol Added Files: confirm-edit.html.tmpl edit.html.tmpl Log Message: Bring templates up to date for Bugzilla 2.18.1 --- NEW FILE: edit.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): Joel Peshkin <bug...@pe...> #%] [% PROCESS global/variables.none.tmpl %] [% filt_product = product FILTER html %] [% PROCESS global/header.html.tmpl title = "Edit Group Controls for '$filt_product'" %] <form method="post" action="editproducts.cgi"> <input type="hidden" name="action" value="updategroupcontrols"> <input type="hidden" name="product" value="[% filt_product %]"> <table id="form" cellspacing="0" cellpadding="4" border="1"> <tr bgcolor="#6666ff"> <th>Group</th> <th>Entry</th> <th>MemberControl</th> <th>OtherControl</th> <th>Canedit</th> <th>[% terms.Bugs %]</th> </tr> [% FOREACH group = groups %] [% IF group.isactive == 0 AND group.bugcount > 0 %] <tr bgcolor="#bbbbbb"> <td> [% group.name FILTER html %] </td> <td align="center" colspan=4> Disabled </td> <td> [% group.bugcount %] </td> <tr> [% ELSIF group.isactive != 0 %] <tr> <td> [% group.name FILTER html %] </td> <td> <input type=checkbox value=1 name=entry_[% group.id %] [% " checked=\"checked\"" IF group.entry %]> </td> <td> <select name="membercontrol_[% group.id %]"> <option value=[% const.CONTROLMAPNA %] [% " selected=\"selected\"" IF group.membercontrol == const.CONTROLMAPNA %] >NA </option> <option value=[% const.CONTROLMAPSHOWN %] [% " selected=\"selected\"" IF group.membercontrol == const.CONTROLMAPSHOWN %] >Shown </option> <option value=[% const.CONTROLMAPDEFAULT %] [% " selected=\"selected\"" IF group.membercontrol == const.CONTROLMAPDEFAULT %] >Default </option> <option value=[% const.CONTROLMAPMANDATORY %] [% " selected=\"selected\"" IF group.membercontrol == const.CONTROLMAPMANDATORY %] >Mandatory </option> </select> </td> <td> <select name="othercontrol_[% group.id %]"> <option value=[% const.CONTROLMAPNA %] [% " selected=\"selected\"" IF group.othercontrol == const.CONTROLMAPNA %] >NA </option> <option value=[% const.CONTROLMAPSHOWN %] [% " selected=\"selected\"" IF group.othercontrol == const.CONTROLMAPSHOWN %] >Shown </option> <option value=[% const.CONTROLMAPDEFAULT %] [% " selected=\"selected\"" IF group.othercontrol == const.CONTROLMAPDEFAULT %] >Default </option> <option value=[% const.CONTROLMAPMANDATORY %] [% " selected=\"selected\"" IF group.othercontrol == const.CONTROLMAPMANDATORY %] >Mandatory </option> </select> </td> <td> <input type=checkbox value=1 name=canedit_[% group.id %] [% " checked=\"checked\"" IF group.canedit %]> </td> <td> [% group.bugcount %] </td> </tr> [% END %] [% END %] </table> <br> <input type=submit name="submit" value="submit"> <br> </form> <p> These settings control the relationship of the groups to this product. <p> If any group has <b>Entry</b> selected, then this product will restrict [% terms.bug %] entry to only those users who are members of all the groups with entry selected. <p> If any group has <b>Canedit</b> selected, then this product will be read-only for any users who are not members of all of the groups with Canedit selected. ONLY users who are members of all the canedit groups will be able to edit. This is an additional restriction that further restricts what can be edited by a user. <p> The <b>MemberControl</b> and <b>OtherControl</b> fields indicate which [% terms.bugs %] will be placed in this group according to the following definitions. <br> <table border=1> <tr> <th> MemberControl </th> <th> OtherControl </th> <th> Interpretation </th> </tr> <tr> <td> NA </td> <td> NA </td> <td> [% terms.Bugs %] in this product are never associated with this group. </td> </tr> <tr> <td> Shown </td> <td> NA </td> <td> [% terms.Bugs %] in this product are permitted to be restricted to this group. Users who are a member of this group will be able to place [% terms.bugs %] in this group. </td> </tr> <tr> <td> Shown </td> <td> Shown </td> <td> [% terms.Bugs %] in this product can be placed in this group by anyone with permission to edit the [% terms.bug %] even if they are not a member of this group. </td> </tr> <tr> <td> Shown </td> <td> Default </td> <td> [% terms.Bugs %] in this product can be placed in this group by anyone with permission to edit the [% terms.bug %] even if they are not a member of this group. Non-members place [% terms.bugs %] in this group by default. </td> </tr> <tr> <td> Shown </td> <td> Mandatory </td> <td> [% terms.Bugs %] in this product are permitted to be restricted to this group. Users who are a member of this group will be able to place [% terms.bugs %] in this group. Non-members will be forced to restrict [% terms.bugs %] to this group when they initially enter [% terms.abug %] in this product. </td> </tr> <tr> <td> Default </td> <td> NA </td> <td> [% terms.Bugs %] in this product are permitted to be restricted to this group and are placed in this group by default. Users who are a member of this group will be able to place [% terms.bugs %] in this group. </td> </tr> <tr> <td> Default </td> <td> Default </td> <td> [% terms.Bugs %] in this product are permitted to be restricted to this group and are placed in this group by default. Users who are a member of this group will be able to place [% terms.bugs %] in this group. Non-members will be able to restrict [% terms.bugs %] to this group on entry and will do so by default </td> </tr> <tr> <td> Default </td> <td> Mandatory </td> <td> [% terms.Bugs %] in this product are permitted to be restricted to this group and are placed in this group by default. Users who are a member of this group will be able to place [% terms.bugs %] in this group. Non-members will be forced to place [% terms.bugs %] in this group on entry. </td> </tr> <tr> <td> Mandatory </td> <td> Mandatory </td> <td> [% terms.Bugs %] in this product are required to be restricted to this group. Users are not given any option. </td> </tr> </table> [% PROCESS global/footer.html.tmpl %] --- NEW FILE: confirm-edit.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): Joel Peshkin <bug...@pe...> # #%] [% PROCESS global/variables.none.tmpl %] [% PROCESS global/header.html.tmpl title="Confirm Group Control Change for product \'$product\'" %] [% FOREACH group = mandatory_groups %] <P> group '[% group.name FILTER html %]' impacts [% group.count %] [%+ terms.bugs %] for which the group is newly mandatory and will be added. [% END %] [% FOREACH group = na_groups %] <P> group '[% group.name FILTER html %]' impacts [% group.count %] [% terms.bugs %] for which the group is no longer applicable and will be removed.[% END %] <form method="post" > [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %] <br> Click "Continue" to proceed with the change including the changes indicated above. If you do not want these changes, use "back" to return to the previous page. <p> <input type="hidden" name="confirmed" value="confirmed"> <input type="submit" value="Continue"> </p> </form> [% PROCESS global/footer.html.tmpl %] |
Update of /cvsroot/openfirst/www/htdocs/bugzilla/admin/keywords In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32743/admin/keywords Added Files: confirm-delete.html.tmpl create.html.tmpl created.html.tmpl edit.html.tmpl list.html.tmpl rebuild-cache.html.tmpl Log Message: Bring templates up to date for Bugzilla 2.18.1 --- NEW FILE: confirm-delete.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): Terry Weissman <te...@mo...> # Vlad Dascalu <jo...@so...> #%] [%# INTERFACE: # name: string. The name of the keyword. # keyword_id: number. The ID of the keyword. # bug_count: number. The number of bugs with the keyword. #%] [% PROCESS global/header.html.tmpl title = "Delete Keyword" %] <p> [% IF bug_count == 1 %] There is one [% terms.bug %] with this keyword set. [% ELSE %] There are [% bug_count %] [%+terms.bugs %] with this keyword set. [% END %] Are you <b>sure</b> you want to delete the <code>[% name FILTER html %]</code> keyword? </p> <form method="post" action="editkeywords.cgi"> <input type="hidden" name="id" value="[% keyword_id %]"> <input type="hidden" name="action" value="delete"> <input type="hidden" name="reallydelete" value="1"> <input type="submit" value="Yes, really delete the keyword"> </form> <p><a href="editkeywords.cgi">Edit other keywords</a>.</p> [% PROCESS global/footer.html.tmpl %] --- NEW FILE: edit.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): Terry Weissman <te...@mo...> # Vlad Dascalu <jo...@so...> #%] [%# INTERFACE: # keyword_id: number. The ID of the keyword. # name: string. The name of the keyword. # description: string. The description of the keyword. # bug_count: number. The number of bugs with the keyword. #%] [% PROCESS global/variables.none.tmpl %] [% PROCESS global/header.html.tmpl title = "Edit keyword" %] <form method="post" action="editkeywords.cgi"> <table border="0" cellpadding="4" cellspacing="0"> <tr> <th align="right">Name:</th> <td><input size="64" maxlength="64" name="name" value="[% name FILTER html %]"></td> </tr> <tr> <th align="right">Description:</th> <td> <textarea rows="4" cols="64" wrap="virtual" name="description">[% description FILTER html %]</textarea> </td> </tr> <tr> <th align="right">[% terms.Bugs %]:</th> <td> [% IF bug_count %] [% bug_count %] [% ELSE %] none [% END %] </td> </tr> </table> <input type="submit" value="Update"> <input type="hidden" name="action" value="update"> <input type="hidden" name="id" value="[% keyword_id %]"> </form> <p><a href="editkeywords.cgi">Edit other keywords</a>.</p> [% PROCESS global/footer.html.tmpl %] --- NEW FILE: rebuild-cache.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): Terry Weissman <te...@mo...> # Vlad Dascalu <jo...@so...> #%] [%# INTERFACE: # action: string; the current action (either "update" or "delete"). # name: string; the name of the current keyword. #%] [% IF action == "update" %] [% title = "Update keyword"%] [% status = "updated" %] [% ELSIF action == "delete" %] [% title = "Delete keyword" %] [% status = "deleted" %] [% END %] [% PROCESS global/header.html.tmpl %] Keyword [% name FILTER html %] [%+status FILTER html %]. <p> <b>After you have finished deleting or modifying keywords, you need to rebuild the keyword cache.</b><br> Warning: on a very large installation of [% terms.Bugzilla %], this can take several minutes. </p> <p> <b><a href="sanitycheck.cgi?rebuildkeywordcache=1">Rebuild keyword cache</a></b> </p> <p><a href="editkeywords.cgi">Edit more keywords</a>.</p> [% PROCESS global/footer.html.tmpl %] --- NEW FILE: create.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): Terry Weissman <te...@mo...> # Vlad Dascalu <jo...@so...> #%] [%# INTERFACE: # none #%] [% PROCESS global/header.html.tmpl title = "Add keyword" h2 = "This page allows you to add a new keyword." %] <form method="post" action="editkeywords.cgi"> <table border="0" cellpadding="4" cellspacing="0"> <tr> <th align="right">Name:</th> <td><input size="64" maxlength="64" name="name" value=""></td> </tr> <tr> <th align="right">Description:</th> <td> <textarea rows="4" cols="64" wrap="virtual" name="description"></textarea> </td> </tr> </table> <hr> <input type="hidden" name="id" value="-1"> <input type="submit" value="Add"> <input type="hidden" name="action" value="new"> </form> <p><a href="editkeywords.cgi">Edit other keywords</a>.</p> [% PROCESS global/footer.html.tmpl %] --- NEW FILE: list.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): Terry Weissman <te...@mo...> # Vlad Dascalu <jo...@so...> #%] [%# INTERFACE: # max_table_size: number. Determines the maximum number of # rows in each keywords table. # keywords: array with keyword objects having the properties: # - keyword_id: number. The ID of the keyword. # - name: string. The name of the keyword. # - description: string. The description of the keyword. # - bug_count: number. The number of bugs with the keyword. #%] [% PROCESS global/variables.none.tmpl %] [% PROCESS global/header.html.tmpl title = "Select keyword" %] [% max_table_size = 50 %] [% BLOCK table_header %] <table border="1" cellpadding="4" cellspacing="0"> <tr bgcolor="#6666FF"> <th align="left">Edit keyword ...</th> <th align="left">Description</th> <th align="left">[% terms.Bugs %]</th> <th align="left">Action</th> </tr> [% END %] [% BLOCK table_footer %] </table> [% END %] [% PROCESS table_header %] [% FOREACH keyword = keywords %] [% IF !loop.first() && loop.count() % max_table_size == 1 %] [% PROCESS table_header %] [% END %] <tr> <th valign="top"> <a href="editkeywords.cgi?action=edit&id=[% keyword.id %]">[% keyword.name FILTER html %]</a> </th> <td valign="top"> [% IF keyword.description %] [% keyword.description FILTER html %] [% ELSE %] <font color="red">missing</font> [% END %] </td> <td valign="top" align="right"> [% IF keyword.bug_count %] [% keyword.bug_count %] [% ELSE %] none [% END %] </td> <th valign="top"> <a href="editkeywords.cgi?action=delete&id=[% keyword.id %]">Delete</a> </th> </tr> [% IF !loop.last() && loop.count() % max_table_size == 0 %] [% PROCESS table_footer %] [% END %] [% END %] <tr> <td valign="top" colspan="3">Add a new keyword</td> <td><a href="editkeywords.cgi?action=add">Add</a></td> </tr> [% PROCESS table_footer %] [% PROCESS global/footer.html.tmpl %] --- NEW FILE: created.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): Terry Weissman <te...@mo...> # Vlad Dascalu <jo...@so...> #%] [%# INTERFACE: # name: string; the name of the current keyword. #%] [% PROCESS global/header.html.tmpl title = "Adding new keyword" %] <p>The keyword [% name FILTER html %] has been added.</p> <p><a href="editkeywords.cgi">Edit existing keywords</a> or <a href="editkeywords.cgi?action=add">add another keyword</a>.</p> [% PROCESS global/footer.html.tmpl %] |
|
From: Tim G. <xt...@us...> - 2005-05-15 15:05:01
|
Update of /cvsroot/openfirst/www/htdocs/bugzilla/admin/flag-type In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32743/admin/flag-type Added Files: confirm-delete.html.tmpl edit.html.tmpl list.html.tmpl Log Message: Bring templates up to date for Bugzilla 2.18.1 --- NEW FILE: confirm-delete.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): Myk Melez <my...@mo...> #%] [% PROCESS global/variables.none.tmpl %] [%# Filter off the name here to be used multiple times below %] [% name = BLOCK %][% flag_type.name FILTER html %][% END %] [% PROCESS global/header.html.tmpl title = "Confirm Deletion of Flag Type '$name'" %] <p> There are [% flag_count %] flags of type [% name FILTER html %]. If you delete this type, those flags will also be deleted. Note that instead of deleting the type you can <a href="editflagtypes.cgi?action=deactivate&id=[% flag_type.id %]">deactivate it</a>, in which case the type and its flags will remain in the database but will not appear in the [% terms.Bugzilla %] UI. </p> <table> <tr> <td colspan="2"> Do you really want to delete this type? </td> </tr> <tr> <td> <a href="editflagtypes.cgi?action=delete&id=[% flag_type.id %]"> Yes, delete </a> </td> <td align="right"> <a href="editflagtypes.cgi"> No, don't delete </a> </td> </tr> </table> [% PROCESS global/footer.html.tmpl %] --- NEW FILE: list.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): Myk Melez <my...@mo...> #%] [% PROCESS global/variables.none.tmpl %] [% PROCESS global/header.html.tmpl title = 'Administer Flag Types' style = " table#flag_types tr th { text-align: left; } .inactive { color: #787878; } " %] <p> Flags are markers that identify whether [% terms.abug %] or attachment has been granted or denied some status. Flags appear in the UI as a name and a status symbol ("+" for granted, "-" for denied, and "?" for statuses requested by users). </p> <p> For example, you might define a "review" status for users to request review for their patches. When a patch writer requests review, the string "review?" will appear in the attachment. When a patch reviewer reviews the patch, either the string "review+" or the string "review-" will appear in the patch, depending on whether the patch passed or failed review. </p> <h3>Flag Types for [% terms.Bugs %]</h3> [% PROCESS display_flag_types types=bug_types %] <p> <a href="editflagtypes.cgi?action=enter&target_type=bug">Create Flag Type for [% terms.Bugs %]</a> </p> <h3>Flag Types for Attachments</h3> [% PROCESS display_flag_types types=attachment_types %] <p> <a href="editflagtypes.cgi?action=enter&target_type=attachment">Create Flag Type For Attachments</a> </p> <script type="text/javascript" language="JavaScript"> <!-- function confirmDelete(id, name, count) { if (count > 0) { var msg = 'There are ' + count + ' flags of type ' + name + '. ' + 'If you delete this type, those flags will also be ' + 'deleted.\n\nNote: to deactivate the type instead ' + 'of deleting it, edit it and uncheck its "is active" ' + 'flag.\n\nDo you really want to delete this flag type?'; if (!confirm(msg)) return false; } location.href = "editflagtypes.cgi?action=delete&id=" + id; return false; // prevent strict JavaScript warning that this function // does not always return a value } //--> </script> [% PROCESS global/footer.html.tmpl %] [% BLOCK display_flag_types %] <table id="flag_types" cellspacing="0" cellpadding="4" border="1"> <tr> <th>Edit name ...</th> <th>Description</th> <th>Actions</th> </tr> [% FOREACH type = types %] <tr class="[% IF type.is_active %]active[% ELSE %]inactive[% END %]"> <td><a href="editflagtypes.cgi?action=edit&id=[% type.id %]">[% type.name FILTER html %]</a></td> <td>[% type.description FILTER html %]</td> <td> <a href="editflagtypes.cgi?action=copy&id=[% type.id %]">Copy</a> | <a href="editflagtypes.cgi?action=confirmdelete&id=[% type.id %]" onclick="return confirmDelete([% type.id %], '[% type.name FILTER js FILTER html %]', [% type.flag_count %]);">Delete</a> </td> </tr> [% END %] </table> [% END %] --- NEW FILE: edit.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): Myk Melez <my...@mo...> #%] [% PROCESS global/variables.none.tmpl %] [%# The javascript block gets used in header.html.tmpl. %] [% javascript = BLOCK %] var usetms = 0; // do we have target milestone? var first_load = 1; // is this the first time we load the page? var last_sel = []; // caches last selection var cpts = new Array(); [% FOREACH p = products %] cpts['[% p FILTER js %]'] = [ [%- FOREACH item = components_by_product.$p %]'[% item FILTER js %]'[% ", " UNLESS loop.last %] [%- END -%] ]; [% END %] [% END %] [% IF type.target_type == "bug" %] [% title = BLOCK %]Create Flag Type for [% terms.Bugs %][% END %] [% typeLabelLowerPlural = BLOCK %][% terms.bugs %][% END %] [% typeLabelLowerSingular = BLOCK %][% terms.bug %][% END %] [% ELSE %] [% title = "Create Flag Type for Attachments" %] [% typeLabelLowerPlural = BLOCK %]attachments[% END %] [% typeLabelLowerSingular = BLOCK %]attachment[% END %] [% END %] [% IF last_action == "copy" %] [% title = "Create Flag Type Based on $type.name" %] [% ELSIF last_action == "edit" %] [% title = "Edit Flag Type $type.name" %] [% END %] [% PROCESS global/header.html.tmpl title = title style = " table#form th { text-align: right; vertical-align: baseline; white-space: nowrap; } table#form td { text-align: left; vertical-align: baseline; } " onload="selectProduct(document.forms[0], 'product', 'component', '__Any__');" javascript_urls=["productmenu.js"] %] <form method="post" action="editflagtypes.cgi"> <input type="hidden" name="action" value="[% action %]"> <input type="hidden" name="id" value="[% type.id %]"> <input type="hidden" name="target_type" value="[% type.target_type %]"> [% FOREACH category = type.inclusions %] <input type="hidden" name="inclusions" value="[% category.value FILTER html %]"> [% END %] [% FOREACH category = type.exclusions %] <input type="hidden" name="exclusions" value="[% category.value FILTER html %]"> [% END %] <table id="form" cellspacing="0" cellpadding="4" border="0"> <tr> <th>Name:</th> <td> a short name identifying this type<br> <input type="text" name="name" value="[% type.name FILTER html %]" size="50" maxlength="50"> </td> </tr> <tr> <th>Description:</th> <td> a comprehensive description of this type<br> <textarea name="description" rows="4" cols="80">[% type.description FILTER html %]</textarea> </td> </tr> <tr> <th>Category:</th> <td> the products/components to which [% typeLabelLowerPlural %] must (inclusions) or must not (exclusions) belong in order for users to be able to set flags of this type for them <table> <tr> <td style="vertical-align: top;"> <b>Product/Component:</b><br> <select name="product" onchange="selectProduct(this.form, 'product', 'component', '__Any__');"> <option value="">__Any__</option> [% FOREACH item = products %] <option value="[% item FILTER html %]" [% "selected" IF type.product.name == item %]> [% item FILTER html %]</option> [% END %] </select><br> <select name="component"> <option value="">__Any__</option> [% FOREACH item = components %] <option value="[% item FILTER html %]" [% "selected" IF type.component.name == item %]> [% item FILTER html %]</option> [% END %] </select><br> <input type="submit" name="categoryAction-include" value="Include"> <input type="submit" name="categoryAction-exclude" value="Exclude"> </td> <td style="vertical-align: top;"> <b>Inclusions:</b><br> [% PROCESS "global/select-menu.html.tmpl" name="inclusion_to_remove" multiple="1" size="4" options=type.inclusions %]<br> <input type="submit" name="categoryAction-removeInclusion" value="Remove Inclusion"> </td> <td style="vertical-align: top;"> <b>Exclusions:</b><br> [% PROCESS "global/select-menu.html.tmpl" name="exclusion_to_remove" multiple="1" size="4" options=type.exclusions %]<br> <input type="submit" name="categoryAction-removeExclusion" value="Remove Exclusion"> </td> </tr> </table> </td> </tr> <tr> <th>Sort Key:</th> <td> a number between 1 and 32767 by which this type will be sorted when displayed to users in a list; ignore if you don't care what order the types appear in or if you want them to appear in alphabetical order<br> <input type="text" name="sortkey" value="[% type.sortkey || 1 %]" size="5" maxlength="5"> </td> </tr> <tr> <th> </th> <td> <input type="checkbox" name="is_active" [% "checked" IF type.is_active || !type.is_active.defined %]> active (flags of this type appear in the UI and can be set) </td> </tr> <tr> <th> </th> <td> <input type="checkbox" name="is_requestable" [% "checked" IF type.is_requestable || !type.is_requestable.defined %]> requestable (users can ask for flags of this type to be set) </td> </tr> <tr> <th>CC List:</th> <td> if requestable, who should get carbon copied on email notification of requests. This is a comma-separated list of full e-mail addresses which do not need to be [% terms.Bugzilla %] logins. [% IF Param('emailsuffix') %] Note that the configured emailsuffix <kbd>[% Param('emailsuffix') %]</kbd> will <em>not</em> be appended to these addresses, so you should add it explicitly if so desired. [% END %]<br> <input type="text" name="cc_list" value="[% type.cc_list FILTER html %]" size="80" maxlength="200"> </td> </tr> <tr> <th> </th> <td> <input type="checkbox" name="is_requesteeble" [% "checked" IF type.is_requesteeble || !type.is_requesteeble.defined %]> specifically requestable (users can ask specific other users to set flags of this type as opposed to just asking the wind) </td> </tr> <tr> <th> </th> <td> <input type="checkbox" name="is_multiplicable" [% "checked" IF type.is_multiplicable || !type.is_multiplicable.defined %]> multiplicable (multiple flags of this type can be set on the same [% typeLabelLowerSingular %]) </td> </tr> <tr> <th></th> <td> <input type="submit" value=" [% IF (last_action == "enter" || last_action == "copy") %]Create [% ELSE %]Save Changes [% END %]"> </td> </tr> </table> </form> [% PROCESS global/footer.html.tmpl %] |
|
From: Tim G. <xt...@us...> - 2005-05-15 15:03:21
|
Update of /cvsroot/openfirst/www/htdocs/bugzilla/admin/products/groupcontrol In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32437/groupcontrol Log Message: Directory /cvsroot/openfirst/www/htdocs/bugzilla/admin/products/groupcontrol added to the repository |
|
From: Tim G. <xt...@us...> - 2005-05-15 15:01:28
|
Update of /cvsroot/openfirst/www/htdocs/bugzilla/admin/groups In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32218/groups Log Message: Directory /cvsroot/openfirst/www/htdocs/bugzilla/admin/groups added to the repository |
|
From: Tim G. <xt...@us...> - 2005-05-15 15:01:27
|
Update of /cvsroot/openfirst/www/htdocs/bugzilla/admin/products In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32218/products Log Message: Directory /cvsroot/openfirst/www/htdocs/bugzilla/admin/products added to the repository |
|
From: Tim G. <xt...@us...> - 2005-05-15 15:01:27
|
Update of /cvsroot/openfirst/www/htdocs/bugzilla/admin/keywords In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32218/keywords Log Message: Directory /cvsroot/openfirst/www/htdocs/bugzilla/admin/keywords added to the repository |
|
From: Tim G. <xt...@us...> - 2005-05-15 15:01:27
|
Update of /cvsroot/openfirst/www/htdocs/bugzilla/admin/flag-type In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32218/flag-type Log Message: Directory /cvsroot/openfirst/www/htdocs/bugzilla/admin/flag-type added to the repository |
Update of /cvsroot/openfirst/www/htdocs/bugzilla/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28397/reports Added Files: chart.csv.tmpl chart.html.tmpl chart.png.tmpl create-chart.html.tmpl duplicates.rdf.tmpl edit-series.html.tmpl menu.html.tmpl report-bar.png.tmpl report-line.png.tmpl report-pie.png.tmpl report-table.csv.tmpl report-table.html.tmpl report.csv.tmpl report.html.tmpl series-common.html.tmpl series.html.tmpl Log Message: Bring templates up to date for Bugzilla 2.18.1 --- NEW FILE: report-pie.png.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...> #%] [% PROCESS "global/field-descs.none.tmpl" %] [% col_field_disp = field_descs.$col_field || col_field %] [% FILTER null; USE graph = GD.Graph.pie(width, height); graph.set(title => col_field_disp, pie_height => 20, suppress_angle => 2, start_angle => 180); graph.plot(data.0).png | stdout(1); END; -%] --- NEW FILE: report-line.png.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...> #%] [% PROCESS global/variables.none.tmpl %] [% y_label = "$terms.Bugs" %] [% PROCESS "global/field-descs.none.tmpl" %] [% col_field_disp = field_descs.$col_field || col_field %] [% IF cumulate %] [% USE graph = GD.Graph.area(width, height) %] [% graph.set(cumulate => "true") %] [% ELSE %] [% USE graph = GD.Graph.lines(width, height) %] [% END %] [% FILTER null; graph.set(x_label => col_field_disp, y_label => y_label, y_tick_number => 8, x_label_position => 0.5, x_labels_vertical => x_labels_vertical, legend_placement => "RT", line_width => 2, dclrs => ["lred", "lgreen", "lblue", "lyellow", "lpurple", "lorange", "black", "green", "blue", "dpink", "lbrown", "gray", "red", "dpurple", "gold", "marine"]); # Workaround for the fact that set_legend won't take row_names directly, # because row_names is an array reference rather than an array. graph.set_legend(row_names.0, row_names.1, row_names.2, row_names.3, row_names.4, row_names.5, row_names.6, row_names.7, row_names.8, row_names.9, row_names.10, row_names.11, row_names.12, row_names.13, row_names.14, row_names.15); graph.plot(data.0).png | stdout(1); END; -%] --- NEW FILE: report.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...> #%] [%# INTERFACE: # col_field: string. Name of the field being plotted as columns. # row_field: string. Name of the field being plotted as rows. # tbl_field: string. Name of the field being plotted as tables. # tbl_names: array. List of values for the field being plotted as tables. # time: integer. Seconds since the epoch. # data: <depends on format>. Data to plot. # format: string. Format of the individual reports. # width: integer. For image charts, height of the image. # height: integer. For image charts, width of the image. # switchbase: string. Base URL for format switching. # cumulate: boolean. For bar/line charts, whether to cumulate data sets. #%] [% DEFAULT width = 600 height = 350 %] [% IF min_width AND width < min_width %] [% width = min_width %] [% END %] [%# We ignore row_field for pie charts %] [% IF format == "pie" %] [% row_field = "" %] [% END %] [% PROCESS "global/field-descs.none.tmpl" %] [% tbl_field_disp = field_descs.$tbl_field || tbl_field %] [% col_field_disp = field_descs.$col_field || col_field %] [% row_field_disp = field_descs.$row_field || row_field %] [% title = BLOCK %] Report: [% IF tbl_field %] [% tbl_field_disp FILTER html %] [% END %] [% " / " IF tbl_field AND (col_field OR row_field) %] [% IF row_field %] [% row_field_disp FILTER html %] [% END %] [% " / " IF col_field AND row_field %] [% col_field_disp FILTER html %] [% END %] [% PROCESS global/header.html.tmpl style = " .t1 { background-color: #ffffff } /* white */ .t2 { background-color: #dfefff } /* light blue */ .t3 { background-color: #dddddd } /* grey */ .t4 { background-color: #c3d3ed } /* darker blue */ .ttotal { background-color: #cfffdf } /* light green */ " h3 = time2str("%Y-%m-%d %H:%M:%S", time) %] [% IF debug %] <p>[% query FILTER html %]</p> [% END %] <div align="center"> [% FOREACH tbl = tbl_names %] [% IF tbl == "-total-" %] [% tbl_disp = "Total" %] [% ELSE %] [% tbl_disp = tbl %] [% END %] [% IF format == "table" %] [% PROCESS "reports/report-table.html.tmpl" %] [% ELSE %] [% IF tbl %] <h2>[% tbl_disp FILTER html %]</h2> [% END %] [% imageurl = BLOCK %]report.cgi?[% imagebase %]&format= [% format FILTER url_quote %]&ctype=png&action=plot& [% IF tbl_field %] [% IF tbl != "-total-" %] [% tbl_field FILTER url_quote %]=[% tbl FILTER url_quote %]& [% ELSE %] [% FOREACH tblname = tbl_names %] [% IF tblname != "-total-" %] [% tbl_field FILTER url_quote %]=[% tblname FILTER url_quote %]& [% END %] [% END %] [% END %] [% END %]width=[% width %]&height=[% height %] [% END %] <img alt="Graphical report results" src="[% imageurl %]" width="[% width %]" height="[% height %]"> [% END %] <br> [% END %] <table> <tr> <td> [% formats = [ { name => "pie", description => "Pie" }, { name => "bar", description => "Bar" }, { name => "line", description => "Line" }, { name => "table", description => "Table" } ] %] [% formaturl = "report.cgi?$switchbase&width=$width&height=$height" _ "&action=wrap" %] [% FOREACH other_format = formats %] [% NEXT IF other_format.name == "pie" AND row_field AND col_field %] [% UNLESS other_format.name == format %] <a href="[% formaturl %]&format=[% other_format.name %]"> [% END %] [% other_format.description FILTER html %] [% "</a>" UNLESS other_format.name == format %] | [% END %] <a href="[% formaturl %]&ctype=csv&format=table">CSV</a> </td> [% IF format != "table" %] <td> </td> [% sizeurl = BLOCK %]report.cgi? [% switchbase %]&action=wrap&format= [% format FILTER html %][% END %] <td align="center"> <a href="[% sizeurl %]&width=[% width %]&height= [% height + 100 %]">Taller</a><br> <a href="[% sizeurl %]&width=[% width - 100 %]&height= [% height %]">Thinner</a> * <a href="[% sizeurl %]&width=[% width + 100 %]&height= [% height %]">Fatter</a> <br> <a href="[% sizeurl %]&width=[% width %]&height= [% height - 100 %]">Shorter</a><br> </td> [% END %] <tr> </table> <p> [% IF format == "table" %] <a href="query.cgi?[% switchbase %]&format=report-table">Edit this report</a> [% ELSE %] <a href="query.cgi?[% switchbase %]&chart_format= [% format %]&format=report-graph&cumulate=[% cumulate %]"> Edit this report </a> [% END %] </p> </div> [% PROCESS global/footer.html.tmpl %] --- NEW FILE: report-table.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...> # <rd...@ca...> #%] [%# INTERFACE: # buglistbase: The base query for this table, in URL form # col_field: string. Name of the field being plotted as columns. # row_field: string. Name of the field being plotted as rows. # tbl_field: string. Name of the field being plotted as tables. # col_names: array. List of values for the field being plotted as columns. # row_names: array. List of values for the field being plotted as rows. # data: <depends on format>. Data to plot. Only data.$tbl is accessed. # tbl: Name of a hash in data which is the table to be plotted. #%] [% PROCESS "global/field-descs.none.tmpl" %] [% col_field_disp = field_descs.$col_field || col_field %] [% row_field_disp = field_descs.$row_field || row_field %] [% IF tbl == "-total-" %] [% urlbase = BLOCK %]buglist.cgi?[% buglistbase %] [% "&$tbl_vals" IF tbl_vals %][% END %] [% ELSE %] [% urlbase = BLOCK %]buglist.cgi?[% buglistbase %]& [% tbl_field FILTER url_quote %]=[% tbl FILTER url_quote %][% END %] [% END %] <table> [% IF tbl_field %] <tr> <td> </td> <td align="center"> <h2>[% tbl_disp FILTER html %]</h2> </td> </tr> [% END %] <tr> <td> </td> <td align="center"> <strong>[% col_field_disp FILTER html %]</strong> </td> </tr> <tr> <td valign="middle"> <strong>[% row_field_disp FILTER html %]</strong> </td> <td> [% classes = [ [ "t1", "t2" ] , [ "t3", "t4" ] ] %] [% col_idx = 0 %] [% row_idx = 0 %] [% grand_total = 0 %] <table border="1"> [% IF col_field %] <tr> <td class="[% classes.$row_idx.$col_idx %]"> </td> [% FOREACH col = col_names %] [% col_totals.$col = 0 %] [% NEXT IF col == "" %] [% col_idx = 1 - col_idx %] <td class="[% classes.$row_idx.$col_idx %]"> [% col FILTER html FILTER replace('^ $',' ') %] </td> [% END %] <td class="ttotal"> Total </td> </tr> [% END %] [% FOREACH row = row_names %] [% row_total = 0 %] [% row_idx = 1 - row_idx %] <tr> <td class="[% classes.$row_idx.$col_idx %]" align="right"> [% row FILTER html FILTER replace('^ $',' ') %] </td> [% FOREACH col = col_names %] [% row_total = row_total + data.$tbl.$col.$row %] [% NEXT IF col == "" %] [% col_totals.$col = col_totals.$col + data.$tbl.$col.$row %] [% col_idx = 1 - col_idx %] <td class="[% classes.$row_idx.$col_idx %]" align="center"> [% IF data.$tbl.$col.$row AND data.$tbl.$col.$row > 0 %] <a href="[% urlbase %]& [% row_field FILTER url_quote %]=[% row FILTER url_quote %]& [% col_field FILTER url_quote %]=[% col FILTER url_quote %]"> [% data.$tbl.$col.$row %]</a> [% ELSE %] . [% END %] </td> [% END %] <td class="ttotal" align="right"> <a href="[% urlbase %]& [% row_field FILTER url_quote %]=[% row FILTER url_quote %] [% "&$col_vals" IF col_vals %]"> [% row_total %]</a> [% grand_total = grand_total + row_total %] </td> </tr> [% END %] <tr> [% row_idx = 1 - row_idx %] <td class="ttotal"> Total </td> [% FOREACH col = col_names %] [% NEXT IF col == "" %] <td class="ttotal" align="center"> <a href="[% urlbase %]& [% col_field FILTER url_quote %]=[% col FILTER url_quote %] [% "&$row_vals" IF row_vals %]"> [% col_totals.$col %]</a> <strong> </td> [% END %] <td class="ttotal" align="right"> <strong> <a href="[% urlbase %] [% "&$row_vals" IF row_vals %] [% "&$col_vals" IF col_vals %]">[% grand_total %]</a> </strong> </td> </tr> </table> </td> </tr> </table> --- NEW FILE: series.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...> #%] [%# INTERFACE: # default: hash. Defaults for category, subcategory, name etc. # button_name: string. What the button will say. # category: hash (keyed by category) of hashes (keyed by subcategory) of # hashes (keyed by name), with value being the series_id of the # series. Contains details of all series the user can see. #%] [% PROCESS "reports/series-common.html.tmpl" newtext = "New (name below)" %] <table cellpadding="2" cellspacing="2" border="0" style="text-align: left; margin-left: 20px"> <tbody> <tr> <th>Category:</th> <th></th> <th>Sub-category:</th> <th>Name:</th> <td></td> </tr> <tr> [% PROCESS series_select sel = { name => 'category', size => 5, onchange => "catSelected()" } %] <td> <noscript> <input type="submit" name="action-edit" value="Update -->"> </noscript> </td> [% PROCESS series_select sel = { name => 'subcategory', size => 5, onchange => "checkNewState()" } %] <td valign="top" name="name"> <input type="text" name="name" maxlength="64" value="[% default.name.0 FILTER html %]" size="25"> </td> <td valign="top"> <span style="font-weight: bold;">Run every</span> <input type="text" size="2" name="frequency" value="[% (default.frequency.0 OR 7) FILTER html %]"> <span style="font-weight: bold;"> day(s)</span><br> [%# Change 'admin' here and in Series.pm, or remove the check completely, if you want to change who can make series public. %] [% IF UserInGroup('admin') %] <input type="checkbox" name="public" [% "checked='checked'" IF default.public.0 %]> <span style="font-weight: bold;">Visible to all<br> (within group restrictions)</span> [% END %] </td> </tr> <tr> <td> <input type="text" style="width: 100%" name="newcategory" maxlength="64" value="[% default.newcategory.0 FILTER html %]"> </td> <td></td> <td> <input type="text" style="width: 100%" name="newsubcategory" maxlength="64" value="[% default.newsubcategory.0 FILTER html %]"> </td> <td></td> <td> <input type="submit" name="submit-button" value="[% button_name FILTER html %]"> </td> </tr> </tbody> </table> --- NEW FILE: chart.csv.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...> #%] [% data = chart.data %] Date\Series, [% FOREACH label = chart.labels %] [% label FILTER csv %][% "," UNLESS loop.last %] [% END %] [%# The data, which is in the correct format for GD, is conceptually the wrong # way round for CSV output. So, we need to invert it here, which is why # these loops aren't just plain FOREACH. #%] [% i = 0 %] [% WHILE i < data.0.size %] [% j = 0 %] [% WHILE j < data.size %] [% data.$j.$i %][% "," UNLESS (j == data.size - 1) %] [% j = j + 1 %] [% END %] [% i = i + 1 %] [% END %] --- NEW FILE: create-chart.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...> #%] [%# INTERFACE: # chart: Chart object representing the currently assembled chart. # category: hash (keyed by category) of hashes (keyed by subcategory) of # hashes (keyed by name), with value being the series_id of the # series. Contains details of all series the user can see. #%] [% PROCESS global/header.html.tmpl title = "Create Chart" %] [% PROCESS "reports/series-common.html.tmpl" donames = 1 %] <script language="JavaScript" type="text/javascript"> [%# This function takes necessary action on selection of a subcategory %] function subcatSelected() { var cat = document.chartform.category.value; var subcat = document.chartform.subcategory.value; var names = series[cat][subcat]; var namewidget = document.chartform.name; namewidget.options.length = 0; var i = 0; for (x in names) { namewidget.options[i] = new Option(x, names[x]); i++; } namewidget.options[0].selected = true; checkNewState(); } </script> [% gttext = "Grand Total" %] <form method="get" action="chart.cgi" name="chartform"> <table cellpadding="2" cellspacing="2" border="0"> [% IF NOT category OR category.size == 0 %] <tr> <td> <i>No data sets exist, or none are visible to you.</i> </td> </tr> [% ELSE %] <tr> <th>Category:</th> <th></th> <th>Sub-category:</th> <th></th> <th>Name:</th> <th><br> </th> </tr> <tr> [% PROCESS series_select sel = { name => 'category', size => 5, onchange = "catSelected(); subcatSelected();" } %] <td> <noscript> <input type="submit" name="action-assemble" value="Update -->"> </noscript> </td> [% PROCESS series_select sel = { name => 'subcategory', size => 5, onchange = "subcatSelected()" } %] <td> <noscript> <input type="submit" name="action-assemble" value="Update -->"> </noscript> </td> <td align="left"> <label for="name" accesskey="N"> <select name="name" id="name" style="width: 15em" size="5" multiple="multiple" [%+ "disabled=\"disabled\"" UNLESS name.keys.size %]> [% FOREACH x = name.keys.sort %] <option value="[% name.$x FILTER html %]"> [% x FILTER html %]</option> [% END %] [% UNLESS name.keys.size %] <option value="" disabled="disabled"></option> [% END %] </select> </label> </td> <td align="center" valign="middle"> <input type="submit" name="action-add" value="Add To List"><br> </td> </tr> [% END %] </table> <script language="JavaScript" type="text/javascript"> document.chartform.category[0].selected = true; document.chartform.subcategory.disabled = ''; document.chartform.name.disabled = ''; catSelected(); subcatSelected(); </script> <h3>List Of Data Sets To Plot</h3> [% IF chart.lines.size > 0 %] <table cellspacing="2" cellpadding="2"> <tr> <th style="width: 5em;">Select</th> <th>Label</th> <th></th> <th>Data Set</th> <th></th> </tr> [%# The external loop has two counters; one which keeps track of where we # are in the old labels array, and one which keeps track of the new # indexes for the form elements. They are different if chart.lines has # empty slots in it. #%] [% labelidx = 0 %] [% newidx = 0 %] [% FOREACH line = chart.lines %] [% IF NOT line %] [%# chart.lines has an empty slot, so chart.labels will too. We # increment labelidx only to keep the labels in sync with the data. #%] [% labelidx = labelidx + 1 %] [% NEXT %] [% END %] [% FOREACH series = line %] <tr> [% IF loop.first %] <td align="center" rowspan="[% line.size %]"> <input type="checkbox" value="1" name="select[% newidx %]"> </td> <td rowspan="[% line.size %]"> <input type="text" size="20" name="label[% newidx %]" value="[% (chart.labels.$labelidx OR series.name) FILTER html %]"> </td> [% END %] <td> [% "{" IF line.size > 1 %] </td> <td> [% series.category FILTER html %] / [%+ series.subcategory FILTER html %] / [%+ series.name FILTER html %] <input type="hidden" name="line[% newidx %]" value="[% series.series_id %]"> </td> <td align="center"> [% IF user.id == series.creator OR UserInGroup("admin") %] <a href="chart.cgi?action=edit&series_id= [% series.series_id %]">Edit</a> | [% END %] <a href="buglist.cgi?cmdtype=dorem&namedcmd= [% series.category FILTER url_quote %]%20/%20 [% series.subcategory FILTER url_quote %]%20/%20 [% series.name FILTER url_quote -%]&series_id= [% series.series_id %]&remaction=runseries">Run Search</a> </td> </tr> [% END %] [% labelidx = labelidx + 1 %] [% newidx = newidx + 1 %] [% END %] [% IF chart.gt %] <tr> <td align="center"> <input type="checkbox" value="1" name="select65536"> <input type="hidden" value="1" name="gt"> </td> <td> <input type="text" size="20" name="labelgt" value="[% (chart.labelgt OR gttext) FILTER html %]"> </td> <td></td> <td> <i>[% gttext FILTER html %]</i> </td> <td></td> </tr> [% END %] <tr> <td colspan="6"> </td> </tr> <tr> <td valign="bottom" style="text-align: center;"> <input type="submit" name="action-sum" value="Sum" style="width: 5em;"><br> <input type="submit" name="action-remove" value="Remove" style="width: 5em;"> </td> <td style="text-align: right; vertical-align: bottom;"> <b>Cumulate:</b> <input type="checkbox" name="cumulate" value="1" [% " checked" IF chart.cumulate %]> </td> <td></td> <td valign="bottom"> <b>Date Range:</b> <input type="text" size="12" name="datefrom" value="[% time2str("%Y-%m-%d", chart.datefrom) IF chart.datefrom%]"> <b>to</b> <input type="text" size="12" name="dateto" value="[% time2str("%Y-%m-%d", chart.dateto) IF chart.dateto %]"> </td> <td style="text-align: right" valign="bottom"> <input type="submit" name="action-wrap" value="Chart This List"> </td> </tr> </table> [% ELSE %] <p><i>None</i></p> [% END %] </form> [% IF UserInGroup('editbugs') %] <h3><a href="query.cgi?format=create-series">Create New Data Set</a></h3> [% END %] [% PROCESS global/footer.html.tmpl %] --- NEW FILE: report.csv.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...> #%] [% PROCESS "global/field-descs.none.tmpl" %] [% FOREACH tbl = tbl_names %] [% PROCESS "reports/report-table.csv.tmpl" %] [% END %] --- NEW FILE: chart.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...> #%] [%# INTERFACE: #%] [% DEFAULT width = 600 height = 350 %] [% PROCESS global/header.html.tmpl title = "Chart" h3 = time2str("%Y-%m-%d %H:%M:%S", time) %] <div align="center"> [% imageurl = BLOCK %]chart.cgi? [% imagebase FILTER html %]&ctype=png&action=plot&width= [% width %]&height=[% height -%] [% END %] <img alt="Graphical report results" src="[% imageurl %]" width="[% width %]" height="[% height %]"> <p> [% sizeurl = BLOCK %]chart.cgi? [% imagebase FILTER html %]&action=wrap [% END %] <a href="[% sizeurl %]&width=[% width %]&height= [% height + 100 %]">Taller</a><br> <a href="[% sizeurl %]&width=[% width - 100 %]&height= [% height %]">Thinner</a> * <a href="[% sizeurl %]&width=[% width + 100 %]&height= [% height %]">Fatter</a> <br> <a href="[% sizeurl %]&width=[% width %]&height= [% height - 100 %]">Shorter</a><br> </p> <p> <a href="chart.cgi? [% imagebase FILTER html %]&ctype=csv&action=plot">CSV</a> | <a href="chart.cgi?[% imagebase FILTER html %]&action=assemble">Edit this chart</a> </p> </div> [% PROCESS global/footer.html.tmpl %] --- NEW FILE: report-table.csv.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...> #%] [%# INTERFACE: # See report-table.html.tmpl. #%] [% PROCESS global/variables.none.tmpl %] [% num_bugs = BLOCK %]Number of [% terms.bugs %][% END %] [% tbl_field_disp = field_descs.$tbl_field || tbl_field %] [% col_field_disp = field_descs.$col_field || col_field %] [% row_field_disp = field_descs.$row_field || row_field %] [% title = BLOCK %] [% IF tbl_field %] [% tbl_field_disp FILTER csv %]: [% tbl FILTER csv %] [% END %] [% IF row_field %] [% row_field_disp FILTER csv %] [% END %] [% " / " IF col_field AND row_field %] [% col_field_disp FILTER csv %] [% END %] [% title %], [% IF col_field -%] [% FOREACH col = col_names -%] [% col FILTER csv -%], [% END -%] [% ELSE -%] [% num_bugs %], [% END %] [% FOREACH row = row_names %] [% row FILTER csv -%], [% FOREACH col = col_names %] [% IF data.$tbl AND data.$tbl.$col AND data.$tbl.$col.$row %] [% data.$tbl.$col.$row -%], [% ELSE %] [% -%]0, [% END %] [% END %] [% END %] --- NEW FILE: menu.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...> #%] [%# INTERFACE: # This template has no interface. It's a list of the available report # types in Bugzilla. #%] [% PROCESS global/variables.none.tmpl %] [% PROCESS global/header.html.tmpl title = "Reporting and Charting Kitchen" %] <p> [% terms.Bugzilla %] allows you to view and track the state of the [% terms.bug %] database in all manner of exciting ways. </p> <h2>Current State</h2> <ul> <li> <strong><a href="query.cgi">Search</a></strong> - list sets of [% terms.bugs %]. </li> <li> <strong> <a href="query.cgi?format=report-table">Tabular reports</a> </strong> - tables of [% terms.bug %] counts in 1, 2 or 3 dimensions, as HTML or CSV. </li> <li> <strong> <a href="query.cgi?format=report-graph">Graphical reports</a> </strong> - line graphs, bar and pie charts. </li> </ul> <h2>Change Over Time</h2> <ul> <li> <strong><a href="reports.cgi">Old Charts</a></strong> - plot the status and/or resolution of [% terms.bugs %] against time, for each product in your database. </li> [% IF UserInGroup(Param("chartgroup")) %] <li> <strong><a href="chart.cgi">New Charts</a></strong> - plot any arbitrary search against time. Far more powerful. </li> [% END %] </ul> [% PROCESS global/footer.html.tmpl %] --- NEW FILE: duplicates.rdf.tmpl --- [% template_version = "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): Myk Melez <my...@mo...> #%] <?xml version="1.0"?> <!-- [% template_version %] --> <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:bz="http://www.bugzilla.org/rdf#" xmlns:nc="http://home.netscape.com/NC-rdf#"> <bz:duplicates_report rdf:about="[% Param('urlbase') %]data/duplicates.rdf"> <bz:bugs> <Seq> [% FOREACH bug = bugs %] <li> <bz:bug rdf:about="[% Param('urlbase') %]show_bug.cgi?id=[% bug.id %]"> <bz:id nc:parseType="Integer">[% bug.id %]</bz:id> <bz:resolution>[% bug.resolution FILTER html %]</bz:resolution> <bz:duplicate_count nc:parseType="Integer">[% bug.count %]</bz:duplicate_count> <bz:duplicate_delta nc:parseType="Integer">[% bug.delta %]</bz:duplicate_delta> <bz:component>[% bug.component FILTER html %]</bz:component> <bz:severity>[% bug.bug_severity FILTER html %]</bz:severity> <bz:os>[% bug.op_sys FILTER html %]</bz:os> <bz:target_milestone>[% bug.target_milestone FILTER html %]</bz:target_milestone> <bz:summary>[% bug.short_desc FILTER html %]</bz:summary> </bz:bug> </li> [% END %] </Seq> </bz:bugs> </bz:duplicates_report> </RDF> --- NEW FILE: report-bar.png.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...> #%] [% PROCESS global/variables.none.tmpl %] [% y_label = "$terms.Bugs" %] [% PROCESS "global/field-descs.none.tmpl" %] [% col_field_disp = field_descs.$col_field || col_field %] [% FILTER null; USE graph = GD.Graph.bars(width, height); graph.set(x_label => col_field_disp, y_label => y_label, y_tick_number => 8, y_number_format => "%d", x_label_position => 0.5, x_labels_vertical => x_labels_vertical, bar_spacing => 8, shadow_depth => 4, shadowclr => 'dred', show_values => 1, legend_placement => "RT"); graph.set(cumulate => "true", show_values => 0) IF cumulate; # Workaround for the fact that set_legend won't take row_names directly, # because row_names is an array reference rather than an array. graph.set_legend(row_names.0, row_names.1, row_names.2, row_names.3, row_names.4, row_names.5, row_names.6, row_names.7, row_names.8, row_names.9, row_names.10, row_names.11, row_names.12, row_names.13, row_names.14, row_names.15); graph.plot(data.0).png | stdout(1); END; -%] --- NEW FILE: series-common.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...> #%] [%# INTERFACE: # donames: boolean. True if we have a multi-select for names as well as # categories and subcategories. # category: hash (keyed by category) of hashes (keyed by subcategory) of # hashes (keyed by name), with value being the series_id of the # series. Contains details of all series the user can see. #%] [% subcategory = category.${default.category} %] [% name = subcategory.${default.subcategory} %] <script type="text/javascript"> [%# This structure holds details of the series the user can select from. %] var series = { [% FOREACH c = category.keys.sort %] "[%+ c FILTER js %]" : { [% FOREACH s = category.$c.keys.sort %] "[%+ s FILTER js %]" : { [% IF donames %] [% FOREACH n = category.$c.$s.keys.sort %] "[% n FILTER js %]": [% category.$c.$s.$n FILTER js %][% ", " UNLESS loop.last %] [% END %] [% END %] }[% ", " UNLESS loop.last %] [% END %] }[% ", " UNLESS loop.last %] [% END %] }; [%# Should attempt to preserve selection across invocations @@@ %] [%# This function takes necessary action on selection of a category %] function catSelected() { var cat = document.chartform.category.value; var subcats = series[cat]; var subcatwidget = document.chartform.subcategory; subcatwidget.options.length = 0; var i = 0; for (x in subcats) { subcatwidget.options[i] = new Option(x, x); i++; } [% IF newtext %] subcatwidget.options[i] = new Option("[% newtext FILTER js %]", ""); [% END %] subcatwidget.options[0].selected = true; if (document.chartform.action[1]) { [%# On the query form, select the right radio button. %] document.chartform.action[1].checked = true; } checkNewState(); } [%# This function updates the disabled state of the two "new" textboxes %] function checkNewState() { var fm = document.chartform; if (fm.newcategory) { fm.newcategory.disabled = (fm.category.value != "" || fm.action[1] && fm.action[1].checked == false); fm.newsubcategory.disabled = (fm.subcategory.value != "" || fm.action[1] && fm.action[1].checked == false); } } </script> [%###########################################################################%] [%# Block for SELECT fields - pinched from search/form.html.tmpl #%] [%###########################################################################%] [% BLOCK series_select %] <td align="left"> <label for="[% sel.name %]" accesskey="[% sel.accesskey %]"> <select name="[% sel.name %]" id="[% sel.name %]" size="[% sel.size %]" style="width: 15em" [%+ "disabled=\"disabled\"" UNLESS ${sel.name}.keys.size || newtext %] [%+ "onchange=\"$sel.onchange\"" IF sel.onchange %]> [% FOREACH x = ${sel.name}.keys.sort %] <option value="[% x FILTER html %]" [% " selected" IF default.${sel.name} == x %]> [% x FILTER html %]</option> [% END %] [% IF newtext %] <option value="">[% newtext FILTER html %]</option> [% ELSIF NOT ${sel.name}.keys.size %] <option value="" disabled="disabled"></option> [% END %] </select> </label> </td> [% END %] --- NEW FILE: chart.png.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...> #%] [% y_label = "Bugs" %] [% x_label = "Time" %] [% IF chart.cumulate %] [% USE graph = GD.Graph.area(width, height) %] [% graph.set(cumulate => "true") %] [% ELSE %] [% USE graph = GD.Graph.lines(width, height) %] [% END %] [% FILTER null; x_label_skip = (30 * chart.data.0.size / width); graph.set(x_label => x_label, y_label => y_label, y_tick_number => 8, x_label_position => 0.5, x_labels_vertical => 1, x_label_skip => x_label_skip, legend_placement => "RT", line_width => 2, dclrs => ["lred", "lgreen", "lblue", "lyellow", "lpurple", "lorange", "black", "green", "blue", "dpink", "lbrown", "gray", "red", "dpurple", "gold", "marine"]); # Workaround for the fact that set_legend won't take chart.labels directly, # because chart.labels is an array reference rather than an array. graph.set_legend(chart.labels.0, chart.labels.1, chart.labels.2, chart.labels.3, chart.labels.4, chart.labels.5, chart.labels.6, chart.labels.7, chart.labels.8, chart.labels.9, chart.labels.10, chart.labels.11, chart.labels.12, chart.labels.13, chart.labels.14, chart.labels.15); graph.plot(chart.data).png | stdout(1); END; -%] --- NEW FILE: edit-series.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...> #%] [% title = "Edit Series" %] [% h2 = BLOCK %] [% default.category FILTER html %] / [%+ default.subcategory FILTER html %] / [%+ default.name FILTER html %] [% END %] [% PROCESS global/header.html.tmpl %] [% IF changes_saved %] <p> <font color="red"> Series updated. </font> </p> [% END %] <form method="get" action="chart.cgi" name="chartform"> [% PROCESS reports/series.html.tmpl button_name = "Change Data Set" %] <input type="hidden" name="action" value="alter"> [% IF default.series_id %] <input type="hidden" name="series_id" value="[% default.series_id %]"> [% END %] </form> <p> <b>Creator</b>: [% IF creator.email %] <a href="mailto:[% creator.email FILTER html %]"> [% creator.email FILTER html %]</a> [% ELSE %] (automatically created by [% terms.Bugzilla %]) [% END %] </p> <p>Note: it is not yet possible to edit the search associated with this data set. </p> <p> <a href="query.cgi?[% default.query FILTER html %]">View series search parameters</a> | <a href="buglist.cgi?cmdtype=dorem&namedcmd= [% default.category FILTER url_quote %]- [% default.subcategory FILTER url_quote %]- [% default.name FILTER url_quote %]&remaction=runseries&series_id= [% default.series_id %]">Run series search</a> </p> [% PROCESS global/footer.html.tmpl %] |
|
From: Tim G. <xt...@us...> - 2005-05-15 14:38:55
|
Update of /cvsroot/openfirst/www/htdocs/bugzilla/request In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28397/request Added Files: email.txt.tmpl queue.html.tmpl Log Message: Bring templates up to date for Bugzilla 2.18.1 --- NEW FILE: queue.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): Myk Melez <my...@mo...> #%] [% PROCESS global/variables.none.tmpl %] [% USE Bugzilla %] [% cgi = Bugzilla.cgi %] [%# The javascript block gets used in header.html.tmpl. %] [% javascript = BLOCK %] var usetms = 0; // do we have target milestone? var first_load = 1; // is this the first time we load the page? var last_sel = []; // caches last selection var cpts = new Array(); [% FOREACH p = products %] cpts['[% p FILTER js %]'] = [ [%- FOREACH item = components_by_product.$p %]'[% item FILTER js %]'[% ", " UNLESS loop.last %] [%- END -%] ]; [% END %] [% END %] [% filter_form = BLOCK %] <form action="request.cgi" method="get"> <input type="hidden" name="action" value="queue"> <table id="filter"> <tr> <th>Requester:</th> <td><input type="text" name="requester" value="[% cgi.param('requester') FILTER html %]" size="20"></td> <th>Product:</th> <td> <select name="product" onchange="selectProduct(this.form, 'product', 'component', 'Any');"> <option value="">Any</option> [% FOREACH item = products %] <option value="[% item FILTER html %]" [% "selected" IF cgi.param('product') == item %]>[% item FILTER html %]</option> [% END %] </select> </td> <th>Flag:</th> <td> [% PROCESS "global/select-menu.html.tmpl" name="type" options=types default=cgi.param('type') %] </td> [%# We could let people see a "queue" of non-pending requests. %] <!-- <th>Status:</th> <td> [%# PROCESS "global/select-menu.html.tmpl" name="status" options=["all", "?", "+-", "+", "-"] default=cgi.param('status') %] </td> --> </tr> <tr> <th>Requestee:</th> <td><input type="text" name="requestee" value="[% cgi.param('requestee') FILTER html %]" size="20"></td> <th>Component:</th> <td> <select name="component"> <option value="">Any</option> [% FOREACH item = components %] <option value="[% item FILTER html %]" [% "selected" IF cgi.param('component') == item %]> [% item FILTER html %]</option> [% END %] </select> </td> <th>Group By:</th> <td> [% groups = { "Requester" => 'requester' , "Requestee" => 'requestee', "Flag" => 'type' , "Product/Component" => 'category' } %] [% PROCESS "global/select-menu.html.tmpl" name="group" options=groups default=cgi.param('group') %] </td> <td><input type="submit" value="Filter"></td> </tr> </table> </form> [% END %] [% column_headers = { "type" => "Flag" , "status" => "Status" , "bug" => "$terms.Bug" , "attachment" => "Attachment" , "requester" => "Requester" , "requestee" => "Requestee" , "created" => "Created" , "category" => "Product/Component" } %] [% DEFAULT display_columns = ["requester", "requestee", "type", "bug", "attachment", "created"] group_field = "Requestee" group_value = "" %] [% PROCESS global/header.html.tmpl title="Request Queue" h2=filter_form style = " table.requests th { text-align: left; } table#filter th { text-align: right; } " onload="selectProduct(document.forms[0], 'product', 'component', 'Any');" javascript_urls=["productmenu.js"] %] [% IF debug %] <p>[% query FILTER html %]</p> [% END %] [% IF requests.size == 0 %] <p> No requests. </p> [% ELSE %] [% FOREACH request = requests %] [% IF loop.first %] [% PROCESS start_new_table %] [% END %] [% IF request.$group_field != group_value %] [% group_value = request.$group_field %] [% UNLESS loop.first %] </table> [% PROCESS start_new_table %] [% END %] [% END %] <tr> [% FOREACH column = display_columns %] [% NEXT IF column == group_field || excluded_columns.contains(column) %] <td>[% PROCESS "display_$column" %]</td> [% END %] </tr> [% END %] </table> [% END %] [% PROCESS global/footer.html.tmpl %] [% BLOCK start_new_table %] <h3>[% column_headers.$group_field %]: [% (request.$group_field || "None") FILTER html %]</h3> <table class="requests" cellspacing="0" cellpadding="4" border="1"> <tr> [% FOREACH column = display_columns %] [% NEXT IF column == group_field || excluded_columns.contains(column) %] <th>[% column_headers.$column %]</th> [% END %] </tr> [% END %] [% BLOCK display_type %] [% request.type FILTER html %] [% END %] [% BLOCK display_status %] [% request.status %] [% END %] [% BLOCK display_bug %] <a href="show_bug.cgi?id=[% request.bug_id %]"> [% request.bug_id %]: [%+ request.bug_summary FILTER html %]</a> [% END %] [% BLOCK display_attachment %] [% IF request.attach_id %] <a href="attachment.cgi?id=[% request.attach_id %]&action=edit"> [% request.attach_id %]: [%+ request.attach_summary FILTER html %]</a> [% ELSE %] N/A [% END %] [% END %] [% BLOCK display_requestee %] [% request.requestee FILTER html %] [% END %] [% BLOCK display_requester %] [% request.requester FILTER html %] [% END %] [% BLOCK display_created %] [% request.created FILTER time %] [% END %] --- NEW FILE: email.txt.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): Myk Melez <my...@mo...> # Jeff Hedlund <jef...@ma...> #%] [% PROCESS global/variables.none.tmpl %] [% bugidsummary = flag.target.bug.id _ ': ' _ flag.target.bug.summary %] [% attidsummary = flag.target.attachment.id _ ': ' _ flag.target.attachment.summary %] [% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "cancelled" , '?' => "asked" } %] [% IF flag.status == '?' %] [% to_email = flag.requestee.email IF flag.requestee.email_prefs.FlagRequestee %] [% to_identity = flag.requestee.identity %] [% subject_status = "requested" %] [% ELSE %] [% to_email = flag.setter.email IF flag.setter.email_prefs.FlagRequester %] [% to_identity = flag.setter.identity _ "'s request" %] [% subject_status = statuses.${flag.status} %] [% END %] From: bugzilla-request-daemon To: [% to_email %] CC: [% flag.type.cc_list %] Subject: [% flag.type.name %] [%+ subject_status %]: [[% terms.Bug %] [%+ flag.target.bug.id %]] [% flag.target.bug.summary %] [%- IF flag.target.attachment.exists %] : [Attachment [% flag.target.attachment.id %]] [% flag.target.attachment.summary %][% END %] [%+ USE wrap -%] [%- FILTER bullet = wrap(80) -%] [% user.identity %] has [% statuses.${flag.status} %] [%+ to_identity %] for [% flag.type.name %]: [% terms.Bug %] [%+ bugidsummary %] [% END %] [%+ Param('urlbase') %]show_bug.cgi?id=[% flag.target.bug.id %] [% IF flag.target.attachment.exists %] [% FILTER bullet = wrap(80) %] Attachment [% attidsummary %] [%- END %] [%+ Param('urlbase') %]attachment.cgi?id=[% flag.target.attachment.id %]&action=edit [%- END %] [%- FILTER bullet = wrap(80) %] [% IF form.comment.length > 0 %] ------- Additional Comments from [% user.identity %] [%+ form.comment %] [% END %] [%- END %] |
7 messages has been excluded from this view by a project administrator.
