diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev index da0307e6b43..05dc23e3600 100644 --- a/mozilla/webtools/bugzilla/.bzrrev +++ b/mozilla/webtools/bugzilla/.bzrrev @@ -1 +1 @@ -8840 \ No newline at end of file +8841 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/skins/standard/admin.css b/mozilla/webtools/bugzilla/skins/standard/admin.css index 7058bd1afee..d0aaf368f71 100644 --- a/mozilla/webtools/bugzilla/skins/standard/admin.css +++ b/mozilla/webtools/bugzilla/skins/standard/admin.css @@ -43,6 +43,20 @@ p.areyoureallyreallysure { font-weight: bold; } +#admin_table { + border-collapse: collapse; + border: 1px solid black; +} + +#admin_table th { + white-space: normal !important; +} + +#admin_table th, #admin_table td { + border: 1px solid black; + padding: 0.3em; +} + tr.disabled { background-color: lightgrey; } @@ -140,3 +154,29 @@ th.title { #flag_types_bugs .multiplicable, #flag_types_attachments .multiplicable { display: block; } + +table.whining_list { + border: 1px solid black; + border-collapse: collapse; + width: 100%; +} + +table.whining_list th, table.whining_list td { + padding: 0.3em; +} + +table.whining_list th { + text-align: right; + font-weight: normal !important; + white-space: normal !important; +} + +table.whining_list th.subtitle { + font-weight: bold !important; + text-align: left !important; +} + +table.schedule_list th, table.search_list th { + text-align: center; + font-weight: bold !important; +} diff --git a/mozilla/webtools/bugzilla/skins/standard/dependency-tree.css b/mozilla/webtools/bugzilla/skins/standard/dependency-tree.css index 0051fca36b8..efc2e813425 100644 --- a/mozilla/webtools/bugzilla/skins/standard/dependency-tree.css +++ b/mozilla/webtools/bugzilla/skins/standard/dependency-tree.css @@ -78,3 +78,7 @@ ul.tree a.tree_link img { color: #333; font-weight: bold; } + +.dependency_tree_controls input[type=submit] { + min-width: 3em; +} diff --git a/mozilla/webtools/bugzilla/skins/standard/editusers.css b/mozilla/webtools/bugzilla/skins/standard/editusers.css index fb38af67d7a..05cee4b3905 100644 --- a/mozilla/webtools/bugzilla/skins/standard/editusers.css +++ b/mozilla/webtools/bugzilla/skins/standard/editusers.css @@ -34,12 +34,12 @@ table.groups tr.indirect { } table.groups th { text-align: left; - padding: 0 0 0 1ex; + padding: 0 1ex; } table.groups td { padding: 2px; } -table.groups td.checkbox { +table.groups th.checkbox, table.groups td.checkbox { text-align: center; white-space: nowrap; } diff --git a/mozilla/webtools/bugzilla/skins/standard/global.css b/mozilla/webtools/bugzilla/skins/standard/global.css index 9396a63463c..ecf39c6a808 100644 --- a/mozilla/webtools/bugzilla/skins/standard/global.css +++ b/mozilla/webtools/bugzilla/skins/standard/global.css @@ -397,10 +397,6 @@ dl dl > dt { border-top: none; } -#admin_table th { - white-space: normal !important; -} - /* Arrow buttons are buttons with only ↑, ↓, ← or → on * them. We want these to look a little less spidery. */ .arrow_button { @@ -427,7 +423,7 @@ dl dl > dt { font-size: smaller; } -.bz_attach_flags, .bz_attach_footer { +.bz_attach_flags, .bz_attach_footer, .bz_flags, .nowrap { white-space: nowrap; } @@ -440,6 +436,10 @@ div.user_match { margin-bottom: 1em; } +.indented { + margin-left: 3em; +} + .box { border: 1px solid black; color: black; @@ -452,6 +452,12 @@ div.user_match { display: none; } +#serverpush_msg { + margin-top: 20%; + text-align: center; + font-size: xx-large; +} + /* Rules specific for printing */ @media print { #header, #footer { @@ -480,9 +486,14 @@ div.user_match { .field_help_link { cursor: help; } -.field_value, form#Create th, form#Create td { +.field_value, form#Create th, form#Create td, .top { vertical-align: top; } + +.bottom { + vertical-align: bottom; +} + .field_value .text_input { width: 100%; min-width: 25em; @@ -578,10 +589,23 @@ input.required, select.required, span.required_explanation { form th { text-align: right; } -th.left { + +.left { text-align: left; } +.center { + text-align: center; +} + +.right { + text-align: right; +} + +.inline { + display: inline; +} + tr.shared_search { background-color: #fff7cd; color: #000; diff --git a/mozilla/webtools/bugzilla/skins/standard/reports.css b/mozilla/webtools/bugzilla/skins/standard/reports.css index 8e0ddf1b0e0..4db7d2dac16 100644 --- a/mozilla/webtools/bugzilla/skins/standard/reports.css +++ b/mozilla/webtools/bugzilla/skins/standard/reports.css @@ -106,4 +106,30 @@ .extra_info { font-size: smaller; font-style: italic; -} \ No newline at end of file +} + +#edit_series th, #create_chart th, #edit_charts th { + text-align: center; +} + +#edit_series th, #edit_series td, +#create_chart th, #create_chart td { + vertical-align: top; + padding: 0.5em; +} + +#edit_series select, #create_chart select { + width: 15em; +} + +#edit_series input { + width: 95%; +} + +#edit_series input#frequency { + width: 3em; +} + +#edit_charts input#action-sum, #edit_charts input#action-remove { + width: 7em; +} diff --git a/mozilla/webtools/bugzilla/skins/standard/summarize-time.css b/mozilla/webtools/bugzilla/skins/standard/summarize-time.css index bb42da6fe3a..c7ed968276f 100644 --- a/mozilla/webtools/bugzilla/skins/standard/summarize-time.css +++ b/mozilla/webtools/bugzilla/skins/standard/summarize-time.css @@ -35,3 +35,9 @@ td.subtotal { /* the details headers */ .number .owner_header, .owner .bug_header { background: #ffffff } .number .owner_header2, .owner .bug_header2 { background: #EFEFEF } + +.warning_swapped_data { + border: 1px solid red; + margin: 1em; + padding: 0.5em; +} diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/edit.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/edit.html.tmpl index 2e9771384d7..ec19c0496dc 100644 --- a/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/edit.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/edit.html.tmpl @@ -23,10 +23,7 @@ [% PROCESS global/header.html.tmpl title = title - style = " - table#form th { text-align: right; vertical-align: baseline; white-space: nowrap; } - table#form td { text-align: left; vertical-align: baseline; } - " + style_urls = ['skins/standard/admin.css'] onload="var f = document.forms['flagtype_properties']; selectProduct(f.product, f.component, null, null, '__Any__');" javascript_urls=["js/productform.js"] @@ -49,7 +46,7 @@ [%# Add a hidden button at the top of the form so that the user pressing "return" # really submit the form, as expected. %] - + @@ -90,8 +87,8 @@ [% END %]
-
- Product/Component:
+ 		+ Product/Component:
- - 		- Inclusions:
+ + 		+ Inclusions:
[% PROCESS category_select name="inclusion_to_remove" categories = inclusions %]
- - 		- Exclusions:
+ + 		+ Exclusions:
[% PROCESS category_select name="exclusion_to_remove" categories = exclusions %]
- +
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/params/common.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/params/common.html.tmpl index 5f6f1bfc0fb..db3bde77702 100644 --- a/mozilla/webtools/bugzilla/template/en/default/admin/params/common.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/admin/params/common.html.tmpl @@ -69,14 +69,14 @@ [% END %] - + - + diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/params/general.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/params/general.html.tmpl index 369e495c784..9de306d1d39 100644 --- a/mozilla/webtools/bugzilla/template/en/default/admin/params/general.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/admin/params/general.html.tmpl @@ -49,8 +49,7 @@ _ " green text inside a red box, or class=\"bz_private\" for" _ " dark red on a red background. Anything defined in " _ " skins/standard/global.css or skins/custom/global.css" - _ " will work. To get centered text, use style=\"text-align: " - _ " center;\".", + _ " will work. To get centered text, use class=\"center\".", upgrade_notification => "$terms.Bugzilla can inform you when a new release is available." diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/products/updated.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/products/updated.html.tmpl index 4d22801639a..cc0c9f8ea6a 100644 --- a/mozilla/webtools/bugzilla/template/en/default/admin/products/updated.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/admin/products/updated.html.tmpl @@ -39,7 +39,7 @@

Updated description to:

-

[% product.description FILTER html_light %]

+

[% product.description FILTER html_light %]

[% END %] [% IF changes.isactive.defined %] diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/table.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/table.html.tmpl index b8492dcb237..3981ef4bb20 100644 --- a/mozilla/webtools/bugzilla/template/en/default/admin/table.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/admin/table.html.tmpl @@ -67,11 +67,11 @@ [%################### TABLE HEADER ######################%] - +
[% FOREACH c = columns %] [%# Default to align left for headers %] - [% END %] diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/users/edit.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/users/edit.html.tmpl index b75f8400d35..e301ed21e36 100644 --- a/mozilla/webtools/bugzilla/template/en/default/admin/users/edit.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/admin/users/edit.html.tmpl @@ -52,7 +52,7 @@ [% IF editusers %] - + [% END %] diff --git a/mozilla/webtools/bugzilla/template/en/default/attachment/diff-file.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/attachment/diff-file.html.tmpl index 2c87188ad00..1af6b3140ef 100644 --- a/mozilla/webtools/bugzilla/template/en/default/attachment/diff-file.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/attachment/diff-file.html.tmpl @@ -14,7 +14,11 @@ # considers the first row to determine column widths. If a colspan is found, # it then share the width equally among all columns, which we don't want. #%] -
+ [% c.heading FILTER html %]
||User is a member of these groups
[% collapsed ? '(+)' : '(-)' %] + [%# Hide/show resolved button Swaps text depending on the state of hide_resolved %] - diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/summarize-time.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/summarize-time.html.tmpl index 932a6e3f450..ee654dc3806 100644 --- a/mozilla/webtools/bugzilla/template/en/default/bug/summarize-time.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/bug/summarize-time.html.tmpl @@ -36,7 +36,7 @@ [%# parts contains date ranges (from, to). %] [% part = parts.shift %]
-

+

[% IF part.0 or part.1 %] [% part.0 OR "Up" FILTER html %] to [% part.1 OR "now" FILTER html %] [% ELSE %] @@ -52,7 +52,7 @@ [% END %] [% IF detailed %] -

+

Total of [% global.remaining FILTER format("%.2f") %]h remains from original estimate of [% global.estimated FILTER format("%.2f") %]h [% IF global.deadline %] @@ -62,13 +62,13 @@ [% END %] [% IF monthly %] -

Total of [% global.grand_total FILTER format("%.2f") %] hours worked

+

Total of [% global.grand_total FILTER format("%.2f") %] hours worked

[% END %] [% IF null.size > 0 %] [% INCLUDE inactive_report %] -

Total of [% null.size %] inactive [% terms.bugs %]

+

Total of [% null.size %] inactive [% terms.bugs %]

[% END %] [% END %] @@ -255,15 +255,16 @@ [% BLOCK query_form %]
-
+ [% IF warn_swap_dates %] -

The - end date specified occurs before the start date, which doesn't - make sense; the dates below have therefore been swapped.

+

+ The end date specified occurs before the start date, which doesn't + make sense; the dates below have therefore been swapped. +

[% END %]
[% collapsed ? '(+)' : '(-)' %] [% IF lxr_prefix && !file.is_add %] [% file.filename FILTER html %] [% ELSE %] diff --git a/mozilla/webtools/bugzilla/template/en/default/attachment/diff-header.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/attachment/diff-header.html.tmpl index 4261c8423c2..b8b0d2cc01d 100644 --- a/mozilla/webtools/bugzilla/template/en/default/attachment/diff-header.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/attachment/diff-header.html.tmpl @@ -43,7 +43,9 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %] [% ELSE %] - + @@ -57,13 +59,15 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %] [% IF headers %] View | Details - | Raw Unified + | Raw Unified | Return to [% "$terms.bug $bugid" FILTER bug_link(bugid) FILTER none %] [% END %] [% IF other_patches.size > 0 %] [% IF headers %] |[%END%] Differences between -
+
) +
+ + + + + +
) [% END %] [% IF warning %] @@ -139,4 +149,4 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %] [%# Restore Stuff %]
- + diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/create/create-guided.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/create/create-guided.html.tmpl index 181b76e62f2..7abb8c7dc90 100644 --- a/mozilla/webtools/bugzilla/template/en/default/bug/create/create-guided.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/bug/create/create-guided.html.tmpl @@ -62,7 +62,6 @@ function PutDescription() {

diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl index 369326d48ba..61994cf280f 100644 --- a/mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl @@ -166,9 +166,8 @@
- + + [% IF maxdepth %] @@ -188,11 +187,9 @@ - + [%# set to one form %] - @@ -201,8 +198,7 @@ - + [%# Minus one form Allow subtracting only when realdepth and maxdepth > 1 %] @@ -211,14 +207,13 @@ : ( maxdepth ? maxdepth - 1 : realdepth - 1 ) %]"> - -
+ [%# Limit entry form: the button cannot do anything when total depth is less than two, so disable it %] + [%# plus one form Disable button if total depth < 2, or if depth set to unlimited %] @@ -243,19 +237,18 @@ [% END %] - = realdepth %]>
-
+ [%# Unlimited button %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/flag/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/flag/list.html.tmpl index 4d7eefb486e..8acef56317f 100644 --- a/mozilla/webtools/bugzilla/template/en/default/flag/list.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/flag/list.html.tmpl @@ -132,9 +132,8 @@ [% IF any_flags_requesteeble %] - [% END %] diff --git a/mozilla/webtools/bugzilla/template/en/default/global/textarea.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/global/textarea.html.tmpl index 216f2ddbf99..bc5fd6311f0 100644 --- a/mozilla/webtools/bugzilla/template/en/default/global/textarea.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/global/textarea.html.tmpl @@ -11,7 +11,6 @@ # id: (optional) The "id"-attribute of the textarea. # name: (optional) The "name"-attribute of the textarea. # accesskey: (optional) The "accesskey"-attribute of the textarea. - # style: (optional) The "style"-attribute of the textarea. # classes: (optional) The "class"-attribute of the textarea. # wrap: (deprecated; optional) The "wrap"-attribute of the textarea. # disabled: (optional) Disable the textarea. @@ -33,7 +32,6 @@
+ [% IF (type.is_active && type.is_requestable && type.is_requesteeble) || (flag && flag.requestee) %] - [% SET grant_list = [] %] [% IF Param('usemenuforusers') %] [% grant_list = type.grant_list %] @@ -158,7 +157,6 @@ classes => ["requestee"] custom_userlist => grant_list %] - [% END %]