From 4171915f91c84d28cae2359db119f9df2fcb77e0 Mon Sep 17 00:00:00 2001 From: Max Kanat-Alexander Date: Sun, 28 Mar 2010 14:11:52 -0700 Subject: Bug 490766: Link all field labels on enter_bug.cgi to their description on fields.html r=LpSolit, a=LpSolit --- skins/standard/IE-fixes.css | 4 ++ skins/standard/global.css | 32 +++++++++- template/en/default/bug/create/create.html.tmpl | 81 ++++++++++++++----------- template/en/default/bug/field.html.tmpl | 7 +-- 4 files changed, 80 insertions(+), 44 deletions(-) diff --git a/skins/standard/IE-fixes.css b/skins/standard/IE-fixes.css index f7e95f990..4c85340e7 100644 --- a/skins/standard/IE-fixes.css +++ b/skins/standard/IE-fixes.css @@ -22,6 +22,10 @@ margin-top: .5em; } +form#Create #comp_desc { + margin: .5em 1em; +} + #footer #useful-links li { padding-bottom: 0.8ex; } diff --git a/skins/standard/global.css b/skins/standard/global.css index 6e55385e7..2690b6e2d 100644 --- a/skins/standard/global.css +++ b/skins/standard/global.css @@ -497,18 +497,44 @@ input.required, select.required, span.required_explanation { list-style-type: none; } +/*************/ +/* enter_bug */ +/*************/ + +form#Create table { + border-spacing: 0; + border-width: 0; +} +form#Create td, form#Create th { + padding: .25em; +} form#Create th { text-align: right; } +/* This makes the "component" column as small as possible (since it + * contains only fixed-width content) and the Reporter column + * as large as possible, which makes the form not jump around + * when the Component Description changes size. This works + * pretty well on all browsers except IE 8. + */ +form#Create #field_container_component { width: 1px; } +form#Create #field_container_reporter { width: 100%; } + form#Create .comment { vertical-align: top; overflow: auto; color: green; - margin: 0 0.5em; - padding: 0.3em; - height: 8ex; } +form#Create #comp_desc_container td { padding: 0; } +form#Create #comp_desc { height: 11ex; } +form#Create #os_guess_note { + padding-top: 0; +} +form#Create #os_guess_note div { + max-width: 35em; +} + .image_button { background-repeat: no-repeat; diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index a5bfb0739..5db1eddf3 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.html.tmpl @@ -175,7 +175,7 @@ TUI_hide_default('expert_fields'); - +
- - - - - + [% INCLUDE bug/field.html.tmpl + bug = default, field = bug_fields.product, editable = 0, + value = product.name %] + [% INCLUDE bug/field.html.tmpl + bug = default, field = bug_fields.reporter, editable = 0, + value = user.login %] [%# We can't use the select block in these two cases for various reasons. %] @@ -217,7 +218,7 @@ TUI_hide_default('expert_fields'); Component: - -
@@ -204,11 +204,12 @@ TUI_hide_default('expert_fields');
Product:[% product.name FILTER html %]Reporter:[% user.login FILTER html %]
+ + [%# Enclose the fieldset in a nested table so that its width changes based # on the length on the component description. %] @@ -271,7 +272,8 @@ TUI_hide_default('expert_fields'); - + + [% IF !Param('defaultplatform') || !Param('defaultopsys') %] + + + + [% END %] @@ -319,25 +337,6 @@ TUI_hide_default('expert_fields'); -[% IF !Param('defaultplatform') || !Param('defaultopsys') %] - - - - - - -[% END %] - @@ -400,7 +399,8 @@ TUI_hide_default('expert_fields'); [% IF Param("useqacontact") %] - + - + - + - + @@ -462,7 +464,8 @@ TUI_hide_default('expert_fields'); [% IF Param("usebugaliases") %] - + @@ -470,7 +473,8 @@ TUI_hide_default('expert_fields'); [% END %] - + - + + - + diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl index 2f1ad35ca..0656996bd 100644 --- a/template/en/default/bug/field.html.tmpl +++ b/template/en/default/bug/field.html.tmpl @@ -54,11 +54,10 @@ [% END %] [% IF desc_url %] - [% ELSIF !field.custom %] + [% ELSE %] - [% END -%] - [% field_descs.${field.name} FILTER html %]: - [%- '' IF (!field.custom || desc_url) %] + [% END %] + [%- field_descs.${field.name} FILTER html %]: [% '' IF editable %] [% END %] -- cgit v1.2.3-24-g4f1b
Version: + [%- field_descs.version FILTER html %]:
  + +
We've made a guess at your + [% IF Param('defaultplatform') %] + operating system. Please check it + [% ELSIF Param('defaultopsys') %] + platform. Please check it + [% ELSE %] + operating system and platform. Please check them + [% END %] + and make any corrections if necessary.
+
  - We've made a guess at your - [% IF Param('defaultplatform') %] - operating system. Please check it - [% ELSIF Param('defaultopsys') %] - platform. Please check it - [% ELSE %] - operating system and platform. Please check them - [% END %] - and make any corrections if necessary. -
 
QA Contact: + [%- field_descs.qa_contact FILTER html %]: [% INCLUDE global/userselect.html.tmpl id => "qa_contact" @@ -417,7 +417,8 @@ TUI_hide_default('expert_fields'); [% END %]
CC: + [%- field_descs.cc FILTER html %]: [% INCLUDE global/userselect.html.tmpl id => "cc" @@ -431,7 +432,7 @@ TUI_hide_default('expert_fields');
Default CC:Default [% field_descs.cc FILTER html %]:
@@ -444,7 +445,8 @@ TUI_hide_default('expert_fields'); [% IF user.is_timetracker %]
Estimated Hours:Estimated + Hours:
Alias: + [%- field_descs.alias FILTER html %]:
URL: + [%- field_descs.bug_file_loc FILTER html %]: @@ -495,7 +499,8 @@ TUI_hide_default('expert_fields');
Summary: + [%- field_descs.short_desc FILTER html %]: - Depends on: + [%- field_descs.dependson FILTER html %]:
Blocks: + [%- field_descs.blocked FILTER html %]: