diff options
47 files changed, 159 insertions, 139 deletions
@@ -291,6 +291,7 @@ sub edit { $vars->{'category'} = Bugzilla::Chart::getVisibleSeries(); $vars->{'default'} = $series; + $vars->{'message'} = 'series_updated' if $vars->{'changes_saved'}; print $cgi->header(); $template->process("reports/edit-series.html.tmpl", $vars) diff --git a/skins/standard/admin.css b/skins/standard/admin.css index c2b822bbe..7058bd1af 100644 --- a/skins/standard/admin.css +++ b/skins/standard/admin.css @@ -6,6 +6,10 @@ * defined by the Mozilla Public License, v. 2.0. */ +.column_header { + background-color: #66f; +} + .warningmessages, .criticalmessages { background-color: white; border-style: solid; @@ -39,7 +43,7 @@ p.areyoureallyreallysure { font-weight: bold; } -tr.param_disabled { +tr.disabled { background-color: lightgrey; } @@ -124,3 +128,15 @@ th.title { #edit_custom_field th.narrow_label { white-space: normal; } + +#flag_types_bugs tr th, #flag_types_attachments tr th { + text-align: left; +} + +#flag_types_bugs .inactive, #flag_types_attachments .inactive { + color: #787878; +} + +#flag_types_bugs .multiplicable, #flag_types_attachments .multiplicable { + display: block; +} diff --git a/skins/standard/enter_bug.css b/skins/standard/enter_bug.css index e0f1ab656..2aa094626 100644 --- a/skins/standard/enter_bug.css +++ b/skins/standard/enter_bug.css @@ -24,11 +24,16 @@ #Create #field_container_component { width: 1px; } #Create #field_container_reporter { width: 100%; } -#Create .comment { +#Create .comment, #description.comment { vertical-align: top; overflow: auto; color: green; } + +#description.comment { + margin-left: 10px; +} + #Create #comp_desc_container td { padding: 0; } #Create #comp_desc { height: 11ex; } #Create #os_guess_note { @@ -53,3 +58,23 @@ #possible_duplicates .yui-dt-col-update_token { white-space: nowrap; } form#Create #possible_duplicates td { vertical-align: middle; } + + +/* CSS rules for the guided form. */ + +.guided_form_field { + background-color: #ffc; +} + +#somebugs { + width: 100%; + height: 500px; +} + +.good { + color: #090; +} + +.bad { + color: #900; +} diff --git a/skins/standard/global.css b/skins/standard/global.css index 3d3be8331..9396a6346 100644 --- a/skins/standard/global.css +++ b/skins/standard/global.css @@ -413,7 +413,8 @@ dl dl > dt { border: 1px solid #333333; } -#attachment_table th, .bz_attach_footer, .bz_time_tracking_table th { +#attachment_table th, .bz_attach_footer, .bz_time_tracking_table th, +.dependency_tree_controls { background-color: #E0E0E0; color: black; } @@ -422,7 +423,7 @@ dl dl > dt { border: 1px solid #333333; } -.bz_attach_extra_info { +.bz_attach_extra_info, .bz_info { font-size: smaller; } diff --git a/skins/standard/show_bug.css b/skins/standard/show_bug.css index 7c002cc15..0c6534fc0 100644 --- a/skins/standard/show_bug.css +++ b/skins/standard/show_bug.css @@ -47,6 +47,11 @@ table#flags { display: inline; } +.navigation_link { + color: #777; + font-style: italic; +} + .bz_show_bug_column { vertical-align: top; } diff --git a/template/en/default/account/profile-activity.html.tmpl b/template/en/default/account/profile-activity.html.tmpl index b8a58d596..ff989c6a5 100644 --- a/template/en/default/account/profile-activity.html.tmpl +++ b/template/en/default/account/profile-activity.html.tmpl @@ -28,6 +28,7 @@ [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] %] [% PROCESS admin/users/listselectvars.html.tmpl diff --git a/template/en/default/admin/classifications/del.html.tmpl b/template/en/default/admin/classifications/del.html.tmpl index 83e0812ab..f99d29632 100644 --- a/template/en/default/admin/classifications/del.html.tmpl +++ b/template/en/default/admin/classifications/del.html.tmpl @@ -8,10 +8,11 @@ [% PROCESS global/header.html.tmpl title = "Delete classification" + style_urls = ['skins/standard/admin.css'] %] <table border=1 cellpadding=4 cellspacing=0> -<tr bgcolor="#6666ff"> +<tr class="column_header"> <th valign="top" class="left">Part</th> <th valign="top" class="left">Value</th> @@ -25,7 +26,7 @@ [% IF classification.description %] [% classification.description FILTER html_light %] [% ELSE %] - <font color="red">description missing</font> + <span class="warning">description missing</span> [% END %] </td> diff --git a/template/en/default/admin/classifications/edit.html.tmpl b/template/en/default/admin/classifications/edit.html.tmpl index fddcb3f96..68fd046f2 100644 --- a/template/en/default/admin/classifications/edit.html.tmpl +++ b/template/en/default/admin/classifications/edit.html.tmpl @@ -26,18 +26,12 @@ [% FOREACH product = classification.products %] <tr> <th valign=top>[% product.name FILTER html %]</th> - <td valign=top> - [% IF product.description %] - [% product.description FILTER html_light %] - [% ELSE %] - <font color="red">description missing</font> - [% END %] - </td> + <td valign=top>[% product.description FILTER html_light %]</td> </tr> [% END %] </table> [% ELSE %] - <font color="red">none</font> + <span class="warning">none</span> [% END %] </td> </tr> diff --git a/template/en/default/admin/classifications/reclassify.html.tmpl b/template/en/default/admin/classifications/reclassify.html.tmpl index 3e12d3e42..ac4a09b14 100644 --- a/template/en/default/admin/classifications/reclassify.html.tmpl +++ b/template/en/default/admin/classifications/reclassify.html.tmpl @@ -22,7 +22,7 @@ [% IF classification.description %] [% classification.description FILTER html_light %] [% ELSE %] - <font color="red">description missing</font> + <span class="warning">description missing</span> [% END %] </td> diff --git a/template/en/default/admin/classifications/select.html.tmpl b/template/en/default/admin/classifications/select.html.tmpl index 8a033a950..02a3cd413 100644 --- a/template/en/default/admin/classifications/select.html.tmpl +++ b/template/en/default/admin/classifications/select.html.tmpl @@ -8,10 +8,11 @@ [% PROCESS global/header.html.tmpl title = "Select classification" + style_urls = ['skins/standard/admin.css'] %] <table border=1 cellpadding=4 cellspacing=0> - <tr bgcolor="#6666ff"> + <tr class="column_header"> <th>Edit Classification ...</th> <th>Description</th> <th>Sortkey</th> @@ -26,7 +27,7 @@ [% IF cl.description %] [% cl.description FILTER html_light %] [% ELSE %] - <font color="red">none</font> + <span class="warning">none</span> [% END %] </td> <td valign="top">[% cl.sortkey FILTER html %]</td> diff --git a/template/en/default/admin/components/confirm-delete.html.tmpl b/template/en/default/admin/components/confirm-delete.html.tmpl index bbd5ce200..6644acca8 100644 --- a/template/en/default/admin/components/confirm-delete.html.tmpl +++ b/template/en/default/admin/components/confirm-delete.html.tmpl @@ -23,7 +23,7 @@ from '[% product.name FILTER html %]' product %] <table border="1" cellpadding="4" cellspacing="0"> -<tr bgcolor="#6666FF"> +<tr class="column_header"> <th valign="top" class="left">Field</th> <th valign="top" class="left">Value</th> </tr> @@ -114,7 +114,7 @@ from '[% product.name FILTER html %]' product </p> [% ELSE %] - <table border="0" cellpadding="20" width="70%" bgcolor="red"><tr><td> + <table class="confirmation"><tr><td> There [% IF comp.bug_count > 1 %] are [% comp.bug_count %] [%+ terms.bugs %] diff --git a/template/en/default/admin/components/list.html.tmpl b/template/en/default/admin/components/list.html.tmpl index fc36bcdd2..949f56b1e 100644 --- a/template/en/default/admin/components/list.html.tmpl +++ b/template/en/default/admin/components/list.html.tmpl @@ -16,6 +16,7 @@ '[% product.name FILTER html %]'[% END %] [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] %] [% edit_contentlink = BLOCK %]editcomponents.cgi?action=edit&product= diff --git a/template/en/default/admin/components/select-product.html.tmpl b/template/en/default/admin/components/select-product.html.tmpl index 55600d9cd..3651ec570 100644 --- a/template/en/default/admin/components/select-product.html.tmpl +++ b/template/en/default/admin/components/select-product.html.tmpl @@ -13,6 +13,7 @@ [% PROCESS global/header.html.tmpl title = "Edit components for which product?" + style_urls = ['skins/standard/admin.css'] %] [% columns = [ diff --git a/template/en/default/admin/custom_fields/confirm-delete.html.tmpl b/template/en/default/admin/custom_fields/confirm-delete.html.tmpl index 0b7c8814c..579806137 100644 --- a/template/en/default/admin/custom_fields/confirm-delete.html.tmpl +++ b/template/en/default/admin/custom_fields/confirm-delete.html.tmpl @@ -24,7 +24,7 @@ %] <table border="1" cellpadding="4" cellspacing="0"> -<tr bgcolor="#6666FF"> +<tr class="column_header"> <th valign="top" class="left">Field</th> <th valign="top" class="left">Value</th> </tr> diff --git a/template/en/default/admin/custom_fields/list.html.tmpl b/template/en/default/admin/custom_fields/list.html.tmpl index e6ec0c283..7d54926b0 100644 --- a/template/en/default/admin/custom_fields/list.html.tmpl +++ b/template/en/default/admin/custom_fields/list.html.tmpl @@ -14,6 +14,7 @@ [% PROCESS global/header.html.tmpl title = "Custom Fields" + style_urls = ['skins/standard/admin.css'] doc_section = "custom-fields.html" %] diff --git a/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl b/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl index a37ff73d4..39c20e325 100644 --- a/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl +++ b/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl @@ -23,7 +23,7 @@ %] <table border="1" cellpadding="4" cellspacing="0"> -<tr bgcolor="#6666FF"> +<tr class="column_header"> <th valign="top" class="left">Field</th> <th valign="top" class="left">Value</th> </tr> diff --git a/template/en/default/admin/fieldvalues/list.html.tmpl b/template/en/default/admin/fieldvalues/list.html.tmpl index 01c5717b8..109665131 100644 --- a/template/en/default/admin/fieldvalues/list.html.tmpl +++ b/template/en/default/admin/fieldvalues/list.html.tmpl @@ -23,6 +23,7 @@ ([% field.name FILTER html %]) field[% END %] [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] %] [% edit_contentlink = BLOCK %]editvalues.cgi?action=edit&field= diff --git a/template/en/default/admin/fieldvalues/select-field.html.tmpl b/template/en/default/admin/fieldvalues/select-field.html.tmpl index 099eebab6..b3e1d97b6 100644 --- a/template/en/default/admin/fieldvalues/select-field.html.tmpl +++ b/template/en/default/admin/fieldvalues/select-field.html.tmpl @@ -17,6 +17,7 @@ [% PROCESS global/header.html.tmpl title = "Edit values for which field?" + style_urls = ['skins/standard/admin.css'] %] [% columns = [ diff --git a/template/en/default/admin/flag-type/list.html.tmpl b/template/en/default/admin/flag-type/list.html.tmpl index 7a0293866..a3d26a0d0 100644 --- a/template/en/default/admin/flag-type/list.html.tmpl +++ b/template/en/default/admin/flag-type/list.html.tmpl @@ -10,12 +10,7 @@ [% PROCESS global/header.html.tmpl title = 'Administer Flag Types' - style = " - table#flag_types_bugs tr th, - table#flag_types_attachments tr th { text-align: left; } - .inactive { color: #787878; } - .multiplicable { display: block; } - " + style_urls = ['skins/standard/admin.css'] onload="var f = document.flagtype_form; selectProduct(f.product, f.component, null, null, '__All__');" javascript_urls=["js/productform.js"] doc_section = "flags-overview.html#flag-types" @@ -98,7 +93,7 @@ [% BLOCK display_flag_types %] <table id="flag_types_[% types_id FILTER html %]" cellspacing="0" cellpadding="4" border="1"> - <tr> + <tr class="column_header"> <th>Edit name ...</th> <th>Description</th> <th>Sortkey</th> diff --git a/template/en/default/admin/groups/list.html.tmpl b/template/en/default/admin/groups/list.html.tmpl index af7da33a6..ba61da3ee 100644 --- a/template/en/default/admin/groups/list.html.tmpl +++ b/template/en/default/admin/groups/list.html.tmpl @@ -19,6 +19,7 @@ [% PROCESS global/header.html.tmpl title = "Edit Groups" subheader = "This lets you edit the groups available to put users in." + style_urls = ['skins/standard/admin.css'] doc_section = "groups.html" %] diff --git a/template/en/default/admin/keywords/list.html.tmpl b/template/en/default/admin/keywords/list.html.tmpl index ea98ca773..d3391d939 100644 --- a/template/en/default/admin/keywords/list.html.tmpl +++ b/template/en/default/admin/keywords/list.html.tmpl @@ -16,6 +16,7 @@ [% PROCESS global/header.html.tmpl title = "Select keyword" + style_urls = ['skins/standard/admin.css'] %] [% columns = [ diff --git a/template/en/default/admin/milestones/confirm-delete.html.tmpl b/template/en/default/admin/milestones/confirm-delete.html.tmpl index 7efee02b9..2318a76bb 100644 --- a/template/en/default/admin/milestones/confirm-delete.html.tmpl +++ b/template/en/default/admin/milestones/confirm-delete.html.tmpl @@ -22,7 +22,7 @@ %] <table border="1" cellpadding="4" cellspacing="0"> -<tr bgcolor="#6666FF"> +<tr class="column_header"> <th valign="top" class="left">Field</th> <th valign="top" class="left">Value</th> </tr> diff --git a/template/en/default/admin/milestones/list.html.tmpl b/template/en/default/admin/milestones/list.html.tmpl index 16382799f..20e4f6138 100644 --- a/template/en/default/admin/milestones/list.html.tmpl +++ b/template/en/default/admin/milestones/list.html.tmpl @@ -19,6 +19,7 @@ '[% product.name FILTER html %]'[% END %] [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] %] [% edit_contentlink = BLOCK %]editmilestones.cgi?action=edit&product= diff --git a/template/en/default/admin/milestones/select-product.html.tmpl b/template/en/default/admin/milestones/select-product.html.tmpl index 18bb88c7e..ccc7e193b 100644 --- a/template/en/default/admin/milestones/select-product.html.tmpl +++ b/template/en/default/admin/milestones/select-product.html.tmpl @@ -13,6 +13,7 @@ [% PROCESS global/header.html.tmpl title = "Edit milestones for which product?" + style_urls = ['skins/standard/admin.css'] %] [% columns = [ diff --git a/template/en/default/admin/params/common.html.tmpl b/template/en/default/admin/params/common.html.tmpl index bf2675b16..5f6f1bfc0 100644 --- a/template/en/default/admin/params/common.html.tmpl +++ b/template/en/default/admin/params/common.html.tmpl @@ -107,10 +107,10 @@ [% END %] </select> [% ELSE %] - <font color="red"> + <span class="warning"> Unknown param type [% param.type FILTER html %]!!! - </font> - [% END %] + </span> + [% END %] </p> [% UNLESS param.no_reset %] <p> diff --git a/template/en/default/admin/products/confirm-delete.html.tmpl b/template/en/default/admin/products/confirm-delete.html.tmpl index f1d6aa429..626513526 100644 --- a/template/en/default/admin/products/confirm-delete.html.tmpl +++ b/template/en/default/admin/products/confirm-delete.html.tmpl @@ -25,7 +25,7 @@ %] <table border="1" cellpadding="4" cellspacing="0"> - <tr bgcolor="#6666FF"> + <tr class="column_header"> <th valign="top" class="left">Field</th> <th valign="top" class="left">Value</th> </tr> @@ -42,7 +42,7 @@ [% IF classification.description %] [% classification.description FILTER html_light %] [% ELSE %] - <span style="color: red">missing</span> + <span class="warning">missing</span> [% END %] </td> </tr> @@ -59,13 +59,7 @@ <tr> <td valign="top">Description:</td> [%# descriptions are intentionally not filtered to allow html content %] - <td valign="top"> - [% IF product.description %] - [% product.description FILTER html_light %] - [% ELSE %] - <span style="color: red">missing</span> - [% END %] - </td> + <td valign="top">[% product.description FILTER html_light %]</td> </tr> [% IF Param('usetargetmilestone') %] @@ -111,14 +105,7 @@ [% FOREACH c = product.components %] <tr> <th>[% c.name FILTER html %]:</th> - [%# descriptions are intentionally not filtered to allow html content %] - <td> - [% IF c.description %] - [% c.description FILTER html_light %] - [% ELSE %] - <span style="color: red">missing</span> - [% END %] - </td> + <td>[% c.description FILTER html_light %]</td> </tr> [% END %] </table> @@ -214,7 +201,7 @@ [% ELSE %] - <table border="0" cellpadding="20" width="70%" bgcolor="red"> + <table class="confirmation"> <tr> <td> There diff --git a/template/en/default/admin/products/edit.html.tmpl b/template/en/default/admin/products/edit.html.tmpl index 713f30aeb..fdbbe42c2 100644 --- a/template/en/default/admin/products/edit.html.tmpl +++ b/template/en/default/admin/products/edit.html.tmpl @@ -45,16 +45,12 @@ [% FOREACH component = product.components %] <a href="editcomponents.cgi?action=edit&product= [%- product.name FILTER uri %]&component= - [%- component.name FILTER uri %]">[% component.name FILTER html %]</a>: - [% IF component.description %] - [% component.description FILTER html_light %] - [% ELSE %] - <font color="red">description missing</font> - [% END %] + [%- component.name FILTER uri %]">[% component.name FILTER html %]</a>: + [% component.description FILTER html_light %] <br> [% END %] [% ELSE %] - <font color="red">missing</font> + <span class="warning">missing</span> [% END %] </td> </tr> @@ -70,7 +66,7 @@ versions:</a> <br> [% END %] [% ELSE %] - <font color="red">missing</font> + <span class="warning">missing</span> [% END %] </td> </tr> @@ -87,7 +83,7 @@ versions:</a> <br> [% END %] [% ELSE %] - <font color="red">missing</font> + <span class="warning">missing</span> [% END %] </td> </tr> diff --git a/template/en/default/admin/products/groupcontrol/edit.html.tmpl b/template/en/default/admin/products/groupcontrol/edit.html.tmpl index 1ba600271..62e1439ad 100644 --- a/template/en/default/admin/products/groupcontrol/edit.html.tmpl +++ b/template/en/default/admin/products/groupcontrol/edit.html.tmpl @@ -10,7 +10,8 @@ Edit Group Controls for [% product.name FILTER html %] [% END %] [% PROCESS global/header.html.tmpl - title = title + title = title + style_urls = ['skins/standard/admin.css'] %] [% display_headers = 1 %] @@ -24,7 +25,7 @@ <input type="hidden" name="token" value="[% token FILTER html %]"> <table id="form" cellspacing="0" cellpadding="4" border="1"> - <tr bgcolor="#6666ff"> + <tr class="column_header"> <th>Group</th> <th>Entry</th> <th>MemberControl</th> @@ -37,7 +38,7 @@ </tr> [% END %] [% IF !group.group.isactive %] - <tr bgcolor="#bbbbbb"> + <tr class="disabled"> <td>[% group.group.name FILTER html %]</td> <td align="center" colspan="7">Disabled</td> <td>[% group.bug_count FILTER html %]</td> diff --git a/template/en/default/admin/products/list-classifications.html.tmpl b/template/en/default/admin/products/list-classifications.html.tmpl index ea32a0057..a13d2be0f 100644 --- a/template/en/default/admin/products/list-classifications.html.tmpl +++ b/template/en/default/admin/products/list-classifications.html.tmpl @@ -16,6 +16,7 @@ [% PROCESS global/header.html.tmpl title = "Select Classification" + style_urls = ['skins/standard/admin.css'] %] [% columns = [ diff --git a/template/en/default/admin/products/list.html.tmpl b/template/en/default/admin/products/list.html.tmpl index 364cf79e9..d09a552e2 100644 --- a/template/en/default/admin/products/list.html.tmpl +++ b/template/en/default/admin/products/list.html.tmpl @@ -26,6 +26,7 @@ [% PROCESS global/header.html.tmpl title = "Select product $classification_title" + style_urls = ['skins/standard/admin.css'] %] [% columns = [ diff --git a/template/en/default/admin/table.html.tmpl b/template/en/default/admin/table.html.tmpl index abc0e5775..b8492dcb2 100644 --- a/template/en/default/admin/table.html.tmpl +++ b/template/en/default/admin/table.html.tmpl @@ -68,7 +68,7 @@ [%################### TABLE HEADER ######################%] <table id="admin_table" border="1" cellpadding="4" cellspacing="0"> - <tr bgcolor="#6666FF"> + <tr class="column_header"> [% FOREACH c = columns %] [%# Default to align left for headers %] <th style="text-align:[% (c.align || 'left') FILTER html %];"> diff --git a/template/en/default/admin/users/list.html.tmpl b/template/en/default/admin/users/list.html.tmpl index ff23b7727..38f36f57f 100644 --- a/template/en/default/admin/users/list.html.tmpl +++ b/template/en/default/admin/users/list.html.tmpl @@ -16,7 +16,7 @@ [% PROCESS global/header.html.tmpl title = "Select user" - style_urls = ['skins/standard/editusers.css'] + style_urls = ['skins/standard/admin.css', 'skins/standard/editusers.css'] doc_section = "useradmin.html" %] diff --git a/template/en/default/admin/versions/confirm-delete.html.tmpl b/template/en/default/admin/versions/confirm-delete.html.tmpl index 85c297647..ca5b4ef21 100644 --- a/template/en/default/admin/versions/confirm-delete.html.tmpl +++ b/template/en/default/admin/versions/confirm-delete.html.tmpl @@ -22,7 +22,7 @@ %] <table border="1" cellpadding="4" cellspacing="0"> -<tr bgcolor="#6666FF"> +<tr class="column_header"> <th valign="top" class="left">Field</th> <th valign="top" class="left">Value</th> </tr> diff --git a/template/en/default/admin/versions/list.html.tmpl b/template/en/default/admin/versions/list.html.tmpl index 1cf3e8643..ee69ee03e 100644 --- a/template/en/default/admin/versions/list.html.tmpl +++ b/template/en/default/admin/versions/list.html.tmpl @@ -15,6 +15,7 @@ '[% product.name FILTER html %]'[% END %] [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] %] [% edit_contentlink = BLOCK %]editversions.cgi?action=edit&product= diff --git a/template/en/default/admin/versions/select-product.html.tmpl b/template/en/default/admin/versions/select-product.html.tmpl index e40e4086c..e19aa18cc 100644 --- a/template/en/default/admin/versions/select-product.html.tmpl +++ b/template/en/default/admin/versions/select-product.html.tmpl @@ -13,6 +13,7 @@ [% PROCESS global/header.html.tmpl title = "Edit versions for which product?" + style_urls = ['skins/standard/admin.css'] %] [% columns = [ diff --git a/template/en/default/attachment/confirm-delete.html.tmpl b/template/en/default/attachment/confirm-delete.html.tmpl index 9eaaa7b28..c03d58641 100644 --- a/template/en/default/attachment/confirm-delete.html.tmpl +++ b/template/en/default/attachment/confirm-delete.html.tmpl @@ -17,11 +17,12 @@ [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] doc_section = "attachments.html" %] <table border="1" cellpadding="4" cellspacing="0"> - <tr bgcolor="#6666FF"> + <tr class="column_header"> <th valign="top" class="left">Field</th> <th valign="top" class="left">Value</th> </tr> @@ -55,7 +56,7 @@ <h2>Confirmation</h2> -<table border="0" cellpadding="20" width="70%" bgcolor="red"> +<table class="confirmation"> <tr> <td> The content of this attachment will be deleted in an <b>irreversible</b> way. diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl index 8791e0dfe..be946ee89 100644 --- a/template/en/default/attachment/show-multiple.html.tmpl +++ b/template/en/default/attachment/show-multiple.html.tmpl @@ -33,7 +33,7 @@ <div align="center"> <table class="attachment_info" cellspacing="0" cellpadding="4" border="1" width="75%"> <tr> - <td valign="top" bgcolor="#cccccc" colspan="6"> + <td colspan="6" class="bz_attach_footer"> <big><b>Attachment #[% a.id %]</b></big> </td> </tr> diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl index 68bb95b3d..181b76e62 100644 --- a/template/en/default/bug/create/create-guided.html.tmpl +++ b/template/en/default/bug/create/create-guided.html.tmpl @@ -16,25 +16,9 @@ [% PROCESS global/header.html.tmpl title = "Enter $terms.ABug" onload = "PutDescription()" - style = "#somebugs { width: 100%; height: 500px }" + style_urls = ['skins/standard/enter_bug.css'] %] -[% style = "" %] - -<p> - <font color="red"> - This is a template used on mozilla.org. This template, and the - comment-guided.txt.tmpl template that formats the data submitted via - the form in this template, are included as a demo of what it's - possible to do with custom templates in general, and custom [% terms.bug %] - entry templates in particular. As much of the text will not apply, - you should alter it - if you want to use this form on your [% terms.Bugzilla %] installation. - </font> -</p> - -[% tablecolour = "#FFFFCC" %] - [%# This script displays the descriptions for selected components. %] <script type="text/javascript"> var descriptions = [ @@ -56,12 +40,12 @@ function PutDescription() { <h3 id="step1">Step 1 of 3 - has your [% terms.bug %] already been reported?</h3> +<p class="warning"> + Please don't skip this step - half of all [% terms.bugs %] filed are + reported already. <p> - <font color="red">Please don't skip this step - half of all - [% terms.bugs %] filed are - reported already.</font> - Check the two lists of frequently-reported [% terms.bugs %]: -</p> + +<p>Check the two lists of frequently-reported [% terms.bugs %]:</p> [%# Include other products if sensible %] [% IF product.name == "Firefox" %] @@ -85,7 +69,7 @@ function PutDescription() { <p> If your [% terms.bug %] isn't there, search [% terms.Bugzilla %] by entering a few key words having to do with your [% terms.bug %] in this box. - For example: <tt><b>pop3 mail</b></tt> or <tt><b>copy paste</b></tt>. + For example: <kbd><b>pop3 mail</b></kbd> or <kbd><b>copy paste</b></kbd>. The results will appear above. </p> @@ -114,7 +98,7 @@ function PutDescription() { <p> Look through the search results. If you get the - <tt><b>[% terms.zeroSearchResults %]</b></tt> message, [% terms.Bugzilla %] + <kbd><b>[% terms.zeroSearchResults %]</b></kbd> message, [% terms.Bugzilla %] found no [% terms.bugs %] that match. Check for typing mistakes, or try fewer or different keywords. If you find [% terms.abug %] that looks the same as yours, please add @@ -140,7 +124,7 @@ function PutDescription() { <table valign="top" cellpadding="5" cellspacing="5" border="0"> - <tr bgcolor="[% tablecolour %]"> + <tr class="guided_form_field"> <td align="right" valign="top"> <b>Product</b> </td> @@ -174,8 +158,7 @@ function PutDescription() { </select> </td> <td valign="top" width="100%"> - <div id="description" style="color: green; margin-left: 10px; - height: 5em; overflow: auto;"> + <div id="description" class="comment"> <script type="text/javascript"> if ((document.getElementById) && (document.body.innerHTML)) { document.write("\ @@ -202,7 +185,7 @@ function PutDescription() { are based on which are most common in the b.m.o database %] [% rep_platform = [ "PC", "Macintosh", "All", "Other" ] %] - <tr bgcolor="[% tablecolour %]"> + <tr class="guided_form_field"> <td align="right" valign="top"> <b>[% field_descs.rep_platform FILTER html %]</b> </td> @@ -233,7 +216,7 @@ function PutDescription() { [% buildid = cgi.param("buildid") %] [% END %] - <tr bgcolor="[% tablecolour %]"> + <tr class="guided_form_field"> <td align="right" valign="top"> <b>Build Identifier</b> </td> @@ -265,7 +248,7 @@ function PutDescription() { </td> </tr> - <tr bgcolor="[% tablecolour %]"> + <tr class="guided_form_field"> <td align="right" valign="top"> <b>Summary</b> </td> @@ -277,14 +260,14 @@ function PutDescription() { Please be descriptive and use lots of keywords. </p> <p> - <tt> - <font color="#990000">Bad example</font>: mail crashed - </tt> + <kbd> + <span class="bad">Bad example</span>: mail crashed + </kbd> <br> - <tt> - <font color="#009900">Good example</font>: + <kbd> + <span class="good">Good example</span>: crash if I close the mail window while checking for new POP mail - </tt> + </kbd> </p> </td> </tr> @@ -304,22 +287,22 @@ function PutDescription() { as specific as possible about what is wrong. </p> <p> - <tt> - <font color="#990000">Bad example</font>: Mozilla crashed. + <kbd> + <span class="bad">Bad example</span>: Mozilla crashed. You suck! - </tt> + </kbd> <br> - <tt> - <font color="#009900">Good example</font>: After a crash which + <kbd> + <span class="good">Good example</span>: After a crash which happened when I was sorting in the Bookmark Manager,<br> all of my top-level bookmark folders beginning with the letters Q to Z are no longer present. - </tt> + </kbd> </p> </td> </tr> - <tr bgcolor="[% tablecolour %]"> + <tr class="guided_form_field"> <td align="right" valign="top"> <b>Reproducibility</b> </td> @@ -359,7 +342,7 @@ function PutDescription() { </td> </tr> - <tr bgcolor="[% tablecolour %]"> + <tr class="guided_form_field"> <td valign="top" align="right"> <b>Actual Results</b> </td> @@ -391,7 +374,7 @@ function PutDescription() { </td> </tr> - <tr bgcolor="[% tablecolour %]"> + <tr class="guided_form_field"> <td valign="top" align="right"> <b>Additional Information</b> </td> @@ -412,13 +395,13 @@ function PutDescription() { testcase</b>, should be added using the "Add an Attachment" link on the [% terms.bug %], after it is filed. If you believe that it's relevant, please also include - your build configuration, obtained by typing <tt>about:buildconfig</tt> + your build configuration, obtained by typing <kbd>about:buildconfig</kbd> into your URL bar. <br> <br> If you are reporting a crash, note the module in - which the software crashed (e.g., <tt>Application Violation in - gkhtml.dll</tt>). + which the software crashed (e.g., <kbd>Application Violation in + gkhtml.dll</kbd>). </p> </td> </tr> diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index f4c60ad24..6adf75102 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.html.tmpl @@ -638,9 +638,9 @@ TUI_hide_default('attachment_text_field'); [%+ terms.bug %]: </strong> <br> - <font size="-1"> + <span class="bz_info"> (Leave all boxes unchecked to make this a public [% terms.bug %].) - </font> + </span> <br> <br> diff --git a/template/en/default/bug/dependency-tree.html.tmpl b/template/en/default/bug/dependency-tree.html.tmpl index a4bb0e672..369326d48 100644 --- a/template/en/default/bug/dependency-tree.html.tmpl +++ b/template/en/default/bug/dependency-tree.html.tmpl @@ -162,7 +162,7 @@ [%###########################################################################%] [% BLOCK depthControlToolbar %] - <table cellpadding="3" border="0" cellspacing="0" bgcolor="#e0e0e0"> + <table class="dependency_tree_controls"> <tr> [%# Hide/show resolved button Swaps text depending on the state of hide_resolved %] diff --git a/template/en/default/bug/navigate.html.tmpl b/template/en/default/bug/navigate.html.tmpl index 13564a8ea..b5e3ba7a2 100644 --- a/template/en/default/bug/navigate.html.tmpl +++ b/template/en/default/bug/navigate.html.tmpl @@ -37,7 +37,7 @@ [%- last_bug_list.first FILTER uri %]&list_id= [%- my_search.id FILTER uri %]">First</a> [% ELSE %] - <i><font color="#777777">First</font></i> + <span class="navigation_link">First</span> [% END %] [% IF this_bug_idx + 1 < last_bug_list.size %] @@ -45,7 +45,7 @@ [%- last_bug_list.last FILTER uri %]&list_id= [%- my_search.id FILTER uri %]">Last</a> [% ELSE %] - <i><font color="#777777">Last</font></i> + <span class="navigation_link">Last</span> [% END %] [% IF this_bug_idx > 0 %] @@ -54,7 +54,7 @@ [%- last_bug_list.$prev_bug FILTER uri %]&list_id= [%- my_search.id FILTER uri %]">Prev</a> [% ELSE %] - <i><font color="#777777">Prev</font></i> + <span class="navigation_link">Prev</span> [% END %] [% IF this_bug_idx + 1 < last_bug_list.size %] @@ -63,7 +63,7 @@ [%- last_bug_list.$next_bug FILTER uri %]&list_id= [%- my_search.id FILTER uri %]">Next</a> [% ELSE %] - <i><font color="#777777">Next</font></i> + <span class="navigation_link">Next</span> [% END %] <a href="buglist.cgi?regetlastlist= diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index 2270f0919..f32aedfb5 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -273,7 +273,6 @@ ], 'bug/create/create-guided.html.tmpl' => [ - 'tablecolour', 'sel', 'productstring', ], diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl index c31567a9c..f02ea88ae 100644 --- a/template/en/default/global/confirm-user-match.html.tmpl +++ b/template/en/default/global/confirm-user-match.html.tmpl @@ -100,9 +100,9 @@ [% IF query.value.users.size %] [% IF query.value.users.size > 1 %] [% IF query.value.status == 'fail' %] - <font color="#FF0000"> + <span class="warning"> matches multiple users. - </font> + </span> Please go back and try again with a more specific name/address. [% ELSE %] @@ -136,12 +136,13 @@ <b>[% query.value.users.0.identity FILTER html %]</b> [% END %] [% ELSE %] + <span class="warning"> [% IF query.key.length < 3 %] - <font color="#FF0000">was too short for substring match - (minimum 3 characters)</font> + was too short for substring match (minimum 3 characters) [% ELSE %] - <font color="#FF0000">did not match anything</font> + did not match anything [% END %] + </span> [% END %] </div> [% END %] diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index 885198668..59614c5a5 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -853,6 +853,12 @@ [%+ series.name FILTER html %]</em> has been deleted. + [% ELSIF message_tag == "series_updated" %] + [% title = "Series Updated" %] + The series <em>[% default.category FILTER html %] / + [%+ default.subcategory FILTER html %] / + [%+ default.name FILTER html %]</em> has been updated. + [% ELSIF message_tag == "shutdown" %] [% title = "$terms.Bugzilla is Down" %] [% Param("shutdownhtml") %] diff --git a/template/en/default/reports/edit-series.html.tmpl b/template/en/default/reports/edit-series.html.tmpl index c789262ca..ac0b1ea30 100644 --- a/template/en/default/reports/edit-series.html.tmpl +++ b/template/en/default/reports/edit-series.html.tmpl @@ -15,14 +15,6 @@ [% PROCESS global/header.html.tmpl %] -[% IF changes_saved %] - <p> - <font color="red"> - Series updated. - </font> - </p> -[% END %] - <form method="get" action="chart.cgi" name="chartform"> [% PROCESS reports/series.html.tmpl diff --git a/template/en/default/reports/keywords.html.tmpl b/template/en/default/reports/keywords.html.tmpl index 54f31ecdf..b9a2fd795 100644 --- a/template/en/default/reports/keywords.html.tmpl +++ b/template/en/default/reports/keywords.html.tmpl @@ -17,6 +17,7 @@ [% PROCESS global/header.html.tmpl title = "$terms.Bugzilla Keyword Descriptions" + style_urls = ['skins/standard/admin.css'] %] [% FOREACH keyword = keywords %] @@ -26,7 +27,7 @@ [% END %] <table border="1" cellpadding="4" cellspacing="0"> - <tr bgcolor="#6666FF"> + <tr class="column_header"> <th>Name</th> <th>Description</th> <th>Open [% terms.Bugs %]</th> diff --git a/template/en/default/whine/mail.html.tmpl b/template/en/default/whine/mail.html.tmpl index 21784299e..f3b148f80 100644 --- a/template/en/default/whine/mail.html.tmpl +++ b/template/en/default/whine/mail.html.tmpl @@ -25,7 +25,7 @@ [[% terms.Bugzilla %]] [% subject FILTER html %] </title> </head> - <body bgcolor="#FFFFFF"> + <body> <pre> [% body FILTER html %] |