From f98714ec09d7974ca89b2a10435a7758df08f537 Mon Sep 17 00:00:00 2001
From: Thomas ZILLIOX <thomas@zilliox.me>
Date: Thu, 20 Jun 2013 01:15:10 +0200
Subject: [PATCH] Remove styles tags from Overlay plugin
---
.../stylesheets/showErrorWrongDomain.css | 17 +++
plugins/Overlay/templates/index.twig | 100 +++++++++---------
.../templates/showErrorWrongDomain.twig | 22 +---
3 files changed, 68 insertions(+), 71 deletions(-)
create mode 100644 plugins/Overlay/stylesheets/showErrorWrongDomain.css
diff --git a/plugins/Overlay/stylesheets/showErrorWrongDomain.css b/plugins/Overlay/stylesheets/showErrorWrongDomain.css
new file mode 100644
index 0000000000..1d10013852
--- /dev/null
+++ b/plugins/Overlay/stylesheets/showErrorWrongDomain.css
@@ -0,0 +1,17 @@
+body {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 14px;
+ color: black;
+ background: white;
+ margin: 15px;
+ padding: 0;
+}
+
+p {
+ margin: 0 0 10px 0;
+ padding: 0;
+}
+
+a {
+ color: #255792;
+}
\ No newline at end of file
diff --git a/plugins/Overlay/templates/index.twig b/plugins/Overlay/templates/index.twig
index 3fe9b66b61..ebc22374ae 100644
--- a/plugins/Overlay/templates/index.twig
+++ b/plugins/Overlay/templates/index.twig
@@ -3,70 +3,70 @@
{% block head %}
{{ parent() }}
<script type="text/javascript" src="plugins/Overlay/javascripts/Piwik_Overlay.js"></script>
- <link rel="stylesheet" type="text/css" href="plugins/Overlay/templates/overlay.css" />
+ <link rel="stylesheet" type="text/css" href="plugins/Overlay/stylesheets/overlay.css"/>
{% endblock %}
{% block content %}
-<a id="Overlay_Title" href="http://piwik.org/docs/page-overlay/" target="_blank">
- {{ 'Overlay_Overlay'|translate }}
- <img src="plugins/Zeitgeist/images/help.png" alt="Documentation" />
-</a>
+ <a id="Overlay_Title" href="http://piwik.org/docs/page-overlay/" target="_blank">
+ {{ 'Overlay_Overlay'|translate }}
+ <img src="plugins/Zeitgeist/images/help.png" alt="Documentation"/>
+ </a>
-<div id="Overlay_DateRangeSelection">
- <select id="Overlay_DateRangeSelect" name="Overlay_DateRangeSelect">
- <option value="day;today">{{ 'General_Today'|translate }}</option>
- <option value="day;yesterday">{{ 'General_Yesterday'|translate }}</option>
- <option value="week;today">{{ 'General_CurrentWeek'|translate }}</option>
- <option value="month;today">{{ 'General_CurrentMonth'|translate }}</option>
- <option value="year;today">{{ 'General_CurrentYear'|translate }}</option>
- </select>
-</div>
+ <div id="Overlay_DateRangeSelection">
+ <select id="Overlay_DateRangeSelect" name="Overlay_DateRangeSelect">
+ <option value="day;today">{{ 'General_Today'|translate }}</option>
+ <option value="day;yesterday">{{ 'General_Yesterday'|translate }}</option>
+ <option value="week;today">{{ 'General_CurrentWeek'|translate }}</option>
+ <option value="month;today">{{ 'General_CurrentMonth'|translate }}</option>
+ <option value="year;today">{{ 'General_CurrentYear'|translate }}</option>
+ </select>
+ </div>
-<div id="Overlay_Error_NotLoading">
- <p>
- <span>{{ 'Overlay_ErrorNotLoading'|translate }}</span>
- </p>
+ <div id="Overlay_Error_NotLoading">
+ <p>
+ <span>{{ 'Overlay_ErrorNotLoading'|translate }}</span>
+ </p>
- <p>
- {% if ssl %}
- {{ 'Overlay_ErrorNotLoadingDetailsSSL'|translate }}
- {% else %}
- {{ 'Overlay_ErrorNotLoadingDetails'|translate }}
- {% endif %}
- </p>
+ <p>
+ {% if ssl %}
+ {{ 'Overlay_ErrorNotLoadingDetailsSSL'|translate }}
+ {% else %}
+ {{ 'Overlay_ErrorNotLoadingDetails'|translate }}
+ {% endif %}
+ </p>
- <p>
- <a href="http://piwik.org/docs/page-overlay/#toc-page-overlay-troubleshooting" target="_blank">
- {{ 'Overlay_ErrorNotLoadingLink'|translate }}
- </a>
- </p>
-</div>
+ <p>
+ <a href="http://piwik.org/docs/page-overlay/#toc-page-overlay-troubleshooting" target="_blank">
+ {{ 'Overlay_ErrorNotLoadingLink'|translate }}
+ </a>
+ </p>
+ </div>
-<div id="Overlay_Location"> </div>
+ <div id="Overlay_Location"> </div>
-<div id="Overlay_Loading">{{ 'General_Loading_js'|translate }}</div>
+ <div id="Overlay_Loading">{{ 'General_Loading_js'|translate }}</div>
-<div id="Overlay_Sidebar"></div>
+ <div id="Overlay_Sidebar"></div>
-<a id="Overlay_RowEvolution">{{ 'General_RowEvolutionRowActionTooltipTitle_js'|translate }}</a>
-<a id="Overlay_Transitions">{{ 'General_TransitionsRowActionTooltipTitle_js'|translate }}</a>
+ <a id="Overlay_RowEvolution">{{ 'General_RowEvolutionRowActionTooltipTitle_js'|translate }}</a>
+ <a id="Overlay_Transitions">{{ 'General_TransitionsRowActionTooltipTitle_js'|translate }}</a>
-<!-- TODO: rethink the way the sidebar works -->
-<!-- <a id="Overlay_FullScreen" href="#">
- {'Overlay_OpenFullScreen'|translate|escape:'html'}
-</a> -->
+ <!-- TODO: rethink the way the sidebar works -->
+ <!-- <a id="Overlay_FullScreen" href="#">
+ {'Overlay_OpenFullScreen'|translate|escape:'html'}
+ </a> -->
-<div id="Overlay_Main">
- <iframe id="Overlay_Iframe" src="" frameborder="0"></iframe>
-</div>
+ <div id="Overlay_Main">
+ <iframe id="Overlay_Iframe" src="" frameborder="0"></iframe>
+ </div>
-<script type="text/javascript">
- var iframeSrc = 'index.php?module=Overlay&action=startOverlaySession&idsite={{ idSite }}&period={{ period }}&date={{ date }}';
- Piwik_Overlay.init(iframeSrc, '{{ idSite }}', '{{ period }}', '{{ date }}');
+ <script type="text/javascript">
+ var iframeSrc = 'index.php?module=Overlay&action=startOverlaySession&idsite={{ idSite }}&period={{ period }}&date={{ date }}';
+ Piwik_Overlay.init(iframeSrc, '{{ idSite }}', '{{ period }}', '{{ date }}');
- Piwik_Overlay_Translations = {
- domain: "{{ 'Overlay_Domain'|translate }}"
- };
-</script>
+ Piwik_Overlay_Translations = {
+ domain: "{{ 'Overlay_Domain'|translate }}"
+ };
+ </script>
{% endblock %}
diff --git a/plugins/Overlay/templates/showErrorWrongDomain.twig b/plugins/Overlay/templates/showErrorWrongDomain.twig
index ced8a1a57c..1f83c43052 100644
--- a/plugins/Overlay/templates/showErrorWrongDomain.twig
+++ b/plugins/Overlay/templates/showErrorWrongDomain.twig
@@ -5,27 +5,7 @@
<title></title>
<meta name="generator" content="Piwik - Open Source Web Analytics"/>
<link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
-
- <style type="text/css">
- body {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 14px;
- color: black;
- background: white;
- margin: 15px;
- padding: 0;
- }
-
- p {
- margin: 0 0 10px 0;
- padding: 0;
- }
-
- a {
- color: #255792;
- }
- </style>
-
+ <link rel="stylesheet" type="text/css" href="plugins/Overlay/stylesheets/showErrorWrongDomain.css" />
</head>
<body>
<p><strong>{{ message }}</strong></p>
--
GitLab