[Openfirst-cvscommit] www/htdocs/bugzilla/bug knob.html.tmpl,NONE,1.1 show.html.tmpl,NONE,1.1 show.x
Brought to you by:
xtimg
Menu
▾
▴
[Openfirst-cvscommit] www/htdocs/bugzilla/bug knob.html.tmpl,NONE,1.1 show.html.tmpl,NONE,1.1 show.xml.tmpl,NONE,1.1 time.html.tmpl,NONE,1.1 choose.html.tmpl,1.1,1.2 comments.html.tmpl,1.1,1.2 dependency-graph.html.tmpl,1.1,1.2 dependency-tree.html.tmpl,1.1,1.2 edit.html.tmpl,1.1,1.2 navigate.html.tmpl,1.1,1.2 show-multiple.html.tmpl,1.1,1.2
|
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> |
