Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas ZILLIOX <thomas@zilliox.me>2013-05-08 20:42:09 +0400
committerThomas ZILLIOX <thomas@zilliox.me>2013-05-08 20:42:09 +0400
commitb830387b839f6a1732d310e26fa81de27e19ff95 (patch)
treea6cf18412a42b0db34b9941de89724bb2f7dadd9 /plugins/Overlay
parenteeb6be9d1e4bb54a05b78537a080622dc764e72e (diff)
Reorganizing the stylesheets & javascripts folders for every plugins
Diffstat (limited to 'plugins/Overlay')
-rw-r--r--plugins/Overlay/Overlay.php4
-rw-r--r--plugins/Overlay/javascripts/Overlay_Helper.js (renamed from plugins/Overlay/templates/helper.js)0
-rw-r--r--plugins/Overlay/javascripts/Piwik_Overlay.js (renamed from plugins/Overlay/templates/index.js)0
-rw-r--r--plugins/Overlay/javascripts/rowaction.js (renamed from plugins/Overlay/templates/rowaction.js)0
-rw-r--r--plugins/Overlay/stylesheets/overlay.css (renamed from plugins/Overlay/templates/index.css)8
-rw-r--r--plugins/Overlay/templates/index.twig4
-rw-r--r--plugins/Overlay/templates/sidebar.twig2
7 files changed, 9 insertions, 9 deletions
diff --git a/plugins/Overlay/Overlay.php b/plugins/Overlay/Overlay.php
index b7bf6c3da4..abf8faaf96 100644
--- a/plugins/Overlay/Overlay.php
+++ b/plugins/Overlay/Overlay.php
@@ -31,8 +31,8 @@ class Piwik_Overlay extends Piwik_Plugin
public function getJsFiles($notification)
{
$jsFiles = & $notification->getNotificationObject();
- $jsFiles[] = 'plugins/Overlay/templates/rowaction.js';
- $jsFiles[] = 'plugins/Overlay/templates/helper.js';
+ $jsFiles[] = 'plugins/Overlay/javascripts/rowaction.js';
+ $jsFiles[] = 'plugins/Overlay/javascripts/Overlay_Helper.js';
}
}
diff --git a/plugins/Overlay/templates/helper.js b/plugins/Overlay/javascripts/Overlay_Helper.js
index 1342bf79f0..1342bf79f0 100644
--- a/plugins/Overlay/templates/helper.js
+++ b/plugins/Overlay/javascripts/Overlay_Helper.js
diff --git a/plugins/Overlay/templates/index.js b/plugins/Overlay/javascripts/Piwik_Overlay.js
index 0caaefe559..0caaefe559 100644
--- a/plugins/Overlay/templates/index.js
+++ b/plugins/Overlay/javascripts/Piwik_Overlay.js
diff --git a/plugins/Overlay/templates/rowaction.js b/plugins/Overlay/javascripts/rowaction.js
index caa1f10a8b..caa1f10a8b 100644
--- a/plugins/Overlay/templates/rowaction.js
+++ b/plugins/Overlay/javascripts/rowaction.js
diff --git a/plugins/Overlay/templates/index.css b/plugins/Overlay/stylesheets/overlay.css
index bf389d16f3..41f2a433e5 100644
--- a/plugins/Overlay/templates/index.css
+++ b/plugins/Overlay/stylesheets/overlay.css
@@ -37,7 +37,7 @@ a#Overlay_Title {
#Overlay_DateRangeSelection {
padding: 30px 0 20px 23px;
- background: url(../../../plugins/Zeitgeist/images/icon-calendar.gif) 2px 33px no-repeat;
+ background: url(../../Zeitgeist/images/icon-calendar.gif) 2px 33px no-repeat;
margin-left: 5px;
}
@@ -49,7 +49,7 @@ a#Overlay_Title {
}
#Overlay_Loading {
- background: url(../../../plugins/Zeitgeist/images/loading-blue.gif) no-repeat center 10px;
+ background: url(../../Zeitgeist/images/loading-blue.gif) no-repeat center 10px;
width: 190px;
padding-top: 30px;
margin-top: 30px;
@@ -83,7 +83,7 @@ a#Overlay_Transitions {
a#Overlay_RowEvolution {
margin-top: 20px;
- background: url(../../../plugins/Zeitgeist/images/row_evolution_hover.png) no-repeat 0 7px;
+ background: url(../../Zeitgeist/images/row_evolution_hover.png) no-repeat 0 7px;
}
a#Overlay_Transitions {
@@ -92,7 +92,7 @@ a#Overlay_Transitions {
a#Overlay_FullScreen {
margin-top: 20px;
- background: url(../../../plugins/Zeitgeist/images/fullscreen.png) no-repeat 3px 8px;
+ background: url(../../Zeitgeist/images/fullscreen.png) no-repeat 3px 8px;
}
a#Overlay_FullScreen:hover,
diff --git a/plugins/Overlay/templates/index.twig b/plugins/Overlay/templates/index.twig
index 4b806478cb..3fe9b66b61 100644
--- a/plugins/Overlay/templates/index.twig
+++ b/plugins/Overlay/templates/index.twig
@@ -2,8 +2,8 @@
{% 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" />
+ <script type="text/javascript" src="plugins/Overlay/javascripts/Piwik_Overlay.js"></script>
+ <link rel="stylesheet" type="text/css" href="plugins/Overlay/templates/overlay.css" />
{% endblock %}
{% block content %}
diff --git a/plugins/Overlay/templates/sidebar.twig b/plugins/Overlay/templates/sidebar.twig
index 3e23ca50a6..3ff6ee50a8 100644
--- a/plugins/Overlay/templates/sidebar.twig
+++ b/plugins/Overlay/templates/sidebar.twig
@@ -16,7 +16,7 @@
</div>
{% endfor %}
{% else %}
- <!-- note: the class Overlay_NoData is used in index.js -->
+ <!-- note: the class Overlay_NoData is used in Piwik_Overlay.js -->
<div class="Overlay_NoData">{{ 'Overlay_NoData'|translate }}</div>
{% endif %}
</div> \ No newline at end of file