Dzahn has submitted this change and it was merged. Change subject: Replace custom template file by using existing Bugzilla hook ......................................................................
Replace custom template file by using existing Bugzilla hook Makes our diff smaller. I guess there's more low hanging fruit. Bug: 58556 Change-Id: I6edc7f5abb1c1a055132ab2f8bfe43118a7ad6f1 --- A extensions/Wikimedia/template/en/default/hook/list/table-before_table.html.tmpl D template/en/custom/list/table.html.tmpl 2 files changed, 2 insertions(+), 264 deletions(-) Approvals: Aklapper: Looks good to me, but someone else must approve Dzahn: Verified; Looks good to me, approved diff --git a/extensions/Wikimedia/template/en/default/hook/list/table-before_table.html.tmpl b/extensions/Wikimedia/template/en/default/hook/list/table-before_table.html.tmpl new file mode 100644 index 0000000..29aec4f --- /dev/null +++ b/extensions/Wikimedia/template/en/default/hook/list/table-before_table.html.tmpl @@ -0,0 +1,2 @@ +[%# See bug 40244 and bug 58556 %] +[% abbrev.product.maxlength = 13 %] diff --git a/template/en/custom/list/table.html.tmpl b/template/en/custom/list/table.html.tmpl deleted file mode 100644 index 6e40791..0000000 --- a/template/en/custom/list/table.html.tmpl +++ /dev/null @@ -1,264 +0,0 @@ -[%# 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 <m...@mozilla.org> - # Jesse Clark <jjclark1...@gmail.com> - #%] - -[%############################################################################%] -[%# Initialization #%] -[%############################################################################%] - -[%# Don't display the table or do any processing if there are no bugs - # to display %] -[% RETURN IF !bugs.size %] - -[%# Columns whose titles or values should be abbreviated to make the list - # more compact. For columns whose titles should be abbreviated, - # the shortened title is included. For columns whose values should be - # abbreviated, a maximum length is provided along with the ellipsis that - # should be added to an abbreviated value, if any. - # wrap is set if a column's contents should be allowed to be word-wrapped - # 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 => 7 , title => "Pri" } , - "rep_platform" => { maxlength => 3 , title => "HW" } , - "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 => "Whiteboard" , wrap => 1 } , - "keywords" => { wrap => 1 } , - "flagtypes.name" => { wrap => 1 } , - "component" => { maxlength => 8 , title => "Comp" } , - "product" => { maxlength => 13 } , - "version" => { maxlength => 5 , title => "Vers" } , - "op_sys" => { maxlength => 4 } , - "bug_file_loc" => { maxlength => 30 } , - "target_milestone" => { title => "TargetM" } , - "longdescs.count" => { title => "# Comments" }, - "percentage_complete" => { format_value => "%d %%" } , - } -%] - -[% PROCESS bug/time.html.tmpl %] - -[% Hook.process("before_table") %] - -[%############################################################################%] -[%# Table Header #%] -[%############################################################################%] - -[% tableheader = BLOCK %] - <table class="bz_buglist" cellspacing="0" cellpadding="4" width="100%"> - <tr class="bz_buglist_header bz_first_buglist_header"> - [% IF dotweak %] - <th> </th> - [% END %] - <th colspan="[% splitheader ? 2 : 1 %]" class="first-child"> - <a href="buglist.cgi? - [% urlquerypart FILTER html %]&order= - [% PROCESS new_order id='bug_id' %] - [%-#%]&query_based_on= - [% defaultsavename OR searchname FILTER uri %]">ID - [% PROCESS order_arrow id='bug_id' ~%] - </a> - </th> - - [% IF splitheader %] - - [% FOREACH id = displaycolumns %] - [% NEXT UNLESS loop.count() % 2 == 0 %] - [% column = columns.$id %] - [% PROCESS columnheader %] - [% END %] - - </tr><tr class="bz_buglist_header"> - [% IF dotweak %] - <th> </th> - [% END %] - <th> </th> - - [% FOREACH id = displaycolumns %] - [% NEXT IF loop.count() % 2 == 0 %] - [% column = columns.$id %] - [% PROCESS columnheader %] - [% END %] - - [% ELSE %] - - [% FOREACH id = displaycolumns %] - [% column = columns.$id %] - [% PROCESS columnheader %] - [% END %] - - [% END %] - - </tr> -[% END %] - -[% BLOCK columnheader %] - <th colspan="[% splitheader ? 2 : 1 %]"> - <a href="buglist.cgi?[% urlquerypart FILTER html %]&order= - [% PROCESS new_order %] - [%-#%]&query_based_on= - [% defaultsavename OR searchname FILTER uri %]"> - [%- abbrev.$id.title || field_descs.$id || column.title FILTER html -%] - [% PROCESS order_arrow ~%] - </a> - </th> -[% END %] - -[% BLOCK new_order %] - [% desc = '' %] - [% IF (om = order.match("\\b$id( DESC)?")) %] - [% desc = ' DESC' IF NOT om.0 %] - [% END %] - [% id _ desc FILTER uri %] - [% IF id != 'bug_id' AND order %] - [% ',' _ order.remove("\\b$id( DESC)?(,\\s*|\$)") FILTER uri %] - [% END %] -[% END %] - -[% BLOCK order_arrow %] - [% IF order.match("^$id DESC") %] - <span class="bz_sort_order_primary">▼</span> - [% ELSIF order.match("^$id(,\\s*|\$)") %] - <span class="bz_sort_order_primary">▲</span> - [% ELSIF order.match("\\b$id DESC") %] - <span class="bz_sort_order_secondary">▼</span> - [% ELSIF order.match("\\b$id(,\\s*|\$)") %] - <span class="bz_sort_order_secondary">▲</span> - [% END %] -[% END %] - -[%############################################################################%] -[%# Bug Table #%] -[%############################################################################%] - -[% tableheader %] - -[% FOREACH bug = bugs %] - [% count = loop.count() %] - - <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 -%] - [%+ "bz_$bug.resolution" FILTER css_class_quote IF bug.resolution -%] - [%+ "bz_secure" IF bug.secure_mode -%] - [%+ "bz_secure_mode_$bug.secure_mode" FILTER css_class_quote IF bug.secure_mode -%] - [%+ count % 2 == 1 ? "bz_row_odd" : "bz_row_even" -%] - "> - - [% IF dotweak %] - <td class="bz_checkbox_column"> - <input type="checkbox" name="id_[% bug.bug_id %]"> - </td> - [% END %] - <td class="first-child bz_id_column"> - <a href="show_bug.cgi?id=[% bug.bug_id %]">[% bug.bug_id %]</a> - <span style="display: none">[%+ '[SEC]' IF bug.secure_mode %]</span> - </td> - - [% FOREACH column = displaycolumns %] - <td [% 'style="white-space: nowrap"' IF NOT abbrev.$column.wrap %] - class="bz_[% column FILTER css_class_quote %]_column"> - [% IF abbrev.$column.maxlength %] - <span title="[%- display_value(column, bug.$column) FILTER html %]"> - [% END %] - [% 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 %] - [%# Display the login name of the user if their real name is empty. %] - [% ELSIF column.match('_realname$') && bug.$column == '' %] - [% 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 %] - [% IF abbrev.$column.maxlength %] - </span> - [% END %] - </td> - [% END %] - - </tr> - - [% IF loop.last() && time_info.time_present == 1 %] - [% PROCESS time_summary_line %] - [% END %] - -[% END %] - -</table> - -[% BLOCK time_summary_line %] - <tr class="bz_time_summary_line"> - [% columns_to_span = 1 %] [%# bugID %] - [% IF dotweak %] - [% columns_to_span = columns_to_span + 1 %] - [% END %] - [% FOREACH column = displaycolumns %] - [% IF column == 'actual_time' || - column == 'remaining_time' || - column == 'estimated_time' || - column == 'percentage_complete' %] - [% IF columns_to_span > 0 %] - <td class="bz_total bz_total_label" colspan=" - [%- columns_to_span FILTER html %]"><b>Totals</b></td> - [% columns_to_span = 0 %] - [% END %] - [% IF column == 'percentage_complete' %] - <td class="bz_total">[% time_info.percentage_complete - FILTER format(abbrev.$column.format_value) FILTER html %]</td> - [% ELSE %] - <td class="bz_total"> - [%- PROCESS formattimeunit time_unit=time_info.$column %]</td> - [% END %] - [% ELSIF columns_to_span == 0 %] [%# A column following the first total %] - <td class="bz_total"> </td> - [% ELSE %] [%# We haven't gotten to a time column yet, keep computing span %] - [% columns_to_span = columns_to_span + 1 %] - [% END %] - [% END %] - </tr> -[% END %] -- To view, visit https://gerrit.wikimedia.org/r/114145 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6edc7f5abb1c1a055132ab2f8bfe43118a7ad6f1 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/bugzilla/modifications Gerrit-Branch: master Gerrit-Owner: Aklapper <aklap...@wikimedia.org> Gerrit-Reviewer: Aklapper <aklap...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
