From 7ce39e93e155549ab165febe55d61e2bc08a04a5 Mon Sep 17 00:00:00 2001
From: Thomas ZILLIOX <thomas@zilliox.me>
Date: Wed, 19 Jun 2013 23:28:51 +0200
Subject: [PATCH] Remove inline styles from Dashboard plugin
---
plugins/Dashboard/stylesheets/standalone.css | 78 ++++++++++++++++++
plugins/Dashboard/templates/_header.twig | 86 +-------------------
2 files changed, 82 insertions(+), 82 deletions(-)
create mode 100644 plugins/Dashboard/stylesheets/standalone.css
diff --git a/plugins/Dashboard/stylesheets/standalone.css b/plugins/Dashboard/stylesheets/standalone.css
new file mode 100644
index 0000000000..f63cfc99ab
--- /dev/null
+++ b/plugins/Dashboard/stylesheets/standalone.css
@@ -0,0 +1,78 @@
+
+body {
+ padding-left: 7px;
+}
+
+#dashboard {
+ margin: 30px -6px 0 -12px;
+ width: 100%;
+ padding-top: 8px;
+}
+
+#menuHead {
+ position: absolute;
+ top: 0;
+ padding: 7px 0 0 2px;
+}
+
+#Dashboard {
+ z-index: 5;
+ font-size: 14px;
+ cursor: pointer;
+}
+
+#Dashboard > ul {
+ list-style: square inside none;
+ background: #f7f7f7;
+ border: 1px solid #e4e5e4;
+ padding: 5px 10px 6px 10px;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ color: #444;
+ height: 18px;
+}
+
+#Dashboard:hover ul {
+ background: #f1f0eb;
+ border-color: #a9a399;
+}
+
+#Dashboard > ul > li {
+ float: left;
+ text-align: center;
+ margin: 0 15px;
+}
+
+#Dashboard a {
+ color: #444;
+ text-decoration: none;
+ font-weight: normal;
+ display: inline-block;
+ margin: 0 -15px;
+}
+
+#Dashboard > ul > li:hover, #Dashboard > ul > li:hover a,
+#Dashboard > ul > li.sfHover, #Dashboard > ul > li.sfHover a {
+ color: #e87500;
+}
+
+#Dashboard > ul > li.sfHover, #Dashboard > ul > li.sfHover a {
+ font-weight: bold;
+}
+
+#Dashboard, #periodString, #dashboardSettings {
+ float: left;
+ clear: none;
+ position: relative;
+ margin-left: 0;
+ margin-right: 10px;
+}
+
+.jqplock-seriespicker-popover {
+ top: 0;
+}
+
+#ajaxLoading {
+ margin: 40px 0 -30px 0;
+}
\ No newline at end of file
diff --git a/plugins/Dashboard/templates/_header.twig b/plugins/Dashboard/templates/_header.twig
index e8cf711561..2abd7a1cc3 100644
--- a/plugins/Dashboard/templates/_header.twig
+++ b/plugins/Dashboard/templates/_header.twig
@@ -4,92 +4,14 @@
<head>
<title>{{ 'General_Dashboard'|translate }} - {{ 'CoreHome_WebAnalyticsReports'|translate }}</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+
{{ loadJavascriptTranslations(['CoreHome',' Dashboard'])|raw }}
<!--[if lt IE 9]>
- <script language="javascript" type="text/javascript" src="libs/jqplot/excanvas.min.js"></script>
+ <script language="javascript" type="text/javascript" src="libs/jqplot/excanvas.min.js"></script>
<![endif]-->
+
+ <link rel="stylesheet" type="text/css" href="plugins/Dashboard/stylesheets/standalone.css" />
{% include "_jsGlobalVariables.twig" %}
{% include "_jsCssIncludes.twig" %}
-
- <style type="text/css">
- body {
- padding-left: 7px;
- }
-
- #dashboard {
- margin: 30px -6px 0 -12px;
- width: 100%;
- padding-top: 8px;
- }
-
- #menuHead {
- position: absolute;
- top: 0;
- padding: 7px 0 0 2px;
- }
-
- #Dashboard {
- z-index: 5;
- font-size: 14px;
- cursor: pointer;
- }
-
- #Dashboard > ul {
- list-style: square inside none;
- background: #f7f7f7;
- border: 1px solid #e4e5e4;
- padding: 5px 10px 6px 10px;
- border-radius: 4px;
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
- color: #444;
- height: 18px;
- }
-
- #Dashboard:hover ul {
- background: #f1f0eb;
- border-color: #a9a399;
- }
-
- #Dashboard > ul > li {
- float: left;
- text-align: center;
- margin: 0 15px;
- }
-
- #Dashboard a {
- color: #444;
- text-decoration: none;
- font-weight: normal;
- display: inline-block;
- margin: 0 -15px;
- }
-
- #Dashboard > ul > li:hover, #Dashboard > ul > li:hover a,
- #Dashboard > ul > li.sfHover, #Dashboard > ul > li.sfHover a {
- color: #e87500;
- }
-
- #Dashboard > ul > li.sfHover, #Dashboard > ul > li.sfHover a {
- font-weight: bold;
- }
-
- #Dashboard, #periodString, #dashboardSettings {
- float: left;
- clear: none;
- position: relative;
- margin-left: 0;
- margin-right: 10px;
- }
-
- .jqplock-seriespicker-popover {
- top: 0;
- }
-
- #ajaxLoading {
- margin: 40px 0 -30px 0;
- }
-
- </style>
</head>
<body>
--
GitLab