8 files changed, 62 insertions, 62 deletions

diff --git a/plugins/Transitions/Controller.php b/plugins/Transitions/Controller.php
index 5ef2dc539e..e84e4fc9a3 100644
--- a/plugins/Transitions/Controller.php
+++ b/plugins/Transitions/Controller.php
@@ -74,7 +74,7 @@ class Piwik_Transitions_Controller extends Piwik_Controller
      */
     public function renderPopover()
     {
-        $view = Piwik_View::factory('transitions');
+        $view = new Piwik_View('@Transitions/transitions');
         $view->translations = $this->getTranslations();
         echo $view->render();
     }
diff --git a/plugins/Transitions/Transitions.php b/plugins/Transitions/Transitions.php
index 2c51da023e..b503266fc3 100644
--- a/plugins/Transitions/Transitions.php
+++ b/plugins/Transitions/Transitions.php
@@ -36,13 +36,13 @@ class Piwik_Transitions extends Piwik_Plugin
     public function getCssFiles($notification)
     {
         $cssFiles = & $notification->getNotificationObject();
-        $cssFiles[] = 'plugins/Transitions/templates/transitions.css';
+        $cssFiles[] = 'plugins/Transitions/stylesheets/transitions.css';
     }
 
     public function getJsFiles($notification)
     {
         $jsFiles = & $notification->getNotificationObject();
-        $jsFiles[] = 'plugins/Transitions/templates/transitions.js';
+        $jsFiles[] = 'plugins/Transitions/javascripts/transitions.js';
     }
 
 
diff --git a/plugins/Transitions/templates/transitions_icon.png b/plugins/Transitions/images/transitions_icon.png
index b7f79961f0..b7f79961f0 100755
--- a/plugins/Transitions/templates/transitions_icon.png
+++ b/plugins/Transitions/images/transitions_icon.png
diff --git a/plugins/Transitions/templates/transitions_icon_hover.png b/plugins/Transitions/images/transitions_icon_hover.png
index 380915b9af..380915b9af 100755
--- a/plugins/Transitions/templates/transitions_icon_hover.png
+++ b/plugins/Transitions/images/transitions_icon_hover.png
diff --git a/plugins/Transitions/templates/transitions.js b/plugins/Transitions/javascripts/transitions.js
index dec4442413..14ccd28a19 100644
--- a/plugins/Transitions/templates/transitions.js
+++ b/plugins/Transitions/javascripts/transitions.js
@@ -78,8 +78,8 @@ DataTable_RowActions_Registry.register({
 
     name: 'Transitions',
 
-    dataTableIcon: 'plugins/Transitions/templates/transitions_icon.png',
-    dataTableIconHover: 'plugins/Transitions/templates/transitions_icon_hover.png',
+    dataTableIcon: 'plugins/Transitions/images/transitions_icon.png',
+    dataTableIconHover: 'plugins/Transitions/images/transitions_icon_hover.png',
 
     order: 20,
 
@@ -619,7 +619,7 @@ Piwik_Transitions.prototype.renderClosedGroup = function (groupName, side, onlyB
         boxText: self.model.getGroupTitle(groupName),
         boxTextNumLines: 1,
         boxTextCssClass: 'SingleLine',
-        boxIcon: 'themes/default/images/plus_blue.png',
+        boxIcon: 'plugins/Zeitgeist/images/plus_blue.png',
         smallBox: true,
         onClick: function () {
             self.unHighlightGroup(groupName, side);
diff --git a/plugins/Transitions/templates/transitions.css b/plugins/Transitions/stylesheets/transitions.css
index 6a02d1659f..6a02d1659f 100644
--- a/plugins/Transitions/templates/transitions.css
+++ b/plugins/Transitions/stylesheets/transitions.css
diff --git a/plugins/Transitions/templates/transitions.tpl b/plugins/Transitions/templates/transitions.tpl
deleted file mode 100644
index 9ec71b8fe3..0000000000
--- a/plugins/Transitions/templates/transitions.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-<div id="Transitions_Container">
-    <div id="Transitions_CenterBox" class="Transitions_Text">
-        <h2></h2>
-
-        <div class="Transitions_CenterBoxMetrics">
-            <p class="Transitions_Pageviews Transitions_Margin">{$translations.pageviewsInline|translate}</p>
-
-            <div class="Transitions_IncomingTraffic">
-                <h3>{'Transitions_IncomingTraffic'|translate}</h3>
-
-                <p class="Transitions_PreviousPages">{$translations.fromPreviousPagesInline|translate}</p>
-
-                <p class="Transitions_PreviousSiteSearches">{$translations.fromPreviousSiteSearchesInline|translate}</p>
-
-                <p class="Transitions_SearchEngines">{$translations.fromSearchEnginesInline|translate}</p>
-
-                <p class="Transitions_Websites">{$translations.fromWebsitesInline|translate}</p>
-
-                <p class="Transitions_Campaigns">{$translations.fromCampaignsInline|translate}</p>
-
-                <p class="Transitions_DirectEntries">{$translations.directEntriesInline|translate}</p>
-            </div>
-
-            <div class="Transitions_OutgoingTraffic">
-                <h3>{'Transitions_OutgoingTraffic'|translate}</h3>
-
-                <p class="Transitions_FollowingPages">{$translations.toFollowingPagesInline|translate}</p>
-
-                <p class="Transitions_FollowingSiteSearches">{$translations.toFollowingSiteSearchesInline|translate}</p>
-
-                <p class="Transitions_Downloads">{$translations.downloadsInline|translate}</p>
-
-                <p class="Transitions_Outlinks">{$translations.outlinksInline|translate}</p>
-
-                <p class="Transitions_Exits">{$translations.exitsInline|translate}</p>
-            </div>
-        </div>
-    </div>
-    <div id="Transitions_Loops" class="Transitions_Text">
-        {$translations.loopsInline|translate}
-    </div>
-    <div id="Transitions_Canvas_Background_Left" class="Transitions_Canvas_Container"></div>
-    <div id="Transitions_Canvas_Background_Right" class="Transitions_Canvas_Container"></div>
-    <div id="Transitions_Canvas_Left" class="Transitions_Canvas_Container"></div>
-    <div id="Transitions_Canvas_Right" class="Transitions_Canvas_Container"></div>
-    <div id="Transitions_Canvas_Loops" class="Transitions_Canvas_Container"></div>
-</div>
-
-<script type="text/javascript">
-    var Piwik_Transitions_Translations = {literal}{{/literal}
-        {foreach from=$translations key=internalKey item=translation}
-        "{$internalKey}": "{$translation|escape:'html'}",
-        {/foreach}
-        "": ""
-        {literal}}{/literal};
-</script>
\ No newline at end of file
diff --git a/plugins/Transitions/templates/transitions.twig b/plugins/Transitions/templates/transitions.twig
new file mode 100644
index 0000000000..0a0163d49a
--- /dev/null
+++ b/plugins/Transitions/templates/transitions.twig
@@ -0,0 +1,56 @@
+<div id="Transitions_Container">
+    <div id="Transitions_CenterBox" class="Transitions_Text">
+        <h2></h2>
+
+        <div class="Transitions_CenterBoxMetrics">
+            <p class="Transitions_Pageviews Transitions_Margin">{{ translations.pageviewsInline|translate }}</p>
+
+            <div class="Transitions_IncomingTraffic">
+                <h3>{{ 'Transitions_IncomingTraffic'|translate }}</h3>
+
+                <p class="Transitions_PreviousPages">{{ translations.fromPreviousPagesInline|translate }}</p>
+
+                <p class="Transitions_PreviousSiteSearches">{{ translations.fromPreviousSiteSearchesInline|translate }}</p>
+
+                <p class="Transitions_SearchEngines">{{ translations.fromSearchEnginesInline|translate }}</p>
+
+                <p class="Transitions_Websites">{{ translations.fromWebsitesInline|translate }}</p>
+
+                <p class="Transitions_Campaigns">{{ translations.fromCampaignsInline|translate }}</p>
+
+                <p class="Transitions_DirectEntries">{{ translations.directEntriesInline|translate }}</p>
+            </div>
+
+            <div class="Transitions_OutgoingTraffic">
+                <h3>{{ 'Transitions_OutgoingTraffic'|translate }}</h3>
+
+                <p class="Transitions_FollowingPages">{{ translations.toFollowingPagesInline|translate }}</p>
+
+                <p class="Transitions_FollowingSiteSearches">{{ translations.toFollowingSiteSearchesInline|translate }}</p>
+
+                <p class="Transitions_Downloads">{{ translations.downloadsInline|translate }}</p>
+
+                <p class="Transitions_Outlinks">{{ translations.outlinksInline|translate }}</p>
+
+                <p class="Transitions_Exits">{{ translations.exitsInline|translate }}</p>
+            </div>
+        </div>
+    </div>
+    <div id="Transitions_Loops" class="Transitions_Text">
+        {{ translations.loopsInline|translate }}
+    </div>
+    <div id="Transitions_Canvas_Background_Left" class="Transitions_Canvas_Container"></div>
+    <div id="Transitions_Canvas_Background_Right" class="Transitions_Canvas_Container"></div>
+    <div id="Transitions_Canvas_Left" class="Transitions_Canvas_Container"></div>
+    <div id="Transitions_Canvas_Right" class="Transitions_Canvas_Container"></div>
+    <div id="Transitions_Canvas_Loops" class="Transitions_Canvas_Container"></div>
+</div>
+
+<script type="text/javascript">
+    var Piwik_Transitions_Translations = {
+        {% for internalKey, translation in translations %}
+            "{{ internalKey }}": "{{ translation }}",
+        {% endfor %}
+        "": ""
+    };
+</script>
\ No newline at end of file