From e008fbf65bc6c7fd9df37710d08167c2677a9aa1 Mon Sep 17 00:00:00 2001 From: "bbaetz%student.usyd.edu.au" <> Date: Sun, 8 Dec 2002 08:42:50 +0000 Subject: Bug 176461 - Move descs strings from change-columns.html.tmpl to field-descs.html.tmpl Patch by burnus@gmx.de (Tobias Burnus), r=gerv, bbaetz, a=justdave --- template/en/default/global/field-descs.html.tmpl | 2 ++ template/en/default/list/change-columns.html.tmpl | 31 ++++------------- template/en/default/list/table.html.tmpl | 41 +++++++++++++---------- 3 files changed, 33 insertions(+), 41 deletions(-) (limited to 'template') diff --git a/template/en/default/global/field-descs.html.tmpl b/template/en/default/global/field-descs.html.tmpl index 3e83da7c0..6d8086423 100644 --- a/template/en/default/global/field-descs.html.tmpl +++ b/template/en/default/global/field-descs.html.tmpl @@ -28,6 +28,7 @@ "bug_id" => "Bug ID", "bug_severity" => "Severity", "bug_status" => "Status", + "changeddate" => "Last Changed Date", "cc" => "CC", "cclist_accessible" => "CC list accessible?", "component_id" => "Component ID", @@ -40,6 +41,7 @@ "keywords" => "Keywords", "newcc" => "CC", "op_sys" => "OS", + "opendate" => "Open Date", "percentage_complete" => "%Complete", "priority" => "Priority", "product_id" => "Product ID", diff --git a/template/en/default/list/change-columns.html.tmpl b/template/en/default/list/change-columns.html.tmpl index fbdc145a9..d049d0c6c 100644 --- a/template/en/default/list/change-columns.html.tmpl +++ b/template/en/default/list/change-columns.html.tmpl @@ -28,36 +28,19 @@ this feature requires cookies to work.

-[% desc = { "opendate" => "Open Date", - "changeddate" => "Last Changed Date", - "severity" => "Severity", - "priority" => "Priority", - "platform" => "Hardware", - "owner" => "Owner", - "owner_realname" => "Owner Realname", - "reporter" => "Reporter", - "reporter_realname" => "Reporter Realname", - "status" => "Status", - "resolution" => "Resolution", - "product" => "Product", - "component" => "Component", - "version" => "Version", - "os" => "OS", - "votes" => "Votes", - "keywords" => "Keywords", - "target_milestone" => "Target", - "qa_contact" => "QA Contact", - "qa_contact_realname" => "QA Contact Realname", - "status_whiteboard" => "Whiteboard", - "summary" => "Summary (first 60 characters)", - "summaryfull" => "Full Summary" } %] +[% PROCESS "global/field-descs.html.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" %]
[% FOREACH column = masterlist %] - +
[% END %] diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl index 1de7f4efa..455cf1222 100644 --- a/template/en/default/list/table.html.tmpl +++ b/template/en/default/list/table.html.tmpl @@ -31,26 +31,33 @@ # wrap is set if a column's contents should be allowed to be word-wrapped # by the browser. #%] + +[% PROCESS "global/field-descs.html.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 = { - "severity" => { maxlength => 3 , title => "Sev" } , - "priority" => { maxlength => 3 , title => "Pri" } , - "platform" => { maxlength => 3 , title => "Plt" } , - "status" => { maxlength => 4 } , - "reporter" => { maxlength => 30 , ellipsis => "..." } , - "reporter_realname" => { maxlength => 20 , ellipsis => "..." } , - "owner" => { maxlength => 30 , ellipsis => "..." } , - "owner_realname" => { maxlength => 20 , ellipsis => "..." } , - "qa_contact" => { maxlength => 30 , ellipsis => "..." , title => "QAContact" } , - "qa_contact_realname" => { maxlength => 20 , ellipsis => "..." , title => "QAContact" } , + "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 } , - "summary" => { maxlength => 60 , ellipsis => "..." , wrap => 1 } , - "summaryfull" => { wrap => 1 } , + "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" } , - "os" => { maxlength => 4 } , + "op_sys" => { maxlength => 4 } , "target_milestone" => { title => "TargetM" } , "percentage_complete" => { format_value => "%d %%" } , } @@ -111,7 +118,7 @@ - [%- abbrev.$id.title || column.title -%] + [%- abbrev.$id.title || field_descs.$id || column.title -%] [% END %] @@ -128,11 +135,11 @@ [% tableheader %] [% END %] - + - [% IF dotweak %][% END %] - [% bug.id %] + [% IF dotweak %][% END %] + [% bug.bug_id %] [% FOREACH column = displaycolumns %] -- cgit v1.2.3-24-g4f1b