diff options
| -rwxr-xr-x | describecomponents.cgi | 3 | ||||
| -rwxr-xr-x | enter_bug.cgi | 7 | ||||
| -rw-r--r-- | globals.pl | 2 | ||||
| -rw-r--r-- | template/en/default/global/choose-product.html.tmpl | 8 | ||||
| -rw-r--r-- | template/en/default/global/field-descs.html.tmpl | 52 | ||||
| -rw-r--r-- | template/en/default/search/form.html.tmpl | 6 |
6 files changed, 66 insertions, 12 deletions
diff --git a/describecomponents.cgi b/describecomponents.cgi index be3be4b9f..7a24b692c 100755 --- a/describecomponents.cgi +++ b/describecomponents.cgi @@ -64,9 +64,6 @@ if (!defined $::FORM{'product'}) { elsif ($prodsize > 1) { $::vars->{'proddesc'} = \%products; $::vars->{'target'} = "describecomponents.cgi"; - $::vars->{'title'} = "Bugzilla component description"; - $::vars->{'h2'} = - "Please specify the product whose components you want described."; print "Content-type: text/html\n\n"; $::template->process("global/choose-product.html.tmpl", $::vars) diff --git a/enter_bug.cgi b/enter_bug.cgi index a7733ec3e..f53c63dd6 100755 --- a/enter_bug.cgi +++ b/enter_bug.cgi @@ -88,9 +88,6 @@ if (!defined $::FORM{'product'}) { $vars->{'target'} = "enter_bug.cgi"; $vars->{'format'} = $::FORM{'format'}; - $vars->{'title'} = "Enter Bug"; - $vars->{'h2'} = - "First, you must pick a product on which to enter a bug."; print "Content-type: text/html\n\n"; $template->process("global/choose-product.html.tmpl", $vars) @@ -284,7 +281,6 @@ $default{'component_'} = formvalue('component'); $vars->{'assigned_to'} = formvalue('assigned_to'); $vars->{'cc'} = formvalue('cc'); $vars->{'reporter'} = $::COOKIE{'Bugzilla_login'}; -$vars->{'user_agent'} = $ENV{'HTTP_USER_AGENT'}; $vars->{'product'} = $product; $vars->{'bug_file_loc'} = formvalue('bug_file_loc', "http://"); $vars->{'short_desc'} = formvalue('short_desc'); @@ -352,8 +348,7 @@ while (MoreSQLData()) { my $check; # If this is the group for this product, make it checked. - if(formvalue("maketemplate") eq - "Remember values as bookmarkable template") + if(formvalue("maketemplate") ne "") { # If this is a bookmarked template, then we only want to set the # bit for those bits set in the template. diff --git a/globals.pl b/globals.pl index 9a625a842..0a524bcea 100644 --- a/globals.pl +++ b/globals.pl @@ -98,7 +98,7 @@ $::SIG{PIPE} = 'IGNORE'; $::dontchange = "--do_not_change--"; $::chooseone = "--Choose_one:--"; -$::defaultqueryname = "(Default query)"; +$::defaultqueryname = "(Default query)"; # This string not exposed in UI $::unconfirmedstate = "UNCONFIRMED"; $::dbwritesallowed = 1; diff --git a/template/en/default/global/choose-product.html.tmpl b/template/en/default/global/choose-product.html.tmpl index e8d9aaf5c..de0ca0be7 100644 --- a/template/en/default/global/choose-product.html.tmpl +++ b/template/en/default/global/choose-product.html.tmpl @@ -24,6 +24,14 @@ # are their descriptions. #%] +[% IF target == "enter_bug.cgi" %] + [% title = "Enter Bug" %] + [% h2 = "First, you must pick a product on which to enter a bug." %] +[% ELSIF target == "describecomponents.cgi" %] + [% title = "Bugzilla Component Descriptions" %] + [% h2 = "Please specify the product whose components you want described." %] +[% END %] + [% DEFAULT title = "Choose a Product" %] [% PROCESS global/header.html.tmpl %] diff --git a/template/en/default/global/field-descs.html.tmpl b/template/en/default/global/field-descs.html.tmpl new file mode 100644 index 000000000..4e97c11f5 --- /dev/null +++ b/template/en/default/global/field-descs.html.tmpl @@ -0,0 +1,52 @@ +<!-- 1.0@bugzilla.org --> +[%# 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 <gerv@gerv.net> + #%] + +[%# Remember to PROCESS rather than INCLUDE this template. %] + +[% field_descs = { "[Bug creation]" => "[Bug creation]", + "alias" => "Alias", + "assigned_to" => "Assignee", + "bug_file_loc" => "URL", + "bug_id" => "Bug ID", + "bug_severity" => "Severity", + "bug_status" => "Status", + "cclist_accessible" => "CC list accessible?", + "component_id" => "Component ID", + "component" => "Component", + "creation_ts" => "Bug Creation time", + "delta_ts" => "Last Changed time", + "everconfirmed" => "Ever confirmed?", + "groupset" => "Groupset", + "keywords" => "Keywords", + "op_sys" => "OS", + "priority" => "Priority", + "product_id" => "Product ID", + "product" => "Product", + "qa_contact" => "QA Contact", + "rep_platform" => "Hardware", + "reporter" => "Reporter", + "reporter_accessible" => "Reporter accessible?", + "resolution" => "Resolution", + "short_desc" => "Summary", + "status_whiteboard" => "Whiteboard", + "target_milestone" => "Target Milestone", + "version" => "Version", + "votes" => "Votes" } %] diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl index b3c87b5cc..a24772c31 100644 --- a/template/en/default/search/form.html.tmpl +++ b/template/en/default/search/form.html.tmpl @@ -326,7 +326,9 @@ function selectProduct(f) { { value => "anywords", description => "contains any of the words" }, { value => "regexp", description => "matches the regexp" }, { value => "notregexp", description => "doesn't match the regexp" } ] %] - + +[% PROCESS "global/field-descs.html.tmpl" %] + [%# *** Summary *** %] <table> @@ -664,7 +666,7 @@ function selectProduct(f) { [% FOREACH field = chfield %] <option value="[% field FILTER html %]" [% " selected" IF lsearch(default.chfield, field) != -1 %]> - [% field FILTER html %]</option> + [% (field_descs.$field || field) FILTER html %]</option> [% END %] </select> </dd> |