diff --git a/skins/contrib/Mozilla/global.css b/skins/contrib/Mozilla/global.css index 769e7d563..e5a13d2b0 100644 --- a/skins/contrib/Mozilla/global.css +++ b/skins/contrib/Mozilla/global.css @@ -110,7 +110,6 @@ a:hover, #header a:hover, #footer a:hover { border-radius: .25em; box-shadow: inset 0 1px rgba(0, 0, 0, 0.1); background: white; - padding: 1px; margin: -2px 0 2px 0; color: #404040; vertical-align: top; diff --git a/skins/standard/buglist.css b/skins/standard/buglist.css index db01dae91..0a33c15cb 100644 --- a/skins/standard/buglist.css +++ b/skins/standard/buglist.css @@ -100,5 +100,5 @@ td.bz_total { /* FIXME: remove bug_status hardcode */ .bz_st_UNCONFIRMED, .bz_UNCONFIRMED td.first-child a { font-style: italic; } .bz_st_RESOLVED, .bz_RESOLVED td.first-child a { text-decoration: line-through; } -.bz_st_VERIFIED, .bz_VERIFIED td.first-child a { text-decoration: line-through; border: 1px dashed #2f6fab; margin: 0 -1px; color: black; background-color: #f9f9f9; line-height: 1.1em; } -.bz_st_CLOSED, .bz_CLOSED td.first-child a { text-decoration: line-through; border: 1px solid #2f6fab; margin: 0 -1px; background-color: #f9f9f9; line-height: 1.1em; } +.bz_st_VERIFIED, .bz_VERIFIED td.first-child a { text-decoration: line-through; border: 1px dashed #2f6fab; margin: 0 -1px; color: black; background-color: #f9f9f9; } +.bz_st_CLOSED, .bz_CLOSED td.first-child a { text-decoration: line-through; border: 1px solid #2f6fab; margin: 0 -1px; background-color: #f9f9f9; } diff --git a/skins/standard/global.css b/skins/standard/global.css index 58073fbdc..b4c6dd071 100644 --- a/skins/standard/global.css +++ b/skins/standard/global.css @@ -469,12 +469,21 @@ div.user_match { } } +.bz_show_bug_colpair table { + width: 98%; +} .field_label { text-align: left; vertical-align: top; + width: 25%; + overflow: hidden; + text-overflow: ellipsis; + line-height: 1.5em; } .bug_field { margin-bottom: 8px; + vertical-align: top; + line-height: 1.5em; } .bug_field label { font-weight: bold; @@ -489,6 +498,9 @@ div.user_match { .bug_field .text_input { width: 98%; } +.bug_field table td { + padding: 0; +} .bug_field table .text_input, .bug_field table .text_input { width: 100%; } @@ -574,8 +586,8 @@ form#Create .comment { /* FIXME remove bug_status hardcode */ .bz_st_UNCONFIRMED, .bz_UNCONFIRMED td.first-child a { font-style: italic; } .bz_st_RESOLVED, .bz_RESOLVED td.first-child a { text-decoration: line-through; } -.bz_st_VERIFIED, .bz_VERIFIED td.first-child a { text-decoration: line-through; border: 1px dashed #2f6fab; margin: 0 -1px; color: black; background-color: #f9f9f9; line-height: 1.1em; } -.bz_st_CLOSED, .bz_CLOSED td.first-child a { text-decoration: line-through; border: 1px solid #2f6fab; margin: 0 -1px; background-color: #f9f9f9; line-height: 1.1em; } +.bz_st_VERIFIED, .bz_VERIFIED td.first-child a { text-decoration: line-through; border: 1px dashed #2f6fab; margin: 0 -1px; color: black; background-color: #f9f9f9; } +.bz_st_CLOSED, .bz_CLOSED td.first-child a { text-decoration: line-through; border: 1px solid #2f6fab; margin: 0 -1px; background-color: #f9f9f9; } table.alcontent { width: 100%; } diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index caee396a3..3c6be8719 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -66,39 +66,39 @@ document.changeform = document.[% cfname %]; - [% SET use_divs = 1 %] - [% SET no_tds = 1 %] + [% SET use_divs = 0 %] + [% SET no_tds = 0 %] [% PROCESS section_title %]
-
-
+
+ [% PROCESS section_status %] [% PROCESS section_details1 %] [% PROCESS section_people %] - [% PROCESS section_customfields part=1 %] - -
[% PROCESS section_details2 %] [% PROCESS section_keyword_whiteboard %] - [% PROCESS section_url %] - [% PROCESS section_customfields part=2 %] -
+ [% PROCESS section_customfields part=1 %] +
-
-
+
+ [% PROCESS section_dates %] + [% PROCESS section_url %] [% PROCESS section_see_also %] [% PROCESS section_dependson_blocks %] + [% PROCESS section_customfields part=2 %] [% PROCESS section_customfields part=3 %] - -
+
+
+
+ [% PROCESS section_cclist %] [% PROCESS section_customfields part=4 %] [% Hook.process("after_custom_fields") %] - [% PROCESS section_flags %] - +
+ [% PROCESS section_flags %]
@@ -205,20 +205,24 @@ document.changeform = document.[% cfname %]; [% BLOCK section_details1 %] + [% INCLUDE bug/field.html.tmpl bug = bug, field = select_fields.product, desc_url = 'describecomponents.cgi', value = bug.product_id editable = bug.check_can_change_field('product', 0, 1) %] - + + [% INCLUDE bug/field.html.tmpl bug = bug, field = select_fields.component, value = bug.component_id, editable = bug.check_can_change_field('component', 0, 1) %] - + + [% INCLUDE bug/field.html.tmpl bug = bug, field = select_fields.version, value = bug.version, editable = bug.check_can_change_field('version', 0, 1) %] + [% END %] -
+ + [% END %] [% END %] @@ -473,20 +509,27 @@ document.changeform = document.[% cfname %]; [% IF Bugzilla.get_field('status_whiteboard').enabled && (bug.status_whiteboard != '' OR bug.check_can_change_field('status_whiteboard', 0, 1)) %] -
+ +
+ + [% PROCESS input inputname => "status_whiteboard" size => "40" colspan => 2 %] -
+ + [% END %] [% IF Bugzilla.has_keywords %] [% val = bug.get_string('keywords') %] [% chg = bug.check_can_change_field('keywords', 0, 1) %] [% IF val != '' OR chg %] -
+ +
+ + [% IF chg %] [% IF val != '' %] [% FOREACH keyword = bug.keywords_obj %] @@ -519,7 +562,8 @@ document.changeform = document.[% cfname %]; [% ELSE %] [% val | html %] [% END %] -
+ + [% END %] [% END %] @@ -531,14 +575,17 @@ document.changeform = document.[% cfname %]; [% BLOCK section_dependson_blocks %] [% PROCESS dependencies dep = { title => "Depends on", fieldname => "dependson" } %] [% IF bug.lastchangeddeps %] -
- Blockers completed ~[% bug.depscompletedpercent %]%, last changed [% bug.lastchangeddeps %] -
+ + + Blockers completed ~[% bug.depscompletedpercent %]%, last changed [% bug.lastchangeddeps %] + + [% END %] [% PROCESS dependencies accesskey = "b" dep = { title => "Blocks", fieldname => "blocked" } %] -
+ + Show dependency tree [% IF Param('webdotbase') %] @@ -546,7 +593,8 @@ document.changeform = document.[% cfname %]; [% END %] [% PROCESS scrum_cards %] -
+ + [% END %] @@ -653,27 +701,38 @@ document.changeform = document.[% cfname %]; [%############################################################################%] [% BLOCK section_dates %] -
+ +
+ + [% bug.creation_ts FILTER time %] by [% INCLUDE global/user.html.tmpl who = bug.reporter %] -
+ + -
+ +
+ + [% bug.delta_ts FILTER time FILTER replace(':\d\d$', '') FILTER replace(':\d\d ', ' ')%] ([%# terms.Bug %]History) -
+ + [% END %] [%############################################################################%] [%# Block for CC LIST #%] [%############################################################################%] [% BLOCK section_cclist %] -
+ +
+ + [% chg = bug.check_can_change_field('cc', 0, 1) %] [% bug.cc.size || 0 FILTER html %] [%+ bug.cc.size > 1 ? 'users' : 'user' %] @@ -735,7 +794,8 @@ document.changeform = document.[% cfname %]; ); [% END %] -
+ + [% END %] [%############################################################################%] @@ -743,11 +803,13 @@ document.changeform = document.[% cfname %]; [%############################################################################%] [% BLOCK section_see_also %] [% IF Bugzilla.get_field('see_also').enabled || bug.see_also.size %] + [% INCLUDE bug/field.html.tmpl field = Bugzilla.get_field('see_also') value = bug.see_also editable = bug.check_can_change_field('see_also', 0, 1) %] + [% END %] [% END %] @@ -783,10 +845,12 @@ document.changeform = document.[% cfname %]; [% BLOCK section_customfields %] [% FOREACH field = Bugzilla.active_custom_fields %] [% IF (part == 1 || field.sortkey >= (part - 1)*1000) && (part == 4 || field.sortkey < part*1000) %] + [% INCLUDE bug/field.html.tmpl value = bug.${field.name} editable = bug.check_can_change_field(field.name, 0, 1) - value_span = 2 %] + custom_label = html(field.description.replace('(.{12,}?\s)', '$1\n')).replace('\\\\n', '
') %] + [% END %] [% END %] [% END %] @@ -800,10 +864,13 @@ document.changeform = document.[% cfname %]; [% chg = bug.check_can_change_field(dep.fieldname, 0, 1) %] [% IF chg || bug.${dep.fieldname}.size %] -
+ +
+ + [% IF chg %] [% END %] -
+ + [% END %] [% accesskey = undef %] diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl index ee0310fe5..d036d46a3 100644 --- a/template/en/default/bug/field.html.tmpl +++ b/template/en/default/bug/field.html.tmpl @@ -71,7 +71,7 @@ [% ELSIF !field.custom %] [% END -%] - [% custom_label || field_descs.${field.name} || field.description | html %]: + [% IF custom_label %][% custom_label | none %][% ELSE %][% field_descs.${field.name} || field.description | html %][% END %]: [%- '' IF desc_url || !field.custom %] [% END %] @@ -80,7 +80,7 @@ [% END %] [% IF NOT no_tds %] - [% END %] [% IF NOT editable AND show_search_link %]