Converted rest of Overlay, added new head block to Zeitgeist which is used in Overlay->index.twig

5 files changed, 91 insertions, 92 deletions

diff --git a/plugins/Overlay/Controller.php b/plugins/Overlay/Controller.php
index 636683fb36..550422c214 100644
--- a/plugins/Overlay/Controller.php
+++ b/plugins/Overlay/Controller.php
@@ -27,8 +27,6 @@ class Piwik_Overlay_Controller extends Piwik_Controller
         $this->setGeneralVariablesView($view);
         $view->showTopMenu = false;
         $view->showSitesSelection = false;
-        $view->addToHead = '<script type="text/javascript" src="plugins/Overlay/templates/index.js"></script>'
-            . '<link rel="stylesheet" type="text/css" href="plugins/Overlay/templates/index.css" />';
 
         $view->idSite = $this->idSite;
         $view->date = Piwik_Common::getRequestVar('date', 'today');
diff --git a/plugins/Overlay/templates/index.tpl b/plugins/Overlay/templates/index.tpl
deleted file mode 100644
index e858aefa29..0000000000
--- a/plugins/Overlay/templates/index.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-{include file="CoreHome/templates/header.tpl"}
-<h1>{'Overlay_Overlay'|translate|escape:'html'}</h1>
-
-<div id="Overlay_DateRangeSelection">
-    <select id="Overlay_DateRangeSelect" name="Overlay_DateRangeSelect">
-        <option value="day;today">{'General_Today'|translate|escape:'html'}</option>
-        <option value="day;yesterday">{'General_Yesterday'|translate|escape:'html'}</option>
-        <option value="week;today">{'General_CurrentWeek'|translate|escape:'html'}</option>
-        <option value="month;today">{'General_CurrentMonth'|translate|escape:'html'}</option>
-        <option value="year;today">{'General_CurrentYear'|translate|escape:'html'}</option>
-    </select>
-</div>
-
-<div id="Overlay_Error_NotLoading">
-    <p>
-        <span>{'Overlay_ErrorNotLoading'|translate|escape:'html'}</span>
-    </p>
-
-    <p>
-        {if $ssl}
-            {'Overlay_ErrorNotLoadingDetailsSSL'|translate|escape:'html'}
-        {else}
-            {'Overlay_ErrorNotLoadingDetails'|translate|escape:'html'}
-        {/if}
-    </p>
-
-    <p>
-        <a href="http://piwik.org/docs/page-overlay/#toc-page-overlay-troubleshooting" target="_blank">
-            {'Overlay_ErrorNotLoadingLink'|translate|escape:'html'}
-        </a>
-    </p>
-</div>
-
-<div id="Overlay_Location">&nbsp;</div>
-
-<div id="Overlay_Loading">{'General_Loading_js'|translate|escape:'html'}</div>
-
-<div id="Overlay_Sidebar"></div>
-
-<a id="Overlay_RowEvolution">{'General_RowEvolutionRowActionTooltipTitle_js'|translate|escape:'html'}</a>
-<a id="Overlay_Transitions">{'General_TransitionsRowActionTooltipTitle_js'|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>
-
-
-<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 = {literal}{{/literal}
-        domain: "{'Overlay_Domain'|translate|escape:'html'}"
-        {literal}}{/literal};
-</script>
-
-
-<!-- close tag opened in header.tpl -->
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/Overlay/templates/index.twig b/plugins/Overlay/templates/index.twig
new file mode 100644
index 0000000000..6a075fcc91
--- /dev/null
+++ b/plugins/Overlay/templates/index.twig
@@ -0,0 +1,69 @@
+{% extends 'dashboard.twig' %}
+
+{% block head %}
+    {{ parent() }}
+    <script type="text/javascript" src="plugins/Overlay/templates/index.js"></script>
+    <link rel="stylesheet" type="text/css" href="plugins/Overlay/templates/index.css" />
+{% endblock %}
+
+{% block content %}
+<h1>{{ 'Overlay_Overlay'|translate }}</h1>
+
+<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>
+
+    <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>
+
+<div id="Overlay_Location">&nbsp;</div>
+
+<div id="Overlay_Loading">{{ 'General_Loading_js'|translate }}</div>
+
+<div id="Overlay_Sidebar"></div>
+
+<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> -->
+
+
+<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 }}');
+
+    Piwik_Overlay_Translations = {
+        domain: "{{ 'Overlay_Domain'|translate }}"
+    };
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/plugins/Overlay/templates/sidebar.tpl b/plugins/Overlay/templates/sidebar.tpl
deleted file mode 100644
index d0e6a040ad..0000000000
--- a/plugins/Overlay/templates/sidebar.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<div> <!-- Wrapper is needed that the html can be jqueryfied -->
-
-    <!-- This div is removed by JS and the content is put in the location div -->
-    <div class="Overlay_Location">
-        <b>{'Overlay_Location'|translate|escape:'html'}:</b>
-		<span data-normalized-url="{$normalizedUrl|escape:'html'}" data-label="{$label|escape:'html'}">
-			{$location|escape:'html'}
-		</span>
-    </div>
-
-    {if count($data)}
-        <h2 class="Overlay_MainMetrics">{'Overlay_MainMetrics'|translate|escape:'html'}</h2>
-        {foreach from=$data item=metric}
-            <div class="Overlay_Metric">
-                <span class="Overlay_MetricValue">{$metric.value}</span> {$metric.name|escape:'html'}
-            </div>
-        {/foreach}
-    {else}
-        <!-- note: the class Overlay_NoData is used in index.js -->
-        <div class="Overlay_NoData">{'Overlay_NoData'|translate|escape:'html'}</div>
-    {/if}
-
-</div>
\ No newline at end of file
diff --git a/plugins/Overlay/templates/sidebar.twig b/plugins/Overlay/templates/sidebar.twig
new file mode 100644
index 0000000000..3e23ca50a6
--- /dev/null
+++ b/plugins/Overlay/templates/sidebar.twig
@@ -0,0 +1,22 @@
+<div> <!-- Wrapper is needed that the html can be jqueryfied -->
+
+    <!-- This div is removed by JS and the content is put in the location div -->
+    <div class="Overlay_Location">
+        <b>{{ 'Overlay_Location'|translate }}:</b>
+		<span data-normalized-url="{{ normalizedUrl }}" data-label="{{ label }}">
+			{{ location }}
+		</span>
+    </div>
+
+    {% if data|length > 0 %}
+        <h2 class="Overlay_MainMetrics">{{ 'Overlay_MainMetrics'|translate }}</h2>
+        {% for metric in data %}
+            <div class="Overlay_Metric">
+                <span class="Overlay_MetricValue">{{ metric.value }}</span> {{ metric.name }}
+            </div>
+        {% endfor %}
+    {% else %}
+        <!-- note: the class Overlay_NoData is used in index.js -->
+        <div class="Overlay_NoData">{{ 'Overlay_NoData'|translate }}</div>
+    {% endif %}
+</div>
\ No newline at end of file