summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2014-03-10 15:03:25 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2014-03-10 15:03:25 +0100
commitcd4b2663e6605bbc407110e89b1d06307640b740 (patch)
treef8747450c3be5e8815996176c41dde2025c8bb9b /template
parentff6475497815527eaf1ff741fe4eb933f16fed87 (diff)
downloadbugzilla-cd4b2663e6605bbc407110e89b1d06307640b740.tar.gz
bugzilla-cd4b2663e6605bbc407110e89b1d06307640b740.tar.xz
Bug 956190 (part 5): Merge attachment.css, dependency-tree.css, enter_bug.css and show_bug.css into bug.css
r/a=justdave
Diffstat (limited to 'template')
-rw-r--r--template/en/default/attachment/create.html.tmpl2
-rw-r--r--template/en/default/attachment/diff-header.html.tmpl4
-rw-r--r--template/en/default/attachment/edit.html.tmpl2
-rw-r--r--template/en/default/attachment/show-multiple.html.tmpl2
-rw-r--r--template/en/default/bug/create/create-guided.html.tmpl2
-rw-r--r--template/en/default/bug/create/create.html.tmpl3
-rw-r--r--template/en/default/bug/dependency-tree.html.tmpl6
-rw-r--r--template/en/default/bug/show-header.html.tmpl2
8 files changed, 11 insertions, 12 deletions
diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl
index 739851f87..18cc12640 100644
--- a/template/en/default/attachment/create.html.tmpl
+++ b/template/en/default/attachment/create.html.tmpl
@@ -16,7 +16,7 @@
title = title
header = header
subheader = subheader
- style_urls = [ 'skins/standard/attachment.css' ]
+ style_urls = ['skins/standard/bug.css']
yui = [ 'autocomplete' ]
javascript_urls = [ "js/attachment.js", 'js/field.js', "js/util.js", "js/TUI.js" ]
doc_section = "using.html#attachments"
diff --git a/template/en/default/attachment/diff-header.html.tmpl b/template/en/default/attachment/diff-header.html.tmpl
index 8d89f532e..94d2b9541 100644
--- a/template/en/default/attachment/diff-header.html.tmpl
+++ b/template/en/default/attachment/diff-header.html.tmpl
@@ -39,14 +39,14 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
[% END %]
[% PROCESS global/header.html.tmpl doc_section = "using.html#patch-viewer"
javascript_urls = "js/attachment.js"
- style_urls = ['skins/standard/attachment.css'] %]
+ style_urls = ['skins/standard/bug.css'] %]
[% ELSE %]
<!DOCTYPE html>
<html>
<head>
<link href="[% 'skins/standard/global.css' FILTER mtime %]"
rel="stylesheet" type="text/css">
- <link href="[% 'skins/standard/attachment.css' FILTER mtime %]"
+ <link href="[% 'skins/standard/bug.css' FILTER mtime %]"
rel="stylesheet" type="text/css">
<script src="[% 'js/attachment.js' FILTER mtime %]"
type="text/javascript"></script>
diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index 283ca3676..dbcef2a71 100644
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -22,7 +22,7 @@
subheader = subheader
doc_section = "using.html#attachments"
javascript_urls = ['js/attachment.js', 'js/field.js']
- style_urls = ['skins/standard/attachment.css']
+ style_urls = ['skins/standard/bug.css']
yui = [ 'autocomplete' ]
bodyclasses = "no_javascript"
%]
diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl
index ae2fb8f3b..a7c266b3c 100644
--- a/template/en/default/attachment/show-multiple.html.tmpl
+++ b/template/en/default/attachment/show-multiple.html.tmpl
@@ -18,7 +18,7 @@
title = title
header = header
subheader = filtered_summary
- style_urls = ['skins/standard/attachment.css']
+ style_urls = ['skins/standard/bug.css']
%]
[% IF hide_obsolete %]
<div id="hidden_obsolete_message">
diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl
index 13aaf6dea..5cc9df64f 100644
--- a/template/en/default/bug/create/create-guided.html.tmpl
+++ b/template/en/default/bug/create/create-guided.html.tmpl
@@ -16,7 +16,7 @@
[% PROCESS global/header.html.tmpl
title = "Enter $terms.ABug"
onload = "PutDescription()"
- style_urls = ['skins/standard/enter_bug.css']
+ style_urls = ['skins/standard/bug.css']
%]
[%# This script displays the descriptions for selected components. %]
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index d57615da9..05f139646 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -11,8 +11,7 @@
[% PROCESS global/header.html.tmpl
title = title
yui = [ 'autocomplete', 'calendar', 'datatable', 'button' ]
- style_urls = [ 'skins/standard/attachment.css',
- 'skins/standard/enter_bug.css' ]
+ style_urls = ['skins/standard/bug.css']
javascript_urls = [ "js/attachment.js", "js/util.js",
"js/field.js", "js/TUI.js", "js/bug.js" ]
onload = "set_assign_to(); hideElementById('attachment_true');
diff --git a/template/en/default/bug/dependency-tree.html.tmpl b/template/en/default/bug/dependency-tree.html.tmpl
index 51bf7791f..16299c121 100644
--- a/template/en/default/bug/dependency-tree.html.tmpl
+++ b/template/en/default/bug/dependency-tree.html.tmpl
@@ -12,9 +12,9 @@
header = "Dependency tree for
<a href=\"show_bug.cgi?id=$bugid\">$terms.Bug $bugid</a>"
javascript_urls = ["js/expanding-tree.js"]
- style_urls = ["skins/standard/dependency-tree.css"]
- subheader = filtered_desc
- doc_section = "using.html#dependency-tree"
+ style_urls = ['skins/standard/bug.css']
+ subheader = filtered_desc
+ doc_section = "using.html#dependency-tree"
%]
[% PROCESS depthControlToolbar %]
diff --git a/template/en/default/bug/show-header.html.tmpl b/template/en/default/bug/show-header.html.tmpl
index 0dbf5182f..c340def17 100644
--- a/template/en/default/bug/show-header.html.tmpl
+++ b/template/en/default/bug/show-header.html.tmpl
@@ -56,7 +56,7 @@
[% javascript FILTER none %]
[% END %]
[% END %]
-[% style_urls = [ "skins/standard/show_bug.css" ] %]
+[% style_urls = ['skins/standard/bug.css'] %]
[% doc_section = "using.html#anatomy-of-a-bug" %]
[% bodyclasses = ['bz_bug',
"bz_status_$bug.bug_status",