diff options
Diffstat (limited to 'template/en/default/list')
| -rw-r--r-- | template/en/default/list/change-columns.html.tmpl | 38 | ||||
| -rw-r--r-- | template/en/default/list/edit-multiple.html.tmpl | 79 | ||||
| -rw-r--r-- | template/en/default/list/list-simple.html.tmpl | 3 | ||||
| -rw-r--r-- | template/en/default/list/list.html.tmpl | 6 | ||||
| -rw-r--r-- | template/en/default/list/list.ics.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/list/list.rdf.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/list/quips.html.tmpl | 7 | ||||
| -rw-r--r-- | template/en/default/list/table.html.tmpl | 17 |
8 files changed, 100 insertions, 54 deletions
diff --git a/template/en/default/list/change-columns.html.tmpl b/template/en/default/list/change-columns.html.tmpl index 36cd5db..b13055c 100644 --- a/template/en/default/list/change-columns.html.tmpl +++ b/template/en/default/list/change-columns.html.tmpl @@ -34,10 +34,22 @@ [% 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" %] +[% field_descs.short_desc = "Summary (Full)" %] +[% field_descs.assigned_to_realname = "$field_descs.assigned_to Real Name" %] +[% field_descs.reporter_realname = "$field_descs.reporter Real Name" %] +[% field_descs.qa_contact_realname = "$field_descs.qa_contact Real Name" %] + +[%# Create a mapping of field descriptions to field names, so that + # the "Available Columns" list can be sorted alphabetically by + # field description. + #%] +[% SET available_columns = {} %] +[% FOREACH column = columns.keys %] + [% NEXT IF collist.contains(column) %] + [%# We lowecase the keys so that the sort happens case-insensitively. %] + [% SET column_desc = field_descs.$column || column FILTER lower %] + [% available_columns.$column_desc = column %] +[% END %] <form name="changecolumns" action="colchange.cgi" onsubmit="change_submit();"> <input type="hidden" name="rememberedquery" value="[% buffer FILTER html %]"> @@ -70,12 +82,13 @@ [% (field_descs.${column} || column) FILTER html %] </option> [% END %] - [% FOREACH column = masterlist %] - [% IF lsearch(collist, column) == -1 %] - <option value="[% column FILTER html %]"> - [% (field_descs.${column} || column) FILTER html %] - </option> - [% END %] + [% FOREACH key = available_columns.keys.sort %] + [% SET column = available_columns.$key %] + <option value="[% column FILTER html %]"> + [%# Don't display the lower-cased column description, + # display the correct-case one. %] + [% (field_descs.$column || column) FILTER html %] + </option> [% END %] </select> </td> @@ -108,11 +121,16 @@ <p> <input type="hidden" name="saved_search" value="[% saved_search.id FILTER html%]" > + <input type="hidden" name="token" + value="[% issue_hash_token([saved_search.id, saved_search.name]) FILTER html %]"> <input type="checkbox" id="save_columns_for_search" checked="checked" name="save_columns_for_search" value="1"> <label for="save_columns_for_search">Save this column list only for search '[% saved_search.name FILTER html %]'</label> </p> + [% ELSE %] + <input type="hidden" name="token" + value="[% issue_hash_token(['default-list']) FILTER html %]"> [% END %] <p> diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl index 75f2f83..92e578e 100644 --- a/template/en/default/list/edit-multiple.html.tmpl +++ b/template/en/default/list/edit-multiple.html.tmpl @@ -19,6 +19,7 @@ # Max Kanat-Alexander <mkanat@bugzilla.org> # Frédéric Buclin <LpSolit@gmail.com> # Guy Pyrzak <guy.pyrzak@gmail.com> + # Reed Loden <reed@reedloden.com> #%] [% PROCESS global/variables.none.tmpl %] @@ -149,13 +150,9 @@ value="[% dontchange FILTER html %]" size="6"> </td> - <th><label for="deadline">Deadline (YYYY-MM-DD):</label></th> - <td> - <input id="deadline" - name="deadline" - value="[% dontchange FILTER html %]" - size="10"> - </td> + [% PROCESS bug/field.html.tmpl + field = bug_fields.deadline, value = dontchange + editable = 1, allow_dont_change = 1 %] </tr> <tr> <th><label for="remaining_time">Remaining Hours:</label></th> @@ -177,7 +174,7 @@ id => "assigned_to" name => "assigned_to" value => dontchange - size => 32 + size => 40 %] <input type="checkbox" id="set_default_assignee" name="set_default_assignee" value="1"> <label for="set_default_assignee">Reset Assignee to default</label> @@ -192,7 +189,7 @@ id => "qa_contact" name => "qa_contact" value => dontchange - size => 32 + size => 40 %] <input type="checkbox" id="set_default_qa_contact" name="set_default_qa_contact" value="1"> <label for="set_default_qa_contact">Reset QA Contact to default</label> @@ -204,7 +201,13 @@ <th><label for="masscc">CC List:</label></th> <td colspan="3"> - <input id="masscc" name="masscc" size="32"> + [% INCLUDE global/userselect.html.tmpl + id => "masscc" + name => "masscc" + value => "" + size => 40 + multiple => 5 + %] <select name="ccaction"> <option value="add">Add these to the CC List</option> <option value="remove">Remove these from the CC List</option> @@ -216,17 +219,19 @@ [% IF use_keywords %] <tr> - <th> - <label for="keywords"> - <a href="describekeywords.cgi">Keywords</a>: - </label> - </th> + [% INCLUDE "bug/field-label.html.tmpl" + field = bug_fields.keywords, editable = 1 + desc_url = "describekeywords.cgi" + %] <td colspan="3"> - <input id="keywords" name="keywords" size="32"> + [% INCLUDE bug/field.html.tmpl + field = bug_fields.keywords, editable = 1, value = keywords + no_tds = 1 + %] <select name="keywordaction"> <option value="add">Add these keywords</option> - <option value="delete">Delete these keywords</option> - <option value="makeexact">Make the keywords be exactly this list</option> + <option value="remove">Delete these keywords</option> + <option value="set">Make the keywords be exactly this list</option> </select> </td> @@ -240,7 +245,7 @@ </label> </th> <td colspan="3"> - <input id="dependson" name="dependson" size="32"> + <input id="dependson" name="dependson" size="40"> <select name="dependson_action"> <option value="add">Add these IDs</option> <option value="remove">Delete these IDs</option> @@ -255,7 +260,7 @@ </label> </th> <td colspan="3"> - <input id="blocked" name="blocked" size="32"> + <input id="blocked" name="blocked" size="40"> <select name="blocked_action"> <option value="add">Add these IDs</option> <option value="remove">Delete these IDs</option> @@ -276,6 +281,8 @@ [% END %] [% USE Bugzilla %] + [%# Show all legal values and all fields, ignoring visibility controls. %] + [% bug = 0 %] [% FOREACH field = Bugzilla.active_custom_fields %] <tr> [% PROCESS bug/field.html.tmpl value = dontchange @@ -290,7 +297,7 @@ <b><label for="comment">Additional Comments:</label></b> [% IF user.is_insider %] - <input type="checkbox" name="commentprivacy" value="1" + <input type="checkbox" name="comment_is_private" value="1" id="newcommentprivacy" onClick="updateCommentTagControl(this, form)"/> <label for="newcommentprivacy"> @@ -311,10 +318,18 @@ [% IF groups.size > 0 %] + <script type="text/javascript"> + function turn_off(myself, id) { + var other_checkbox = document.getElementById(id); + if (myself.checked && other_checkbox) { + other_checkbox.checked = false; + } + } + </script> + <b>Groups:</b><br> <table border="1"> <tr> - <th>Don't<br>change<br>this group<br>restriction</th> <th>Remove<br>[% terms.bugs %]<br>from this<br>group</th> <th>Add<br>[% terms.bugs %]<br>to this<br>group</th> <th>Group Name:</th> @@ -323,14 +338,17 @@ [% FOREACH group = groups %] <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"> + <input type="checkbox" name="defined_groups" + id="defined_group_[% group.id %]" + value="[% group.name FILTER html %]" + onchange="turn_off(this, 'group_[% group.id %]')"> </td> [% IF group.is_active %] <td align="center"> - <input type="radio" name="bit-[% group.id %]" value="1"> + <input type="checkbox" name="groups" + id="group_[% group.id FILTER html %]" + value="[% group.name FILTER html %]" + onchange="turn_off(this, 'defined_group_[% group.id %]')"> </td> [% ELSE %] <td> </td> @@ -353,11 +371,10 @@ [% END %] [% END %] -<input type="submit" id="commit" value="Commit"> -[% IF Param('move-enabled') && user.is_mover %] - <input type="submit" name="action" id="action" value="[% Param('move-button-text') %]"> -[% END %] +[%+ Hook.process('after_groups') %] + +<input type="submit" id="commit" value="Commit"> [%############################################################################%] [%# Select Menu Block #%] diff --git a/template/en/default/list/list-simple.html.tmpl b/template/en/default/list/list-simple.html.tmpl index 125a164..f4c3549 100644 --- a/template/en/default/list/list-simple.html.tmpl +++ b/template/en/default/list/list-simple.html.tmpl @@ -39,7 +39,8 @@ <head> <title>[% title FILTER html %]</title> <base href="[% urlbase FILTER html %]"> - <link href="skins/standard/buglist.css" rel="stylesheet" type="text/css"> + <link href="[% 'skins/standard/buglist.css' FILTER mtime %]" + rel="stylesheet" type="text/css"> </head> <body> diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl index 941b34a..8d87b5c 100644 --- a/template/en/default/list/list.html.tmpl +++ b/template/en/default/list/list.html.tmpl @@ -46,8 +46,9 @@ title = title style = style atomlink = "buglist.cgi?$urlquerypart&title=$title&ctype=atom" - javascript_urls = [ "js/util.js", "js/field.js", "js/yui/calendar.js" ] - style_urls = [ "skins/standard/buglist.css", "skins/standard/yui/calendar.css" ] + yui = [ 'autocomplete', 'calendar' ] + javascript_urls = [ "js/util.js", "js/field.js" ] + style_urls = [ "skins/standard/buglist.css" ] doc_section = "query.html#list" %] @@ -252,6 +253,7 @@ value="[% urlquerypart FILTER html %][% "&order=$qorder" FILTER html IF order %]"> <input type="hidden" name="cmdtype" value="doit"> <input type="hidden" name="remtype" value="asnamed"> + <input type="hidden" name="token" value="[% issue_hash_token(['savedsearch']) FILTER html %]"> <input type="text" id="save_newqueryname" name="newqueryname" size="20" value="[% defaultsavename FILTER html %]"> </form> diff --git a/template/en/default/list/list.ics.tmpl b/template/en/default/list/list.ics.tmpl index 3f9e2b8..b135267 100644 --- a/template/en/default/list/list.ics.tmpl +++ b/template/en/default/list/list.ics.tmpl @@ -82,7 +82,7 @@ END:VCALENDAR [% END %] [% END %] [% IF NOT status %] - [% IF bug_status == 'ASSIGNED' %] + [% IF bug_status == 'IN_PROGRESS' || bug_status == 'ASSIGNED' %] [% status = 'IN-PROGRESS' %] [% ELSE %] [% status = 'NEEDS-ACTION' %] diff --git a/template/en/default/list/list.rdf.tmpl b/template/en/default/list/list.rdf.tmpl index 99c06c1..d7879a6 100644 --- a/template/en/default/list/list.rdf.tmpl +++ b/template/en/default/list/list.rdf.tmpl @@ -38,7 +38,7 @@ <bz:id nc:parseType="Integer">[% bug.bug_id %]</bz:id> [% FOREACH column = displaycolumns %] - <bz:[% column %][% ' nc:parseType="Integer"' IF column == "votes" %]>[% bug.$column FILTER html %]</bz:[% column %]> + <bz:[% column %]>[% bug.$column FILTER html %]</bz:[% column %]> [% END %] </bz:bug> diff --git a/template/en/default/list/quips.html.tmpl b/template/en/default/list/quips.html.tmpl index 1404b2e..b330596 100644 --- a/template/en/default/list/quips.html.tmpl +++ b/template/en/default/list/quips.html.tmpl @@ -73,6 +73,8 @@ <form method="post" action="quips.cgi"> <input type="hidden" name="action" value="add"> + <input type="hidden" name="token" + value="[% issue_hash_token(['create-quips']) FILTER html %]"> <input size="80" name="quip"> <p> <input type="submit" id="add" value="Add This Quip"> @@ -103,6 +105,8 @@ </p> <form name="editform" method="post" action="quips.cgi"> <input type="hidden" name="action" value="approve"> + <input type="hidden" name="token" + value="[% issue_hash_token(['approve-quips']) FILTER html %]"> <table border="1"> <thead><tr> <th>Quip</th> @@ -119,7 +123,8 @@ [% "Unknown" IF NOT users.$userid %] </td> <td> - <a href="quips.cgi?action=delete&quipid=[% quipid FILTER url_quote %]"> + <a href="quips.cgi?action=delete&quipid=[% quipid FILTER url_quote %]&token= + [%- issue_hash_token(['quips', quipid]) FILTER url_quote %]"> Delete </a> </td> diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl index 282ea51..88fae24 100644 --- a/template/en/default/list/table.html.tmpl +++ b/template/en/default/list/table.html.tmpl @@ -45,7 +45,7 @@ [% abbrev = { "bug_severity" => { maxlength => 3 , title => "Sev" } , - "priority" => { maxlength => 3 , title => "Pri" } , + "priority" => { maxlength => 7 , title => "Pri" } , "rep_platform" => { maxlength => 3 , title => "Plt" } , "bug_status" => { maxlength => 4 } , "assigned_to" => { maxlength => 30 , ellipsis => "..." } , @@ -64,6 +64,7 @@ "product" => { maxlength => 8 } , "version" => { maxlength => 5 , title => "Vers" } , "op_sys" => { maxlength => 4 } , + "bug_file_loc" => { maxlength => 30 } , "target_milestone" => { title => "TargetM" } , "percentage_complete" => { format_value => "%d %%" } , } @@ -71,6 +72,8 @@ [% PROCESS bug/time.html.tmpl %] +[% Hook.process("before_table") %] + [%############################################################################%] [%# Table Header #%] [%############################################################################%] @@ -162,14 +165,12 @@ [%# Bug Table #%] [%############################################################################%] -[% Hook.process("before_table") %] - [% tableheader %] [% FOREACH bug = bugs %] [% count = loop.count() %] - <tr class="bz_bugitem + <tr id="b[% bug.bug_id %]" class="bz_bugitem bz_[% bug.bug_severity FILTER css_class_quote -%] bz_[% bug.priority FILTER css_class_quote -%] bz_[% bug.bug_status FILTER css_class_quote -%] @@ -185,8 +186,7 @@ </td> [% END %] <td class="first-child bz_id_column"> - <a name="b[% bug.bug_id %]" - href="show_bug.cgi?id=[% bug.bug_id %]">[% bug.bug_id %]</a> + <a href="show_bug.cgi?id=[% bug.bug_id %]">[% bug.bug_id %]</a> <span style="display: none">[%+ '[SEC]' IF bug.secure_mode %]</span> </td> @@ -207,7 +207,10 @@ [% SET login_column = column.remove('_realname$') %] [% bug.${login_column}.truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html %] - + [% ELSIF column == 'short_desc' || column == "short_short_desc" %] + <a href="show_bug.cgi?id=[% bug.bug_id FILTER html %]"> + [%- bug.$column.truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html -%] + </a> [% ELSE %] [%- display_value(column, bug.$column).truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html -%] [% END %] |