update Piwik to version 2.16 (fixes #91)

www/analytics/plugins/Widgetize/Controller.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@@ -22,43 +22,33 @@ class Controller extends \Piwik\Plugin\Controller
     public function index()
     {
         $view = new View('@Widgetize/index');
-        $view->availableWidgets = Common::json_encode(WidgetsList::get());
+        $view->availableWidgets = json_encode(WidgetsList::get());
         $this->setGeneralVariablesView($view);
         return $view->render();
     }
 
-    public function testJsInclude1()
-    {
-        $view = new View('@Widgetize/testJsInclude1');
-        $view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=UserSettings&actionToWidgetize=getBrowser&idSite=1&period=day&date=yesterday';
-        $view->url2 = '?module=Widgetize&action=js&moduleToWidgetize=API&actionToWidgetize=index&method=ExamplePlugin.getGoldenRatio&format=original';
-        return $view->render();
-    }
-
-    public function testJsInclude2()
-    {
-        $view = new View('@Widgetize/testJsInclude2');
-        $view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=UserSettings&actionToWidgetize=getBrowser&idSite=1&period=day&date=yesterday';
-        $view->url2 = '?module=Widgetize&action=js&moduleToWidgetize=UserCountry&actionToWidgetize=getCountry&idSite=1&period=day&date=yesterday&viewDataTable=cloud&show_footer=0';
-        $view->url3 = '?module=Widgetize&action=js&moduleToWidgetize=Referrers&actionToWidgetize=getKeywords&idSite=1&period=day&date=yesterday&viewDataTable=table&show_footer=0';
-        return $view->render();
-    }
-
     public function iframe()
     {
         Request::reloadAuthUsingTokenAuth();
         $this->init();
+
         $controllerName = Common::getRequestVar('moduleToWidgetize');
-        $actionName = Common::getRequestVar('actionToWidgetize');
-        $outputDataTable = FrontController::getInstance()->fetchDispatch($controllerName, $actionName);
+        $actionName     = Common::getRequestVar('actionToWidgetize');
+
+        if($controllerName == 'API') {
+            throw new \Exception("Widgetizing API requests is not supported for security reasons. Please change query parameter 'moduleToWidgetize'.");
+        }
+
         if ($controllerName == 'Dashboard' && $actionName == 'index') {
             $view = new View('@Widgetize/iframe_empty');
         } else {
             $view = new View('@Widgetize/iframe');
         }
+
         $this->setGeneralVariablesView($view);
         $view->setXFrameOptions('allow');
-        $view->content = $outputDataTable;
+        $view->content = FrontController::getInstance()->fetchDispatch($controllerName, $actionName);
+
         return $view->render();
     }
 }

www/analytics/plugins/Widgetize/Menu.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Widgetize;
+
+use Piwik\Menu\MenuUser;
+use Piwik\Piwik;
+
+class Menu extends \Piwik\Plugin\Menu
+{
+    public function configureUserMenu(MenuUser $menu)
+    {
+        $tooltip   = Piwik::translate('Widgetize_TopLinkTooltip');
+        $urlParams = $this->urlForAction('index', array('segment' => false));
+
+        $menu->addPlatformItem('General_Widgets', $urlParams, 5, $tooltip);
+    }
+
+}

www/analytics/plugins/Widgetize/Widgetize.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@@ -9,40 +9,28 @@
  */
 
 namespace Piwik\Plugins\Widgetize;
-use Piwik\Menu\MenuTop;
-use Piwik\Piwik;
 
-/**
- *
- */
 class Widgetize extends \Piwik\Plugin
 {
     /**
-     * @see Piwik\Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::registerEvents
      */
-    public function getListHooksRegistered()
+    public function registerEvents()
     {
         return array(
             'AssetManager.getJavaScriptFiles'        => 'getJsFiles',
             'AssetManager.getStylesheetFiles'        => 'getStylesheetFiles',
-            'Menu.Top.addItems'                      => 'addTopMenu',
             'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys'
         );
     }
 
-    public function addTopMenu()
-    {
-        $tooltip = Piwik::translate('Widgetize_TopLinkTooltip');
-        $urlParams = array('module' => 'Widgetize', 'action' => 'index', 'segment' => false);
-
-        MenuTop::addEntry('General_Widgets', $urlParams, true, 5, $isHTML = false, $tooltip);
-    }
-
     public function getJsFiles(&$jsFiles)
     {
         $jsFiles[] = "libs/jquery/jquery.truncate.js";
-        $jsFiles[] = "libs/jquery/jquery.scrollTo.js";
-        $jsFiles[] = "plugins/Zeitgeist/javascripts/piwikHelper.js";
+        $jsFiles[] = "libs/bower_components/jquery.scrollTo/jquery.scrollTo.min.js";
+        $jsFiles[] = "plugins/Morpheus/javascripts/piwikHelper.js";
+        $jsFiles[] = "plugins/Morpheus/javascripts/jquery.icheck.min.js";
+        $jsFiles[] = "plugins/Morpheus/javascripts/morpheus.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/dataTable.js";
         $jsFiles[] = "plugins/Dashboard/javascripts/widgetMenu.js";
         $jsFiles[] = "plugins/Widgetize/javascripts/widgetize.js";

www/analytics/plugins/Widgetize/javascripts/widgetize.js

@@ -1,5 +1,5 @@
 /*!
- * Piwik - Web Analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@@ -64,7 +64,7 @@ function widgetize() {
                 '</span>' +
                 '</div>' +
                 '<div> <label for="embedThisWidgetDirectLink">&rsaquo; Direct Link</label>' +
-                '<span id="embedThisWidgetDirectLink"> ' + self.getInputFormWithHtml('directLinkEmbed', urlIframe) + ' - <a href="' + urlIframe + '" target="_blank">' + _pk_translate('Widgetize_OpenInNewWindow') + '</a></span>'
+                '<span id="embedThisWidgetDirectLink"> ' + self.getInputFormWithHtml('directLinkEmbed', urlIframe) + ' - <a href="' + urlIframe + '" rel="noreferrer"  target="_blank">' + _pk_translate('Widgetize_OpenInNewWindow') + '</a></span>'
                 + '</div>'
         );
 

www/analytics/plugins/Widgetize/lang/ar.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "فتح في نافذة جديدة"
+    }
+}

www/analytics/plugins/Widgetize/lang/be.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Адкрыць у новым акне"
+    }
+}

www/analytics/plugins/Widgetize/lang/bg.json

@@ -0,0 +1,6 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Отвори в нов прозорец",
+        "TopLinkTooltip": "Запазете Piwik докладите като джаджи и вградете таблото във вашето приложение като iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/bn.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "নতুন উইন্ডোতে খুলুন"
+    }
+}

www/analytics/plugins/Widgetize/lang/bs.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Otvori u novom prozoru"
+    }
+}

www/analytics/plugins/Widgetize/lang/ca.json

@@ -0,0 +1,6 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Obrir en una nova finestra",
+        "TopLinkTooltip": "Exporteu informes i ginys de Piwik i incrusteu el Tauler de Control a la vostra aplicació com un iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/cs.json

@@ -0,0 +1,7 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Otevřít nové okno",
+        "PluginDescription": "Zobrazte jakékoliv hlášení z Piwiku na vašich stránkách pomocí jednoduchého vkládacího HTML tagu.",
+        "TopLinkTooltip": "Exportujte své Piwik hlášení jako widgety a použijte eje e vaší aplikaci jako iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/cy.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Agor mewn ffenestr newydd"
+    }
+}

www/analytics/plugins/Widgetize/lang/da.json

@@ -0,0 +1,7 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Åben i et nyt vindue",
+        "PluginDescription": "Viser alle Piwik rapport på webstedet eller app med et simpel indlejrings HTML-tag.",
+        "TopLinkTooltip": "Eksporter Piwik rapporter som moduler og indlejre dit kontrolpanel i din applikation som en iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/de.json

@@ -0,0 +1,7 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "In neuem Fenster öffnen",
+        "PluginDescription": "Zeigt sämtliche Piwik Berichte in Ihrer Website oder App mit einem einfachen Embed HTML tag an.",
+        "TopLinkTooltip": "Exportieren Sie Berichte als Widgets und binden Sie das Dashboard in Ihrer Applikation als iframe ein."
+    }
+}

www/analytics/plugins/Widgetize/lang/el.json

@@ -0,0 +1,7 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Άνοιγμα σε νέο παράθυρο",
+        "PluginDescription": "Εμφάνιση οποιασδήποτε αναφοράς του Piwik στον ιστοτόπο ή την εφαρμογή σας με μια απλή σήμανση ενσωμάτωσης σε HTML.",
+        "TopLinkTooltip": "Εξαγωγή Αναφορών Piwik ως Μικροεφαρμογές και ενσωμάτωσή του Κεντρικού Πίνακα στην εφαρμογή σας ως πλαίσιο."
+    }
+}

www/analytics/plugins/Widgetize/lang/en.json

@@ -0,0 +1,7 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Open in a new window",
+        "PluginDescription": "Display any Piwik report in your website or app with a simple Embed HTML tag.",
+        "TopLinkTooltip": "Export Piwik Reports as Widgets and embed the Dashboard in your app as an iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/es.json

@@ -0,0 +1,7 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Abrir en una nueva ventana",
+        "PluginDescription": "Mostrar un informe Piwik en su sitio de internet o aplicación con una simple etiqueta HTML incrustada.",
+        "TopLinkTooltip": "Exportar los informes de Piwik como una aplicación (widget) e incrustar el panel en su aplicación como un elemento iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/et.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Ava uues aknas"
+    }
+}

www/analytics/plugins/Widgetize/lang/fa.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "باز کردن در یک پنجره جدید"
+    }
+}

www/analytics/plugins/Widgetize/lang/fi.json

@@ -0,0 +1,6 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Avaa uudessa ikkunassa",
+        "TopLinkTooltip": "Vie Piwikin raportteja vimpaimiksi ja lisää työpöytä ohjelmaan iframena."
+    }
+}

www/analytics/plugins/Widgetize/lang/fr.json

@@ -0,0 +1,7 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Ouvrir dans une nouvelle fenêtre",
+        "PluginDescription": "Affichez n'importe quel rapport Piwik sur votre site web avec une simple balise HTML.",
+        "TopLinkTooltip": "Exporter les rapports Piwik en tant que gadget et incorporer le tableau de bord dans votre application en tant qu'iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/gl.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Abrir en nova Xanela"
+    }
+}

www/analytics/plugins/Widgetize/lang/he.json

@@ -0,0 +1,6 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "פתיחה בחלון חדש",
+        "TopLinkTooltip": "ייצוא דוחות Piwik כוידג׳טים והטמעת לוח הבקרה באפליקציה שלך כ-iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/hi.json

@@ -0,0 +1,7 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "एक नई विंडो में खोलें",
+        "PluginDescription": "एक साधारण एम्बेड HTML टैग के साथ अपनी वेबसाइट या अनुप्रयोग में किसी भी Piwik रिपोर्ट प्रदर्शित करें।",
+        "TopLinkTooltip": "निर्यात Piwik विजेट के रूप में रिपोर्ट और एक iframe के रूप में अपने एप्लिकेशन में डैशबोर्ड एम्बेड।"
+    }
+}

www/analytics/plugins/Widgetize/lang/hr.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Otvori u novom prozoru"
+    }
+}

www/analytics/plugins/Widgetize/lang/hu.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Megnyitás új ablakban"
+    }
+}

www/analytics/plugins/Widgetize/lang/id.json

@@ -0,0 +1,6 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Buka di jendela baru",
+        "TopLinkTooltip": "Ekspor Laporan Piwik sebagai gawit dan sematkan dalam Penel Kendali di aplikasi Anda sebagai binkai pendam."
+    }
+}

www/analytics/plugins/Widgetize/lang/is.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Opna í nýjum glugga"
+    }
+}

www/analytics/plugins/Widgetize/lang/it.json

@@ -0,0 +1,7 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Apri in una nuova finestra",
+        "PluginDescription": "Mostra ogni report di Piwik nel tuo sito o nell'app con un semplice tag HTML.",
+        "TopLinkTooltip": "Esporta i Reports di Piwik come Widgets e includi la Dashboard nella tua app come iFrame."
+    }
+}

www/analytics/plugins/Widgetize/lang/ja.json

@@ -0,0 +1,7 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "新しいウィンドウで開く",
+        "PluginDescription": "単純な埋め込み HTML タグを使用して Web サイトやアプリで任意の Piwik のレポートを表示します。",
+        "TopLinkTooltip": "Piwik レポートをウィジェットとしてエクスポートし、ダッシュボードを iframe としてご利用のアプリケーションに埋め込んでください。"
+    }
+}

www/analytics/plugins/Widgetize/lang/ka.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "ახალ ფანჯარაში გახსნა"
+    }
+}

www/analytics/plugins/Widgetize/lang/ko.json

@@ -0,0 +1,6 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "새 창에서 열기",
+        "TopLinkTooltip": "Piwik 보고서를 위젯으로 내보내고 당신의 애플리케이션 대시보드에 IFRAME으로 삽입할 수 있습니다."
+    }
+}

www/analytics/plugins/Widgetize/lang/lt.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Atidaryti naujame lange"
+    }
+}

www/analytics/plugins/Widgetize/lang/lv.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Atvērt jaunā logā"
+    }
+}

www/analytics/plugins/Widgetize/lang/nb.json

@@ -0,0 +1,7 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Åpne i nytt vindu",
+        "PluginDescription": "Vis alle Piwik-rapporter du vil på ditt nettsted eller i din app med en enkel embed HTML-tagg.",
+        "TopLinkTooltip": "Eksporter Piwik-rapporter som widgeter og bygg dem inn kontrollpanelet i din app som en iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/nl.json

@@ -0,0 +1,7 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Open in een nieuw venster",
+        "PluginDescription": "Toon elk Piwik rapport in je website of app eenvoudig met een Embed HTML tag.",
+        "TopLinkTooltip": "Export Piwik Rapporten als Widgets en voeg het dashboard toe in je app als een iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/nn.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Opne i nytt vindage"
+    }
+}

www/analytics/plugins/Widgetize/lang/pl.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Otwórz w nowym oknie"
+    }
+}

www/analytics/plugins/Widgetize/lang/pt-br.json

@@ -0,0 +1,7 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Abrir em uma nova janela",
+        "PluginDescription": "Exibe qualquer relatório Piwik no seu site ou aplicativo com uma simples tag HTML Embed.",
+        "TopLinkTooltip": "Exportar relatórios Piwik como widgets do Dashboard e incorporar em seu aplicativo como um iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/pt.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Abrir em nova janela"
+    }
+}

www/analytics/plugins/Widgetize/lang/ro.json

@@ -0,0 +1,6 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Deschide intr-o fereastra noua",
+        "TopLinkTooltip": "Exporta Rapoarte Piwik ca Widgets și încorporeaza tabloul de bord în aplicația ca un iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/ru.json

@@ -0,0 +1,7 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Открыть в новом окне",
+        "PluginDescription": "Показать отчёт Piwik на вебсайте или в приложении с помощью простого встраиваемого HTML тега.",
+        "TopLinkTooltip": "Экспортируйте аналитику Piwik в виде виджетов и установите их на своем сайте или веб-сервисе как iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/sk.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Otvoriť v novom okne"
+    }
+}

www/analytics/plugins/Widgetize/lang/sl.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Odpri v novem oknu"
+    }
+}

www/analytics/plugins/Widgetize/lang/sq.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Hape në dritare të re"
+    }
+}

www/analytics/plugins/Widgetize/lang/sr.json

@@ -0,0 +1,7 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Otvori u novom prozoru",
+        "PluginDescription": "Prikaz bilo kog Piwik izveštaja na vašem sajtu pomoću jednostavnog HTML taga.",
+        "TopLinkTooltip": "Prikaži Piwik izveštaje kao vidžete i ugradi konzolu u svoju aplikaciju kao iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/sv.json

@@ -0,0 +1,6 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Öppna i ett nytt fönster",
+        "TopLinkTooltip": "Exportera rapporter från Piwik som Widgets och bädda in instrumentpanelen i din app som en iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/th.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "เปิดในหน้าต่างใหม่"
+    }
+}

www/analytics/plugins/Widgetize/lang/tl.json

@@ -0,0 +1,6 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Bukas sa isang bagong window",
+        "TopLinkTooltip": "i-export ang ulat ng Piwik bilang isang Widget at ilagay sa Dashboard ng iyong app bilang iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/tr.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Yeni pencerede aç"
+    }
+}

www/analytics/plugins/Widgetize/lang/uk.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Відкрити нове вікно"
+    }
+}

www/analytics/plugins/Widgetize/lang/vi.json

@@ -0,0 +1,6 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Mở trong một cửa sổ mới",
+        "TopLinkTooltip": "Xuất các báo cáo Piwik như các Widget và nhúng Bảng điều khiển trong ứng dụng của bạn như một iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/zh-cn.json

@@ -0,0 +1,6 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "打开一个新窗口",
+        "TopLinkTooltip": "小工具形式导出 Piwik 报表，将面板以 iframe 形式嵌入您的应用程序中。"
+    }
+}

www/analytics/plugins/Widgetize/lang/zh-tw.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "TopLinkTooltip": "將 Piwik 報表匯出為組件，並於你的 APP 中以 iframe 嵌入展示板。"
+    }
+}

www/analytics/plugins/Widgetize/stylesheets/widgetize.less

@@ -1,11 +1,15 @@
 .widgetize {
     width: 100%;
-    padding: 15px 15px 0 15px;
     font-size: 13px;
-}
 
-.widgetize p {
-    padding: 0 0 20px 0;
+  .top_controls {
+    padding-bottom: 16px;
+    margin-top: 16px;
+  }
+
+  #widgetPreview {
+    margin-top: 16px;
+  }
 }
 
 .widgetize .formEmbedCode {
@@ -17,7 +21,7 @@
 }
 
 .widgetize label {
-    color: #666666;
+    color: @theme-color-text-lighter;
     line-height: 18px;
     margin-right: 5px;
     font-weight: bold;
@@ -28,4 +32,8 @@
 #embedThisWidgetFlash,
 #embedThisWidgetEverywhere {
     margin-top: 5px;
-}
+}
+
+body>.widget {
+  margin: 10px 7px;
+}

www/analytics/plugins/Widgetize/templates/iframe.twig

@@ -1,20 +1,22 @@
 <!DOCTYPE html>
-<!--[if lt IE 9 ]>
-<html class="old-ie" id="ng-app" ng-app="piwikApp"> <![endif]-->
-<!--[if (gte IE 9)|!(IE)]><!-->
-<html id="ng-app" ng-app="piwikApp"><!--<![endif]-->
+<html id="ng-app" ng-app="piwikApp">
     <head>
         <meta charset="utf-8">
+        <meta name="robots" content="noindex,nofollow">
         {% include "_jsGlobalVariables.twig" %}
         <!--[if lt IE 9]>
         <script language="javascript" type="text/javascript" src="libs/jqplot/excanvas.min.js"></script>
         <![endif]-->
         {% include "_jsCssIncludes.twig" %}
         <!--[if IE]>
-        <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/ieonly.css"/>
+        <link rel="stylesheet" type="text/css" href="plugins/Morpheus/stylesheets/ieonly.css"/>
         <![endif]-->
     </head>
+    <!--[if lt IE 9 ]>
+    <body ng-app="app" class="old-ie"> <![endif]-->
+    <!--[if (gte IE 9)|!(IE)]><!-->
     <body ng-app="app">
+    <![endif]-->
         <div class="widget">
             {{ content|raw }}
         </div>

www/analytics/plugins/Widgetize/templates/index.twig

@@ -1,13 +1,15 @@
-{% extends 'dashboard.twig' %}
+{% extends 'user.twig' %}
+
+{% set title %}{{ 'General_Widgets'|translate }}{% endset %}
+
+{% block topcontrols %}
+    {% include "@CoreHome/_siteSelectHeader.twig" %}
+    {% include "@CoreHome/_periodSelect.twig" %}
+{% endblock %}
 
 {% block content %}
 
-
-<div class="pageWrap">
-    <div class="top_controls">
-        {% include "@CoreHome/_siteSelectHeader.twig" %}
-        {% include "@CoreHome/_periodSelect.twig" %}
-    </div>
+<div>
 
     <script type="text/javascript">
     $(function () {
@@ -31,32 +33,34 @@
     });
 </script>
 
+<h2 piwik-enriched-headline>{{ title }}</h2>
 
 <div class="widgetize">
     <p>With Piwik, you can export your Web Analytics reports on your blog, website, or intranet dashboard... in one click.
 
+    <h2 class="secondary">Authentication</h2>
     <p>
-        <strong>&rsaquo; Widget authentication:</strong> If you want your widgets to be viewable by everybody, you first have to set the 'view' permissions
-        to the anonymous user in the <a href='index.php?module=UsersManager' target='_blank'>Users Management section</a>.
+        If you want your widgets to be viewable by everybody, you first have to set the 'view' permissions
+        to the anonymous user in the <a href='index.php?module=UsersManager' rel='noreferrer' target='_blank'>Users Management section</a>.
         <br/>Alternatively, if you are publishing widgets on a password protected or private page,
         you don't necessarily have to allow 'anonymous' to view your reports. In this case, you can add the secret token_auth parameter (found in the
-        <a href='{{ linkTo({'module':'API','action':'listAllAPI'}) }}' target='_blank'>API page</a>) in the widget URL.
+        <a href='{{ linkTo({'module':'API','action':'listAllAPI'}) }}' rel='noreferrer' target='_blank'>API page</a>) in the widget URL.
     </p>
 
-    <p><strong>&rsaquo; Widgetize the full dashboard:</strong> You can also display the full Piwik dashboard in your application or website in an IFRAME
-        (<a href='' target='_blank' id='linkDashboardUrl'>see example</a>).
+    <h2>Widgetize dashboards</h2>
+    <p>You can also display the full Piwik dashboard in your application or website in an IFRAME
+        (<a href='' rel='noreferrer' target='_blank' id='linkDashboardUrl'>see example</a>).
         The date parameter can be set to a specific calendar date, "today", or "yesterday". The period parameter can be set to "day", "week", "month", or
         "year".
         The language parameter can be set to the language code of a translation, such as language=fr.
         For example, for idSite=1 and date=yesterday, you can write: <span id='exportFullDashboard'></span>
-    </p>
-
-    <p>
-        <strong>&rsaquo; Widgetize the all websites dashboard in an IFRAME</strong> (<a href='' target='_blank' id='linkAllWebsitesDashboardUrl'>see example</a>)
+        <br />
+        You can also widgetize the all websites dashboard in an IFRAME (<a href='' rel='noreferrer' target='_blank' id='linkAllWebsitesDashboardUrl'>see example</a>)
         <span id='exportAllWebsitesDashboard'></span>
     </p>
 
-    <p><strong>&rsaquo; Select a report, and copy paste in your page the embed code below the widget:</strong>
+    <h2>Widgetize reports</h2>
+    <p>Select a report, and copy paste in your page the embed code below the widget:
 
     <div id="widgetPreview"></div>
 

www/analytics/plugins/Widgetize/templates/testJsInclude1.twig

@@ -1,22 +0,0 @@
-<html>
-<body>
-<p>This text is after the JS INCLUDE</p>
-
-
-<h2>Test tag cloud in a JS include</h2>
-
-<div style="width:500px;">
-    <script type="text/javascript" src="{{ url1 }}"></script>
-    <noscript>Powered by <a href="http://piwik.org">Piwik</a></noscript>
-</div>
-
-<p>This text is after the JS INCLUDE</p>
-
-<h2>Test calling the API in Javascript</h2>
-
-<p>using a javascript include. This is a dirty way (much better to ajax call the API!) but an interesting show case.</P>
-<script type="text/javascript" src="{{ url2 }}"></script>
-<noscript>Powered by <a href="http://piwik.org">Piwik</a></noscript>
-<p>This text is after the JS INCLUDE 2</p>
-</body>
-</html>

www/analytics/plugins/Widgetize/templates/testJsInclude2.twig

@@ -1,27 +0,0 @@
-<html>
-<body>
-<p>This text is after the JS INCLUDE</p>
-
-<h2>Test table in a JS include</h2>
-
-<script type="text/javascript" src="{{ url1 }}"></script>
-<noscript>Powered by <a href="http://piwik.org">Piwik</a></noscript>
-
-<p>This text is after the JS INCLUDE</p>
-
-<h2>Test another table in a JS include</h2>
-
-<script type="text/javascript" src="{{ url3 }}"></script>
-<noscript>Powered by <a href="http://piwik.org">Piwik</a></noscript>
-
-<p>This text is after the 2nd JS INCLUDE</p>
-
-<h2>Test tag cloud in a JS include</h2>
-
-<script type="text/javascript" src="{{ url2 }}"></script>
-<noscript>Powered by <a href="http://piwik.org">Piwik</a></noscript>
-
-<p>This text is after the JS INCLUDE</p>
-
-</body>
-</html>