From 8fec7f11f877fac0bb64952b2668364c1ac38cda Mon Sep 17 00:00:00 2001 From: Thomas ZILLIOX Date: Thu, 2 May 2013 19:25:24 +0200 Subject: [PATCH] Reorganizing the Dashboard plugin file --- plugins/Dashboard/Controller.php | 4 +- plugins/Dashboard/Dashboard.php | 10 +- .../{templates => javascripts}/dashboard.js | 12 +- .../dashboardObject.js | 2 +- .../dashboardWidget.js | 0 .../{templates => javascripts}/widgetMenu.js | 0 .../{templates => stylesheets}/dashboard.css | 0 .../templates/{header.twig => _header.twig} | 0 .../Dashboard/templates/embeddedIndex.twig | 130 +++++++++++++++++ plugins/Dashboard/templates/index.twig | 138 ++---------------- plugins/Dashboard/templates/standalone.twig | 18 --- plugins/MultiSites/templates/index.twig | 3 +- plugins/Widgetize/Widgetize.php | 4 +- 13 files changed, 160 insertions(+), 161 deletions(-) rename plugins/Dashboard/{templates => javascripts}/dashboard.js (97%) rename plugins/Dashboard/{templates => javascripts}/dashboardObject.js (99%) rename plugins/Dashboard/{templates => javascripts}/dashboardWidget.js (100%) rename plugins/Dashboard/{templates => javascripts}/widgetMenu.js (100%) rename plugins/Dashboard/{templates => stylesheets}/dashboard.css (100%) rename plugins/Dashboard/templates/{header.twig => _header.twig} (100%) create mode 100644 plugins/Dashboard/templates/embeddedIndex.twig delete mode 100644 plugins/Dashboard/templates/standalone.twig diff --git a/plugins/Dashboard/Controller.php b/plugins/Dashboard/Controller.php index b713a660b78..204cf8714d8 100644 --- a/plugins/Dashboard/Controller.php +++ b/plugins/Dashboard/Controller.php @@ -43,14 +43,14 @@ protected function _getDashboardView($template) public function embeddedIndex() { - $view = $this->_getDashboardView('@Dashboard/index'); + $view = $this->_getDashboardView('@Dashboard/embeddedIndex'); echo $view->render(); } public function index() { - $view = $this->_getDashboardView('@Dashboard/standalone'); + $view = $this->_getDashboardView('@Dashboard/index'); $view->dashboards = array(); if (!Piwik::isUserIsAnonymous()) { $login = Piwik::getCurrentUserLogin(); diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php index f3db9fba6b4..3bee79818df 100644 --- a/plugins/Dashboard/Dashboard.php +++ b/plugins/Dashboard/Dashboard.php @@ -234,11 +234,11 @@ function getJsFiles($notification) { $jsFiles = & $notification->getNotificationObject(); - $jsFiles[] = "plugins/Dashboard/templates/widgetMenu.js"; + $jsFiles[] = "plugins/Dashboard/javascripts/widgetMenu.js"; $jsFiles[] = "libs/javascript/json2.js"; - $jsFiles[] = "plugins/Dashboard/templates/dashboardObject.js"; - $jsFiles[] = "plugins/Dashboard/templates/dashboardWidget.js"; - $jsFiles[] = "plugins/Dashboard/templates/dashboard.js"; + $jsFiles[] = "plugins/Dashboard/javascripts/dashboardObject.js"; + $jsFiles[] = "plugins/Dashboard/javascripts/dashboardWidget.js"; + $jsFiles[] = "plugins/Dashboard/javascripts/dashboard.js"; } /** @@ -249,7 +249,7 @@ function getCssFiles($notification) $cssFiles = & $notification->getNotificationObject(); $cssFiles[] = "plugins/CoreHome/templates/datatable.css"; - $cssFiles[] = "plugins/Dashboard/templates/dashboard.css"; + $cssFiles[] = "plugins/Dashboard/stylesheets/dashboard.css"; } /** diff --git a/plugins/Dashboard/templates/dashboard.js b/plugins/Dashboard/javascripts/dashboard.js similarity index 97% rename from plugins/Dashboard/templates/dashboard.js rename to plugins/Dashboard/javascripts/dashboard.js index c1c6996f936..298298e44ce 100644 --- a/plugins/Dashboard/templates/dashboard.js +++ b/plugins/Dashboard/javascripts/dashboard.js @@ -47,12 +47,12 @@ function initDashboard(dashboardId, dashboardLayout) { widgetsHelper.getAvailableWidgets(); - $('#dashboardWidgetsArea').on('dashboardempty', showEmptyDashboardNotification); - - $('#dashboardWidgetsArea').dashboard({ - idDashboard: dashboardId, - layout: dashboardLayout - }); + $('#dashboardWidgetsArea') + .on('dashboardempty', showEmptyDashboardNotification) + .dashboard({ + idDashboard: dashboardId, + layout: dashboardLayout + }); $('#dashboardSettings').widgetPreview({ isWidgetAvailable: function (widgetUniqueId) { diff --git a/plugins/Dashboard/templates/dashboardObject.js b/plugins/Dashboard/javascripts/dashboardObject.js similarity index 99% rename from plugins/Dashboard/templates/dashboardObject.js rename to plugins/Dashboard/javascripts/dashboardObject.js index 80d74f3e4d7..8863317c9c3 100644 --- a/plugins/Dashboard/templates/dashboardObject.js +++ b/plugins/Dashboard/javascripts/dashboardObject.js @@ -364,7 +364,7 @@ columnNumber = 1; } - // do not try to add widget if given columnnumber is to high + // do not try to add widget if given column number is to high if (columnNumber > $('.col', dashboardElement).length) { return; } diff --git a/plugins/Dashboard/templates/dashboardWidget.js b/plugins/Dashboard/javascripts/dashboardWidget.js similarity index 100% rename from plugins/Dashboard/templates/dashboardWidget.js rename to plugins/Dashboard/javascripts/dashboardWidget.js diff --git a/plugins/Dashboard/templates/widgetMenu.js b/plugins/Dashboard/javascripts/widgetMenu.js similarity index 100% rename from plugins/Dashboard/templates/widgetMenu.js rename to plugins/Dashboard/javascripts/widgetMenu.js diff --git a/plugins/Dashboard/templates/dashboard.css b/plugins/Dashboard/stylesheets/dashboard.css similarity index 100% rename from plugins/Dashboard/templates/dashboard.css rename to plugins/Dashboard/stylesheets/dashboard.css diff --git a/plugins/Dashboard/templates/header.twig b/plugins/Dashboard/templates/_header.twig similarity index 100% rename from plugins/Dashboard/templates/header.twig rename to plugins/Dashboard/templates/_header.twig diff --git a/plugins/Dashboard/templates/embeddedIndex.twig b/plugins/Dashboard/templates/embeddedIndex.twig new file mode 100644 index 00000000000..c5b037b0b8f --- /dev/null +++ b/plugins/Dashboard/templates/embeddedIndex.twig @@ -0,0 +1,130 @@ +{{ loadJavascriptTranslations(['CoreHome','Dashboard'])|raw }} + + +
+
+

{{ 'Dashboard_DeleteWidgetConfirm'|translate }}

+ + +
+ +
+

{{ 'Dashboard_SetAsDefaultWidgetsConfirm'|translate }}

+ {% set resetDashboard %}{{ 'Dashboard_ResetDashboard'|translate }}{% endset %} +
{{ 'Dashboard_SetAsDefaultWidgetsConfirmHelp'|translate(resetDashboard) }}
+ + +
+ +
+

{{ 'Dashboard_ResetDashboardConfirm'|translate }}

+ + +
+ +
+

{{ 'Dashboard_DashboardEmptyNotification'|translate }}

+ + +
+ +
+

{{ 'Dashboard_SelectDashboardLayout'|translate }}

+ +
+ {% for layout in availableLayouts %} +
+ {% for column in layout %} +
+ {% endfor %} +
+ {% endfor %} +
+ +
+ +
+

{{ 'Dashboard_RenameDashboard'|translate }}

+ +
+ +
+ + +
+ + {% if isSuperUser %} +
+

{{ 'Dashboard_CopyDashboardToUser'|translate }}

+ +
+ + + + +
+ + +
+ {% endif %} + +
+

{{ 'Dashboard_CreateNewDashboard'|translate }}

+ +
+
+
+ +
+ + +
+ +
+

{{ 'Dashboard_RemoveDashboardConfirm'|translate('') }}

+ +
{{ 'Dashboard_NotUndo'|translate(resetDashboard) }}
+ + +
+ +
+ {{ 'Dashboard_WidgetsAndDashboard'|translate }} +
    +
  • +
    {{ 'Dashboard_AddAWidget'|translate }} ↓
    +
      +
      • +
    • +
      {{ 'Dashboard_ManageDashboard'|translate }} ↓
      +
        +
      • {{ 'Dashboard_ResetDashboard'|translate }}
        • +
      • {{ 'Dashboard_ChangeDashboardLayout'|translate }}
        • + {% if userLogin and userLogin != 'anonymous' %} +
      • {{ 'Dashboard_RenameDashboard'|translate }}
        • + + {% if isSuperUser %} +
      • {{ 'Dashboard_SetAsDefaultWidgets'|translate }}
        • +
      • {{ 'Dashboard_CopyDashboardToUser'|translate }}
        • + {% endif %} + {% endif %} +
      +
      • + {% if (userLogin and 'anonymous' != userLogin) %} +
    • {{ 'Dashboard_CreateNewDashboard'|translate }}
      • + {% endif %} +
    +
      +
      +
      + +
      + +
      +
      diff --git a/plugins/Dashboard/templates/index.twig b/plugins/Dashboard/templates/index.twig index c5b037b0b8f..e2db5d5f50c 100644 --- a/plugins/Dashboard/templates/index.twig +++ b/plugins/Dashboard/templates/index.twig @@ -1,130 +1,18 @@ -{{ loadJavascriptTranslations(['CoreHome','Dashboard'])|raw }} - - -
      -
      -

      {{ 'Dashboard_DeleteWidgetConfirm'|translate }}

      - - -
      - -
      -

      {{ 'Dashboard_SetAsDefaultWidgetsConfirm'|translate }}

      - {% set resetDashboard %}{{ 'Dashboard_ResetDashboard'|translate }}{% endset %} -
      {{ 'Dashboard_SetAsDefaultWidgetsConfirmHelp'|translate(resetDashboard) }}
      - - -
      - -
      -

      {{ 'Dashboard_ResetDashboardConfirm'|translate }}

      - - -
      - -
      -

      {{ 'Dashboard_DashboardEmptyNotification'|translate }}

      - - -
      - -
      -

      {{ 'Dashboard_SelectDashboardLayout'|translate }}

      - -
      - {% for layout in availableLayouts %} -
      - {% for column in layout %} -
      - {% endfor %} -
      +{% include "@Dashboard/_header.twig" %} + - -
      -

      {{ 'Dashboard_RenameDashboard'|translate }}

      - -
      - -
      - - -
      - - {% if isSuperUser %} -
      -

      {{ 'Dashboard_CopyDashboardToUser'|translate }}

      - -
      - - - - -
      - - -
      - {% endif %} - -
      -

      {{ 'Dashboard_CreateNewDashboard'|translate }}

      - -
      -
      -
      - -
      - - -
      - -
      -

      {{ 'Dashboard_RemoveDashboardConfirm'|translate('') }}

      - -
      {{ 'Dashboard_NotUndo'|translate(resetDashboard) }}
      - - -
      - -
      - {{ 'Dashboard_WidgetsAndDashboard'|translate }} -
        -
      • -
        {{ 'Dashboard_AddAWidget'|translate }} ↓
        -
          -
          • -
        • -
          {{ 'Dashboard_ManageDashboard'|translate }} ↓
          -
            -
          • {{ 'Dashboard_ResetDashboard'|translate }}
            • -
          • {{ 'Dashboard_ChangeDashboardLayout'|translate }}
            • - {% if userLogin and userLogin != 'anonymous' %} -
          • {{ 'Dashboard_RenameDashboard'|translate }}
            • - - {% if isSuperUser %} -
          • {{ 'Dashboard_SetAsDefaultWidgets'|translate }}
            • -
          • {{ 'Dashboard_CopyDashboardToUser'|translate }}
            • - {% endif %} - {% endif %} -
          -
          • - {% if (userLogin and 'anonymous' != userLogin) %} -
        • {{ 'Dashboard_CreateNewDashboard'|translate }}
          • - {% endif %}
        -
          -
          -
          - -
          +{% import 'ajaxMacros.twig' as ajax %} +{{ ajax.loadingDiv }} +{% include "@Dashboard/embeddedIndex.twig" %} + + \ No newline at end of file diff --git a/plugins/Dashboard/templates/standalone.twig b/plugins/Dashboard/templates/standalone.twig deleted file mode 100644 index 0118378d203..00000000000 --- a/plugins/Dashboard/templates/standalone.twig +++ /dev/null @@ -1,18 +0,0 @@ -{% include "@Dashboard/header.twig" %} - -{% import 'ajaxMacros.twig' as ajax %} -{{ ajax.loadingDiv }} -{% include "@Dashboard/index.twig" }} - - \ No newline at end of file diff --git a/plugins/MultiSites/templates/index.twig b/plugins/MultiSites/templates/index.twig index 370aa051765..c520c34cffc 100644 --- a/plugins/MultiSites/templates/index.twig +++ b/plugins/MultiSites/templates/index.twig @@ -1,7 +1,6 @@ {% set showSitesSelection=false %} - {% extends 'dashboard.twig' %} -{% if not isWidgetized %}{% endif %} +{% extends 'dashboard.twig' %} {% block content %}
          diff --git a/plugins/Widgetize/Widgetize.php b/plugins/Widgetize/Widgetize.php index 4de1afe86df..6365d612981 100644 --- a/plugins/Widgetize/Widgetize.php +++ b/plugins/Widgetize/Widgetize.php @@ -55,7 +55,7 @@ function getJsFiles($notification) $jsFiles[] = "libs/jquery/jquery.scrollTo.js"; $jsFiles[] = "themes/default/common.js"; $jsFiles[] = "plugins/CoreHome/templates/datatable.js"; - $jsFiles[] = "plugins/Dashboard/templates/widgetMenu.js"; + $jsFiles[] = "plugins/Dashboard/javascripts/widgetMenu.js"; $jsFiles[] = "plugins/Widgetize/templates/widgetize.js"; } @@ -69,6 +69,6 @@ function getCssFiles($notification) $cssFiles[] = "plugins/CoreHome/templates/styles.css"; $cssFiles[] = "plugins/CoreHome/templates/datatable.css"; $cssFiles[] = "plugins/CoreHome/templates/cloud.css"; - $cssFiles[] = "plugins/Dashboard/templates/dashboard.css"; + $cssFiles[] = "plugins/Dashboard/stylesheets/dashboard.css"; } }