Skip to content

bugzilla
bugzilla
Commit e596da03 authored by lpsolit%gmail.com's avatar lpsolit%gmail.com
Browse files
Options

Bug 357534: Add fieldsets in show_bug.cgi - Patch by Frédéric Buclin…

Bug 357534: Add fieldsets in show_bug.cgi - Patch by Frédéric Buclin <LpSolit@gmail.com> r=mkanat a=justdave
parent a41782ed
Hide whitespace changes
Inline Side-by-side
Showing with 333 additions and 289 deletions
template/en/default/bug/edit.html.tmpl
View file @ e596da03
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
# Contributor(s): Gervase Markham <gerv@gerv.net> # Contributor(s): Gervase Markham <gerv@gerv.net>
# Vaskin Kissoyan <vkissoyan@yahoo.com> # Vaskin Kissoyan <vkissoyan@yahoo.com>
# Max Kanat-Alexander <mkanat@bugzilla.org> # Max Kanat-Alexander <mkanat@bugzilla.org>
# Frédéric Buclin <LpSolit@gmail.com>
#%] #%]
[% PROCESS global/variables.none.tmpl %] [% PROCESS global/variables.none.tmpl %]
...@@ -135,320 +136,146 @@ ...@@ -135,320 +136,146 @@
<input type="hidden" name="longdesclength" value="[% bug.longdescs.size %]"> <input type="hidden" name="longdesclength" value="[% bug.longdescs.size %]">
<input type="hidden" name="id" value="[% bug.bug_id %]"> <input type="hidden" name="id" value="[% bug.bug_id %]">
[%# *** Hardware Reporter Product OS AddCC *** %] [%# That's the main table, which contains all editable fields. %]
<table> <table>
<tr> <tr>
<td valign="top"> <td valign="top" rowspan="2">
<table cellspacing="1" cellpadding="1"> <fieldset>
<tr> <legend>Details</legend>
<td align="right"> <table>
[% IF Param('useclassification') && bug.classification_id != 1 %]
<b>[[% bug.classification FILTER html %]]</b> [%# *** Summary *** %]
[% END %]
<b>[% terms.Bug %]#</b>:
</td>
<td>
<a href="[% Param('urlbase') %]show_bug.cgi?id=[% bug.bug_id %]">
[% bug.bug_id %]</a>
</td>
</tr>
[% IF Param("usebugaliases") %]
<tr> <tr>
<td align="right"> <td align="right">
<label for="alias" title="a name for the [% terms.bug %] that can be used in place of its ID number, f.e. when adding it to a list of dependencies"><b>Alias</b></label>: <label for="short_desc" accesskey="s"><b><u>S</u>ummary</b></label>:
</td> </td>
[% PROCESS input inputname => "alias" size => "20" maxlength => "20" %] [% PROCESS input inputname => "short_desc" size => "60" colspan => 2
maxlength => 255 %]
</tr> </tr>
[% END %]
<tr>
<td align="right">
<label for="product" accesskey="p"><b><u>P</u>roduct</b></label>:
</td>
[% PROCESS select selname => "product" %]
</tr>
[%# *** Component Version CC Priority Severity AssignedTo Milestone *** %]
<tr>
<td align="right">
<label for="component" accesskey="m"><b><a href="describecomponents.cgi?product=[% bug.product FILTER url_quote %]">Co<u>m</u>ponent</a></b></label>:
</td>
[% PROCESS select selname => "component" %]
</tr>
<tr>
<td align="right">
<b><a href="page.cgi?id=fields.html#status">Status</a></b>:
</td>
<td>[% status_descs.${bug.bug_status} FILTER html %]</td>
</tr>
<tr>
<td align="right">
<b><a href="page.cgi?id=fields.html#resolution">Resolution</a></b>:
</td>
<td>
[% get_resolution(bug.resolution) FILTER html %]
[% IF bug.resolution == "DUPLICATE" %]
of [% terms.bug %] [%+ "${bug.dup_id}" FILTER bug_link(bug.dup_id) FILTER none %]
[% END %]
</td>
</tr>
</table>
</td>
<td valign="top">
<table cellspacing="1" cellpadding="1">
<tr>
<td align="right">
<label for="rep_platform" accesskey="h"><b><u>H</u>ardware</b></label>:
</td>
[% PROCESS select selname => "rep_platform" %]
</tr>
<tr>
<td align="right">
<label for="op_sys" accesskey="o"><b><u>O</u>S</b></label>:
</td>
[% PROCESS select selname => "op_sys" %]
</tr>
<tr>
<td align="right">
<label for="version"><b>Version</b></label>:
</td>
[% PROCESS select selname => "version" %]
</tr>
<tr>
<td align="right">
<label for="priority" accesskey="i"><b><a href="page.cgi?id=fields.html#priority">Pr<u>i</u>ority</a></b></label>:
</td>
[% PROCESS select selname => "priority" %]
</tr>
<tr>
<td align="right">
<label for="bug_severity"><b><a href="page.cgi?id=fields.html#bug_severity">Severity</a></b></label>:
</td>
[% PROCESS select selname = "bug_severity" %]
</tr>
[% IF Param("usetargetmilestone") && bug.target_milestone %]
<tr> <tr>
<td align="right"> <td colspan="3">
<label for="target_milestone"><b> <table>
[% IF bug.milestoneurl %] <tr>
<a href="[% bug.milestoneurl FILTER html %]"> [%# *** ID, product, component, status and resolution *** %]
[% END %] <td valign="top">[% PROCESS section_details1 %]</td>
Target Milestone[% "</a>" IF bug.milestoneurl %]
[%%]</b></label>: [%# *** Platform, OS, severity, priority, version and milestone *** %]
<td valign="top">[% PROCESS section_details2 %]</td>
</tr>
</table>
</td> </td>
[% PROCESS select selname = "target_milestone" %]
</tr> </tr>
[% END %]
</table> <tr>
</td> <td colspan="3"><hr size="1"></td>
</tr>
<td valign="top"> [%# *** URL Whiteboard Keywords *** %]
<table cellpadding="1" cellspacing="1">
<tr>
<tr> <td align="right">
<td align="right"> <label for="bug_file_loc" accesskey="u"><b>
<b>Reporter</b>: [% IF bug.bug_file_loc
</td> AND NOT bug.bug_file_loc.match("^(javascript|data)") %]
<td> <a href="[% bug.bug_file_loc FILTER html %]"><u>U</u>RL</a>
<a href="mailto:[% bug.reporter.email FILTER html %]">
[% bug.reporter.identity FILTER html %]</a>
</td>
</tr>
<tr>
<td align="right">
<b><a href="page.cgi?id=fields.html#assigned_to">Assigned&nbsp;To</a></b>:
</td>
<td>
<a href="mailto:[% bug.assigned_to.email FILTER html %]">
[% bug.assigned_to.identity FILTER html %]</a>
</td>
</tr>
[% IF Param('useqacontact') %]
<tr>
<td align="right">
<label for="qa_contact" accesskey="q"><b><u>Q</u>A Contact</b></label>:
</td>
<td colspan="7">
[% IF bug.check_can_change_field("qa_contact", 0, 1) || !user.id %]
[% INCLUDE global/userselect.html.tmpl
id => "qa_contact"
name => "qa_contact"
value => bug.qa_contact.login
size => 30
emptyok => 1
%]
[% ELSE %]
<input type="hidden" name="qa_contact"
value="[% bug.qa_contact.login FILTER html %]">
<a href="mailto:[% bug.qa_contact.email FILTER html %]">
[% IF bug.qa_contact.login && bug.qa_contact.login.length > 30 %]
<span title="[% bug.qa_contact.login FILTER html %]">
[% bug.qa_contact.identity FILTER truncate(30) FILTER html %]
</span>
[% ELSE %] [% ELSE %]
[% bug.qa_contact.identity FILTER html %] <u>U</u>RL
[% END %] [% END %]
</a> [%%]</b></label>:
[% END %]
</td>
</tr>
[% END %]
<tr>
<td align="right" valign="top">
<label for="newcc" accesskey="a"><b><u>A</u>dd&nbsp;CC</b></label>:
</td>
<td>
[% INCLUDE global/userselect.html.tmpl
id => "newcc"
name => "newcc"
value => ""
size => 30
multiple => 5
%]
</td>
</tr>
<tr>
[% IF bug.cc %]
<td align="right" valign="top">
<label for="cc"><b>CC</b></label>:
</td>
<td valign="top">
<select id="cc" name="cc" multiple="multiple" size="5">
[% FOREACH c = bug.cc %]
<option value="[% c FILTER html %]">[% c FILTER html %]</option>
[% END %]
</select>
<br>
<input type="checkbox" id="removecc" name="removecc">
[%%]<label for="removecc">Remove selected CCs</label>
<br>
</td> </td>
[% ELSE %] [% PROCESS input inputname => "bug_file_loc" size => "60" colspan => 2 %]
<td colspan="2"><input type="hidden" name="cc" value=""></td> </tr>
[% IF Param('usestatuswhiteboard') %]
<tr>
<td align="right">
<label for="status_whiteboard" accesskey="w"><b><u>W</u>hiteboard</b></label>:
</td>
[% PROCESS input inputname => "status_whiteboard" size => "60" colspan => 2 %]
</tr>
[% END %] [% END %]
</tr>
</table> [% IF use_keywords %]
</td> <tr>
</tr> <td align="right">
<label for="keywords" accesskey="k">
<b><a href="describekeywords.cgi"><u>K</u>eywords</a></b></label>:
</td>
[% PROCESS input inputname => "keywords" size => 60 colspan => 2
value => bug.keywords.join(', ') %]
</tr>
[% END %]
<tr> [%# *** Custom Fields *** %]
<td colspan="2">
<table cellspacing="1" cellpadding="1"> [% USE Bugzilla %]
[% fields = Bugzilla.get_fields({ obsolete => 0, custom => 1 }) %]
[% IF fields %]
[% FOREACH field = fields %]
<tr>
[% PROCESS bug/field.html.tmpl value=bug.${field.name}
editable = bug.check_can_change_field(field.name, 0, 1) || !user.id
value_span = 2 %]
</tr>
[% END %]
[% END %]
[%# *** URL Requests Summary Whiteboard Keywords *** %] [%# *** Dependencies *** %]
<tr>
<td align="right">
<label for="short_desc" accesskey="s"><b><u>S</u>ummary</b></label>:
</td>
[% PROCESS input inputname => "short_desc" size => "60" colspan => 2
maxlength => 255 %]
</tr>
<tr>
<td align="right">
<label for="bug_file_loc" accesskey="u"><b>
[% IF bug.bug_file_loc
AND NOT bug.bug_file_loc.match("^(javascript|data)") %]
<a href="[% bug.bug_file_loc FILTER html %]"><u>U</u>RL</a>
[% ELSE %]
<u>U</u>RL
[% END %]
[%%]</b></label>:
</td>
[% PROCESS input inputname => "bug_file_loc" size => "60" colspan => 2 %]
</tr>
[% IF Param('usestatuswhiteboard') %]
<tr> <tr>
<td align="right"> [% PROCESS dependencies
<label for="status_whiteboard" accesskey="w"><b><u>W</u>hiteboard</b></label>: dep = { title => "Depends&nbsp;on", fieldname => "dependson" } %]
</td>
[% PROCESS input inputname => "status_whiteboard" size => "60"
colspan => 2 %]
</tr> </tr>
[% END %]
[% IF use_keywords %]
<tr> <tr>
<td align="right"> [% PROCESS dependencies accesskey = "b"
<label for="keywords" accesskey="k"><b><a href="describekeywords.cgi"><u>K</u>eywords</a></b></label>: dep = { title => "<u>B</u>locks", fieldname => "blocked" } %]
[% PROCESS input inputname => "keywords" size => 60 colspan => 2
value => bug.keywords.join(', ') %]
</tr> </tr>
[% END %]
[%# *** Custom Fields *** %]
[% USE Bugzilla %]
[% fields = Bugzilla.get_fields({ obsolete => 0, custom => 1 }) %]
[% IF fields %]
[% FOREACH field = fields %]
<tr>
[% PROCESS bug/field.html.tmpl value=bug.${field.name}
editable = bug.check_can_change_field(field.name, 0, 1) || !user.id
value_span = 2 %]
</tr>
[% END %]
[% END %]
<tr>
[% PROCESS dependencies
dep = { title => "Depends on", fieldname => "dependson" } %]
</tr>
<tr> <tr>
[% PROCESS dependencies accesskey = "b" <th>&nbsp;</th>
dep = { title => "<u>B</u>locks", fieldname => "blocked" } %]
</tr>
<tr> <td colspan="2">
<th>&nbsp;</th> <a href="showdependencytree.cgi?id=[% bug.bug_id %]&amp;hide_resolved=1">Show
dependency tree</a>
<td colspan="2"> [% IF Param('webdotbase') %]
<a href="showdependencytree.cgi?id=[% bug.bug_id %]&amp;hide_resolved=1">Show - <a href="showdependencygraph.cgi?id=[% bug.bug_id %]">Show
dependency tree</a> dependency graph</a>
[% END %]
</td>
</tr>
</table>
</fieldset>
</td>
[% IF Param('webdotbase') %] [%# *** Reporter, owner and QA contact *** %]
- <a href="showdependencygraph.cgi?id=[% bug.bug_id %]">Show <td valign="top">
dependency graph</a> <fieldset>
[% END %] <legend>People</legend>
</td> [% PROCESS section_people %]
</tr> </fieldset>
</table>
</td> </td>
</tr>
<tr>
[%# *** Flags *** %]
<td valign="top"> <td valign="top">
<table cellspacing="1" cellpadding="1"> <fieldset>
<tr> <legend>Flags</legend>
<td colspan="2" valign="top"> <table cellspacing="1" cellpadding="1">
<tr>
<td colspan="2" valign="top">
[% IF bug.flag_types.size > 0 %] [% IF bug.flag_types.size > 0 %]
[% PROCESS "flag/list.html.tmpl" [% PROCESS "flag/list.html.tmpl" flag_no_header = 1
flag_types = bug.flag_types flag_types = bug.flag_types
any_flags_requesteeble = bug.any_flags_requesteeble %] any_flags_requesteeble = bug.any_flags_requesteeble %]
[% END %] [% END %]
</td> </td>
</tr> </tr>
</table> </table>
</fieldset>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -685,6 +512,221 @@ ...@@ -685,6 +512,221 @@
</form> </form>
[%############################################################################%] [%############################################################################%]
[%# Block for the first table in the "Details" section #%]
[%############################################################################%]
[% BLOCK section_details1 %]
<table cellspacing="1" cellpadding="1">
<tr>
<td align="right">
[% IF Param('useclassification') && bug.classification_id != 1 %]
<b>[[% bug.classification FILTER html %]]</b>
[% END %]
<b>[% terms.Bug %]#</b>:
</td>
<td>
<a href="[% Param('urlbase') %]show_bug.cgi?id=[% bug.bug_id %]">
[% bug.bug_id %]</a>
</td>
</tr>
[% IF Param("usebugaliases") %]
<tr>
<td align="right">
<label for="alias" title="a name for the [% terms.bug %] that can be used in place of its ID number, f.e. when adding it to a list of dependencies"><b>Alias</b></label>:
</td>
[% PROCESS input inputname => "alias" size => "20" maxlength => "20" %]
</tr>
[% END %]
<tr>
<td align="right">
<label for="product" accesskey="p"><b><u>P</u>roduct</b></label>:
</td>
[% PROCESS select selname => "product" %]
</tr>
<tr>
<td align="right">
<label for="component" accesskey="m"><b><a href="describecomponents.cgi?product=[% bug.product FILTER url_quote %]">Co<u>m</u>ponent</a></b></label>:
</td>
[% PROCESS select selname => "component" %]
</tr>
<tr>
<td align="right">
<b><a href="page.cgi?id=fields.html#status">Status</a></b>:
</td>
<td>[% status_descs.${bug.bug_status} FILTER html %]</td>
</tr>
<tr>
<td align="right">
<b><a href="page.cgi?id=fields.html#resolution">Resolution</a></b>:
</td>
<td>
[% get_resolution(bug.resolution) FILTER html %]
[% IF bug.resolution == "DUPLICATE" %]
of [% terms.bug %] [%+ "${bug.dup_id}" FILTER bug_link(bug.dup_id) FILTER none %]
[% END %]
</td>
</tr>
</table>
[% END %]
[%############################################################################%]
[%# Block for the second table in the "Details" section #%]
[%############################################################################%]
[% BLOCK section_details2 %]
<table cellspacing="1" cellpadding="1">
<tr>
<td align="right">
<label for="rep_platform" accesskey="h"><b><u>H</u>ardware</b></label>:
</td>
[% PROCESS select selname => "rep_platform" %]
</tr>
<tr>
<td align="right">
<label for="op_sys" accesskey="o"><b><u>O</u>S</b></label>:
</td>
[% PROCESS select selname => "op_sys" %]
</tr>
<tr>
<td align="right">
<label for="version"><b>Version</b></label>:
</td>
[% PROCESS select selname => "version" %]
</tr>
<tr>
<td align="right">
<label for="priority" accesskey="i"><b><a href="page.cgi?id=fields.html#priority">Pr<u>i</u>ority</a></b></label>:
</td>
[% PROCESS select selname => "priority" %]
</tr>
<tr>
<td align="right">
<label for="bug_severity"><b><a href="page.cgi?id=fields.html#bug_severity">Severity</a></b></label>:
</td>
[% PROCESS select selname = "bug_severity" %]
</tr>
[% IF Param("usetargetmilestone") && bug.target_milestone %]
<tr>
<td align="right">
<label for="target_milestone"><b>
[% IF bug.milestoneurl %]
<a href="[% bug.milestoneurl FILTER html %]">
[% END %]
Target Milestone[% "</a>" IF bug.milestoneurl %]
[%%]</b></label>:
</td>
[% PROCESS select selname = "target_milestone" %]
</tr>
[% END %]
</table>
[% END %]
[%############################################################################%]
[%# Block for the table in the "People" section #%]
[%############################################################################%]
[% BLOCK section_people %]
<table cellpadding="1" cellspacing="1">
<tr>
<td align="right">
<b>Reporter</b>:
</td>
<td>
<a href="mailto:[% bug.reporter.email FILTER html %]">
[% bug.reporter.identity FILTER html %]</a>
</td>
</tr>
<tr>
<td align="right">
<b><a href="page.cgi?id=fields.html#assigned_to">Assigned&nbsp;To</a></b>:
</td>
<td>
<a href="mailto:[% bug.assigned_to.email FILTER html %]">
[% bug.assigned_to.identity FILTER html %]</a>
</td>
</tr>
[% IF Param('useqacontact') %]
<tr>
<td align="right">
<label for="qa_contact" accesskey="q"><b><u>Q</u>A Contact</b></label>:
</td>
<td colspan="7">
[% IF bug.check_can_change_field("qa_contact", 0, 1) || !user.id %]
[% INCLUDE global/userselect.html.tmpl
id => "qa_contact"
name => "qa_contact"
value => bug.qa_contact.login
size => 30
emptyok => 1
%]
[% ELSE %]
<input type="hidden" name="qa_contact"
value="[% bug.qa_contact.login FILTER html %]">
<a href="mailto:[% bug.qa_contact.email FILTER html %]">
[% IF bug.qa_contact.login && bug.qa_contact.login.length > 30 %]
<span title="[% bug.qa_contact.login FILTER html %]">
[% bug.qa_contact.identity FILTER truncate(30) FILTER html %]
</span>
[% ELSE %]
[% bug.qa_contact.identity FILTER html %]
[% END %]
</a>
[% END %]
</td>
</tr>
[% END %]
<tr>
<td align="right" valign="top">
<label for="newcc" accesskey="a"><b><u>A</u>dd&nbsp;CC</b></label>:
</td>
<td>
[% INCLUDE global/userselect.html.tmpl
id => "newcc"
name => "newcc"
value => ""
size => 30
multiple => 5
%]
</td>
</tr>
<tr>
[% IF bug.cc %]
<td align="right" valign="top">
<label for="cc"><b>CC</b></label>:
</td>
<td valign="top">
<select id="cc" name="cc" multiple="multiple" size="5">
[% FOREACH c = bug.cc %]
<option value="[% c FILTER html %]">[% c FILTER html %]</option>
[% END %]
</select>
<br>
<input type="checkbox" id="removecc" name="removecc">
[%%]<label for="removecc">Remove selected CCs</label>
<br>
</td>
[% ELSE %]
<td colspan="2"><input type="hidden" name="cc" value=""></td>
[% END %]
</tr>
</table>
[% END %]
[%############################################################################%]
[%# Block for dependencies #%] [%# Block for dependencies #%]
[%############################################################################%] [%############################################################################%]
......
template/en/default/flag/list.html.tmpl
View file @ e596da03
...@@ -75,16 +75,18 @@ ...@@ -75,16 +75,18 @@
[% DEFAULT flag_table_id = "flags" %] [% DEFAULT flag_table_id = "flags" %]
<table id="[% flag_table_id FILTER html %]"> <table id="[% flag_table_id FILTER html %]">
<tr> [% UNLESS flag_no_header %]
<th colspan="3"> <tr>
Flags: <th colspan="3">
</th> Flags:
[% IF any_flags_requesteeble %]
<th>
Requestee:
</th> </th>
[% END %] [% IF any_flags_requesteeble %]
</tr> <th>
Requestee:
</th>
[% END %]
</tr>
[% END %]
[%# Step 1: Display every flag type (except inactive types with no flags). %] [%# Step 1: Display every flag type (except inactive types with no flags). %]
[% FOREACH type = flag_types %] [% FOREACH type = flag_types %]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment