summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2014-03-08 23:34:38 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2014-03-08 23:34:38 +0100
commitff6475497815527eaf1ff741fe4eb933f16fed87 (patch)
tree6fe46ce006311e366beea4cb46c99c654038053a /template
parent40e2d5249b92c3a4efbe6fd3a300f6950b0cb14e (diff)
downloadbugzilla-ff6475497815527eaf1ff741fe4eb933f16fed87.tar.gz
bugzilla-ff6475497815527eaf1ff741fe4eb933f16fed87.tar.xz
Bug 956190 (part 4): Merge duplicates.css, reports.css, search_form.css, show_multiple.css and summarize-time.css with buglist.css
Diffstat (limited to 'template')
-rw-r--r--template/en/default/bug/show-multiple.html.tmpl9
-rw-r--r--template/en/default/bug/summarize-time.html.tmpl6
-rw-r--r--template/en/default/reports/components.html.tmpl8
-rw-r--r--template/en/default/reports/create-chart.html.tmpl2
-rw-r--r--template/en/default/reports/duplicates-simple.html.tmpl2
-rw-r--r--template/en/default/reports/duplicates.html.tmpl5
-rw-r--r--template/en/default/reports/edit-series.html.tmpl2
-rw-r--r--template/en/default/reports/menu.html.tmpl2
-rw-r--r--template/en/default/reports/old-charts.html.tmpl2
-rw-r--r--template/en/default/reports/report.html.tmpl2
-rw-r--r--template/en/default/search/field.html.tmpl4
-rw-r--r--template/en/default/search/form.html.tmpl9
-rw-r--r--template/en/default/search/search-advanced.html.tmpl2
-rw-r--r--template/en/default/search/search-create-series.html.tmpl2
-rw-r--r--template/en/default/search/search-report-graph.html.tmpl2
-rw-r--r--template/en/default/search/search-report-table.html.tmpl2
-rw-r--r--template/en/default/search/search-specific.html.tmpl2
17 files changed, 28 insertions, 35 deletions
diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index de872973b..e09860201 100644
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -9,10 +9,12 @@
[% PROCESS global/header.html.tmpl
title = "Full Text $terms.Bug Listing"
h1 = ""
- style_urls = ["skins/standard/show_multiple.css",
- "skins/standard/buglist.css"]
+ style_urls = ['skins/standard/buglist.css']
doc_section = "using.html#anatomy-of-a-bug"
%]
+
+[% USE Bugzilla %]
+
[% PROCESS bug/time.html.tmpl %]
[% IF bugs.first %]
[% ids = [] %]
@@ -55,7 +57,7 @@
<table class="bugfields">
[% IF bug.error %]
<tr>
- <td class="error">
+ <td class="warning">
[% IF bug.error == "InvalidBugId" %]
'[%+ bug.bug_id FILTER html %]' is not a valid [% terms.bug %] number
nor a known [% terms.bug %] alias.
@@ -170,7 +172,6 @@
[% PROCESS row cell = "status_whiteboard" fullrow = 1 %]
[% END %]
- [% USE Bugzilla %]
[% field_counter = 0 %]
[% FOREACH field = Bugzilla.active_custom_fields %]
[% field_counter = field_counter + 1 %]
diff --git a/template/en/default/bug/summarize-time.html.tmpl b/template/en/default/bug/summarize-time.html.tmpl
index 6bdc62a9a..faf05684a 100644
--- a/template/en/default/bug/summarize-time.html.tmpl
+++ b/template/en/default/bug/summarize-time.html.tmpl
@@ -18,9 +18,9 @@
[% END %]
[% PROCESS global/header.html.tmpl
- title = title
- header = header
- style_urls = ["skins/standard/summarize-time.css"]
+ title = title
+ header = header
+ style_urls = ['skins/standard/buglist.css']
doc_section = "using.html#time-tracking-information"
yui = ['calendar']
javascript_urls = [ "js/util.js", "js/field.js" ]
diff --git a/template/en/default/reports/components.html.tmpl b/template/en/default/reports/components.html.tmpl
index c307caedb..22a7c948e 100644
--- a/template/en/default/reports/components.html.tmpl
+++ b/template/en/default/reports/components.html.tmpl
@@ -16,8 +16,8 @@
[% END %]
[% PROCESS global/header.html.tmpl
- style_urls = [ "skins/standard/reports.css" ]
- title = title
+ style_urls = ['skins/standard/buglist.css']
+ title = title
%]
[% IF Param("useqacontact") %]
@@ -28,10 +28,10 @@
<h1>[% product.name FILTER html %]</h1>
-<div class="product_desc">[% product.description FILTER html_light %]</div>
+<div id="product_desc">[% product.description FILTER html_light %]</div>
<p>Select a component to see open [% terms.bugs %] in that component.</p>
-<table class="component_table">
+<table id="component_table">
<tr>
<th>Component</th>
<th>Default Assignee</th>
diff --git a/template/en/default/reports/create-chart.html.tmpl b/template/en/default/reports/create-chart.html.tmpl
index c4e554210..eb2530aef 100644
--- a/template/en/default/reports/create-chart.html.tmpl
+++ b/template/en/default/reports/create-chart.html.tmpl
@@ -15,7 +15,7 @@
[% PROCESS global/header.html.tmpl
title = "Create Chart"
- style_urls = [ "skins/standard/reports.css"]
+ style_urls = ['skins/standard/buglist.css']
%]
[% PROCESS "reports/series-common.html.tmpl"
diff --git a/template/en/default/reports/duplicates-simple.html.tmpl b/template/en/default/reports/duplicates-simple.html.tmpl
index 95185c414..5c3a34bb0 100644
--- a/template/en/default/reports/duplicates-simple.html.tmpl
+++ b/template/en/default/reports/duplicates-simple.html.tmpl
@@ -24,8 +24,6 @@
<title>[% title FILTER html %]</title>
<link href="[% 'skins/standard/global.css' FILTER mtime %]"
rel="stylesheet" type="text/css">
- <link href="[% 'skins/standard/duplicates.css' FILTER mtime %]"
- rel="stylesheet" type="text/css">
</head>
<body>
diff --git a/template/en/default/reports/duplicates.html.tmpl b/template/en/default/reports/duplicates.html.tmpl
index 9d3fc698b..67d1f233e 100644
--- a/template/en/default/reports/duplicates.html.tmpl
+++ b/template/en/default/reports/duplicates.html.tmpl
@@ -27,10 +27,7 @@
[% title = "Most Frequently Reported $terms.Bugs" %]
[% END%]
-[% PROCESS global/header.html.tmpl
- title = title
- style_urls = ['skins/standard/duplicates.css']
-%]
+[% PROCESS global/header.html.tmpl title = title %]
<p>
<a href="#explanation">What is this data?</a>
diff --git a/template/en/default/reports/edit-series.html.tmpl b/template/en/default/reports/edit-series.html.tmpl
index f87c45a92..ad6bb32f4 100644
--- a/template/en/default/reports/edit-series.html.tmpl
+++ b/template/en/default/reports/edit-series.html.tmpl
@@ -14,7 +14,7 @@
[% END %]
[% PROCESS global/header.html.tmpl
- style_urls = [ "skins/standard/reports.css" ]
+ style_urls = ['skins/standard/buglist.css']
%]
<form method="get" action="chart.cgi" name="chartform">
diff --git a/template/en/default/reports/menu.html.tmpl b/template/en/default/reports/menu.html.tmpl
index b1dfa23fe..2804dda70 100644
--- a/template/en/default/reports/menu.html.tmpl
+++ b/template/en/default/reports/menu.html.tmpl
@@ -14,7 +14,7 @@
[% PROCESS global/header.html.tmpl
title = "Reporting and Charting Kitchen"
doc_section = "using.html#reports-and-charts"
- style_urls = ['skins/standard/reports.css']
+ style_urls = ['skins/standard/buglist.css']
%]
<p>
diff --git a/template/en/default/reports/old-charts.html.tmpl b/template/en/default/reports/old-charts.html.tmpl
index 9e2ced2b4..b3ebe386d 100644
--- a/template/en/default/reports/old-charts.html.tmpl
+++ b/template/en/default/reports/old-charts.html.tmpl
@@ -15,7 +15,7 @@
[% PROCESS global/header.html.tmpl
title = "$terms.Bug Charts"
h1 = "Welcome to the $terms.Bugzilla Charting Kitchen"
- style_urls = ['skins/standard/reports.css']
+ style_urls = ['skins/standard/buglist.css']
doc_section = "using.html#charts"
%]
diff --git a/template/en/default/reports/report.html.tmpl b/template/en/default/reports/report.html.tmpl
index 195e92e89..a9cd96551 100644
--- a/template/en/default/reports/report.html.tmpl
+++ b/template/en/default/reports/report.html.tmpl
@@ -56,7 +56,7 @@
[% PROCESS global/header.html.tmpl
header_addl_info = time
- style_urls = ['skins/standard/reports.css']
+ style_urls = ['skins/standard/buglist.css']
yui = ['datatable']
%]
diff --git a/template/en/default/search/field.html.tmpl b/template/en/default/search/field.html.tmpl
index 86f293aa1..90156238d 100644
--- a/template/en/default/search/field.html.tmpl
+++ b/template/en/default/search/field.html.tmpl
@@ -23,7 +23,7 @@
<input name="[% field.name FILTER html %]"
id="[% field.name FILTER html %]" size="40"
[% IF onchange %] onchange="[% onchange FILTER html %]"[% END %]
- value="[% value FILTER html %]">
+ value="[% value FILTER html %]" [% 'autofocus' IF focus %]>
[% CASE constants.FIELD_TYPE_KEYWORDS %]
[% INCLUDE "bug/field-label.html.tmpl"
field = field
@@ -39,7 +39,7 @@
<input name="[% field.name FILTER html %]"
id="[% field.name FILTER html %]" size="40"
[% IF onchange %] onchange="[% onchange FILTER html %]"[% END %]
- value="[% value FILTER html %]">
+ value="[% value FILTER html %]" [% 'autofocus' IF focus %]>
<div id="[% field.name FILTER html %]_autocomplete"></div>
</div>
<script type="text/javascript" defer="defer">
diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index fcb038638..0420811ee 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -52,11 +52,8 @@ TUI_hide_default('information_query');
value = default.short_desc.0
type_selected = default.short_desc_type.0
accesskey = "s"
- %]
- <script type="text/javascript"> <!--
- document.getElementById('short_desc').focus();
- // -->
- </script>
+ focus = 1
+ %]
[% IF button_name %]
<input type="submit" id="[% button_name FILTER css_class_quote %]_top"
@@ -165,7 +162,7 @@ TUI_hide_default('information_query');
<div class="search_field_row">
<span class="field_label"><label for="bug_id">[% terms.Bugs %] numbered</label></span>
- <div id="bug_id_container" >
+ <div id="bug_id_container">
<input type="text" name="bug_id" id="bug_id"
value="[% default.bug_id.0 FILTER html %]" size="20">
<div class="field_help">(comma-separated list)</div>
diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl
index a48685719..7c1ca6e0a 100644
--- a/template/en/default/search/search-advanced.html.tmpl
+++ b/template/en/default/search/search-advanced.html.tmpl
@@ -29,7 +29,7 @@ function remove_token() {
yui = [ 'autocomplete', 'calendar' ]
javascript = javascript
javascript_urls = [ "js/util.js", "js/TUI.js", "js/field.js"]
- style_urls = [ "skins/standard/search_form.css" ]
+ style_urls = ['skins/standard/buglist.css']
doc_section = "using.html#searching-for-bugs"
%]
diff --git a/template/en/default/search/search-create-series.html.tmpl b/template/en/default/search/search-create-series.html.tmpl
index 3c9c933d7..9f89000da 100644
--- a/template/en/default/search/search-create-series.html.tmpl
+++ b/template/en/default/search/search-create-series.html.tmpl
@@ -22,7 +22,7 @@
yui = [ 'autocomplete', 'calendar' ]
javascript = js_data
javascript_urls = [ "js/util.js", "js/TUI.js", "js/field.js" ]
- style_urls = [ "skins/standard/reports.css", "skins/standard/search_form.css" ]
+ style_urls = ['skins/standard/buglist.css']
doc_section = "using.html#creating-new-data-sets"
%]
diff --git a/template/en/default/search/search-report-graph.html.tmpl b/template/en/default/search/search-report-graph.html.tmpl
index a5e91f790..f1b77985d 100644
--- a/template/en/default/search/search-report-graph.html.tmpl
+++ b/template/en/default/search/search-report-graph.html.tmpl
@@ -21,7 +21,7 @@ var queryform = "reportform"
yui = [ 'autocomplete', 'calendar' ]
javascript = js_data
javascript_urls = [ "js/util.js", "js/TUI.js", "js/field.js" ]
- style_urls = [ "skins/standard/search_form.css" ]
+ style_urls = ['skins/standard/buglist.css']
doc_section = "using.html#reports"
%]
diff --git a/template/en/default/search/search-report-table.html.tmpl b/template/en/default/search/search-report-table.html.tmpl
index de5d357fd..0db9871f9 100644
--- a/template/en/default/search/search-report-table.html.tmpl
+++ b/template/en/default/search/search-report-table.html.tmpl
@@ -21,7 +21,7 @@ var queryform = "reportform"
yui = [ 'autocomplete', 'calendar' ]
javascript = js_data
javascript_urls = [ "js/util.js", "js/TUI.js", "js/field.js" ]
- style_urls = [ "skins/standard/search_form.css" ]
+ style_urls = ['skins/standard/buglist.css']
doc_section = "using.html#reports"
%]
diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl
index 54a769b81..4d1b4c7ef 100644
--- a/template/en/default/search/search-specific.html.tmpl
+++ b/template/en/default/search/search-specific.html.tmpl
@@ -8,7 +8,7 @@
[% PROCESS global/header.html.tmpl
title = "Simple Search"
- style_urls = [ "skins/standard/search_form.css" ]
+ style_urls = ['skins/standard/buglist.css']
%]
[% WRAPPER search/tabs.html.tmpl %]
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-22 01:22:34 +0100