From a5533127b5a42bc2bcd580dadf0b8d26e5843199 Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@googlemail.com>
Date: Wed, 12 Mar 2014 02:17:11 +0100
Subject: [PATCH] refs #4691 moved components temporarily into a folder named
angularjs
---
plugins/CoreHome/CoreHome.php | 36 +++++++++----------
.../autocomplete-matched-directive.js | 0
.../common}/directives/directive.js | 0
.../focus-anywhere-but-here-directive.js | 0
.../common}/directives/focusif.js | 0
.../directives/ignore-click-directive.js | 0
.../common}/directives/onenter.js | 0
.../common}/filters/evolution-filter.js | 0
.../common}/filters/filter.js | 0
.../common}/filters/startfrom-filter.js | 0
.../common}/filters/translate-filter.js | 0
.../common}/services/piwik-api-service.js | 0
.../common}/services/piwik-service.js | 0
.../common}/services/service.js | 0
.../{javascripts => angularjs}/piwikApp.js | 0
.../piwikAppConfig.js | 0
.../siteselector/siteselector-controller.js | 0
.../siteselector-controller_test.js | 0
.../siteselector/siteselector-directive.js | 2 +-
.../siteselector/siteselector-model.js | 0
.../siteselector/siteselector.html | 0
.../siteselector/siteselector.less | 0
plugins/MultiSites/MultiSites.php | 12 +++----
.../dashboard/dashboard-controller.js} | 0
.../dashboard/dashboard-directive.js} | 2 +-
.../dashboard/dashboard-filter.js} | 0
.../dashboard/dashboard-model.js} | 0
.../dashboard/dashboard.html} | 0
.../dashboard/dashboard.less} | 0
.../site/site-directive.js} | 2 +-
.../site/site.html} | 0
plugins/SecurityInfo | 2 +-
plugins/TasksTimetable | 2 +-
plugins/TreemapVisualization | 2 +-
plugins/Zeitgeist/stylesheets/base.less | 2 +-
35 files changed, 31 insertions(+), 31 deletions(-)
rename plugins/CoreHome/{javascripts => angularjs/common}/directives/autocomplete-matched-directive.js (100%)
rename plugins/CoreHome/{javascripts => angularjs/common}/directives/directive.js (100%)
rename plugins/CoreHome/{javascripts => angularjs/common}/directives/focus-anywhere-but-here-directive.js (100%)
rename plugins/CoreHome/{javascripts => angularjs/common}/directives/focusif.js (100%)
rename plugins/CoreHome/{javascripts => angularjs/common}/directives/ignore-click-directive.js (100%)
rename plugins/CoreHome/{javascripts => angularjs/common}/directives/onenter.js (100%)
rename plugins/CoreHome/{javascripts => angularjs/common}/filters/evolution-filter.js (100%)
rename plugins/CoreHome/{javascripts => angularjs/common}/filters/filter.js (100%)
rename plugins/CoreHome/{javascripts => angularjs/common}/filters/startfrom-filter.js (100%)
rename plugins/CoreHome/{javascripts => angularjs/common}/filters/translate-filter.js (100%)
rename plugins/CoreHome/{javascripts => angularjs/common}/services/piwik-api-service.js (100%)
rename plugins/CoreHome/{javascripts => angularjs/common}/services/piwik-service.js (100%)
rename plugins/CoreHome/{javascripts => angularjs/common}/services/service.js (100%)
rename plugins/CoreHome/{javascripts => angularjs}/piwikApp.js (100%)
rename plugins/CoreHome/{javascripts => angularjs}/piwikAppConfig.js (100%)
rename plugins/CoreHome/{javascripts => angularjs}/siteselector/siteselector-controller.js (100%)
rename plugins/CoreHome/{javascripts => angularjs}/siteselector/siteselector-controller_test.js (100%)
rename plugins/CoreHome/{javascripts => angularjs}/siteselector/siteselector-directive.js (94%)
rename plugins/CoreHome/{javascripts => angularjs}/siteselector/siteselector-model.js (100%)
rename plugins/CoreHome/{javascripts => angularjs}/siteselector/siteselector.html (100%)
rename plugins/CoreHome/{javascripts => angularjs}/siteselector/siteselector.less (100%)
rename plugins/MultiSites/{javascripts/multisites-dashboard/multisites-dashboard-controller.js => angularjs/dashboard/dashboard-controller.js} (100%)
rename plugins/MultiSites/{javascripts/multisites-dashboard/multisites-dashboard-directive.js => angularjs/dashboard/dashboard-directive.js} (88%)
rename plugins/MultiSites/{javascripts/multisites-dashboard/multisites-dashboard-filter.js => angularjs/dashboard/dashboard-filter.js} (100%)
rename plugins/MultiSites/{javascripts/multisites-dashboard/multisites-dashboard-model.js => angularjs/dashboard/dashboard-model.js} (100%)
rename plugins/MultiSites/{javascripts/multisites-dashboard/multisites-dashboard.html => angularjs/dashboard/dashboard.html} (100%)
rename plugins/MultiSites/{javascripts/multisites-dashboard/multisites-dashboard.less => angularjs/dashboard/dashboard.less} (100%)
rename plugins/MultiSites/{javascripts/multisites-site/multisites-site-directive.js => angularjs/site/site-directive.js} (94%)
rename plugins/MultiSites/{javascripts/multisites-site/multisites-site.html => angularjs/site/site.html} (100%)
diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
index bbc4cd3b01..e80054c04b 100644
--- a/plugins/CoreHome/CoreHome.php
+++ b/plugins/CoreHome/CoreHome.php
@@ -92,29 +92,29 @@ class CoreHome extends \Piwik\Plugin
$jsFiles[] = "plugins/CoreHome/javascripts/notification.js";
$jsFiles[] = "plugins/CoreHome/javascripts/notification_parser.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/piwikAppConfig.js";
+ $jsFiles[] = "plugins/CoreHome/angularjs/piwikAppConfig.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/services/service.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/services/piwik-service.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/services/piwik-api-service.js";
+ $jsFiles[] = "plugins/CoreHome/angularjs/common/services/service.js";
+ $jsFiles[] = "plugins/CoreHome/angularjs/common/services/piwik-service.js";
+ $jsFiles[] = "plugins/CoreHome/angularjs/common/services/piwik-api-service.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/filters/filter.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/filters/translate-filter.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/filters/startfrom-filter.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/filters/evolution-filter.js";
+ $jsFiles[] = "plugins/CoreHome/angularjs/common/filters/filter.js";
+ $jsFiles[] = "plugins/CoreHome/angularjs/common/filters/translate-filter.js";
+ $jsFiles[] = "plugins/CoreHome/angularjs/common/filters/startfrom-filter.js";
+ $jsFiles[] = "plugins/CoreHome/angularjs/common/filters/evolution-filter.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/directives/directive.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/directives/autocomplete-matched-directive.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/directives/focus-anywhere-but-here-directive.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/directives/ignore-click-directive.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/directives/onenter.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/directives/focusif.js";
+ $jsFiles[] = "plugins/CoreHome/angularjs/common/directives/directive.js";
+ $jsFiles[] = "plugins/CoreHome/angularjs/common/directives/autocomplete-matched-directive.js";
+ $jsFiles[] = "plugins/CoreHome/angularjs/common/directives/focus-anywhere-but-here-directive.js";
+ $jsFiles[] = "plugins/CoreHome/angularjs/common/directives/ignore-click-directive.js";
+ $jsFiles[] = "plugins/CoreHome/angularjs/common/directives/onenter.js";
+ $jsFiles[] = "plugins/CoreHome/angularjs/common/directives/focusif.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/piwikApp.js";
+ $jsFiles[] = "plugins/CoreHome/angularjs/piwikApp.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/siteselector/siteselector-model.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/siteselector/siteselector-controller.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/siteselector/siteselector-directive.js";
+ $jsFiles[] = "plugins/CoreHome/angularjs/siteselector/siteselector-model.js";
+ $jsFiles[] = "plugins/CoreHome/angularjs/siteselector/siteselector-controller.js";
+ $jsFiles[] = "plugins/CoreHome/angularjs/siteselector/siteselector-directive.js";
}
public function getClientSideTranslationKeys(&$translationKeys)
diff --git a/plugins/CoreHome/javascripts/directives/autocomplete-matched-directive.js b/plugins/CoreHome/angularjs/common/directives/autocomplete-matched-directive.js
similarity index 100%
rename from plugins/CoreHome/javascripts/directives/autocomplete-matched-directive.js
rename to plugins/CoreHome/angularjs/common/directives/autocomplete-matched-directive.js
diff --git a/plugins/CoreHome/javascripts/directives/directive.js b/plugins/CoreHome/angularjs/common/directives/directive.js
similarity index 100%
rename from plugins/CoreHome/javascripts/directives/directive.js
rename to plugins/CoreHome/angularjs/common/directives/directive.js
diff --git a/plugins/CoreHome/javascripts/directives/focus-anywhere-but-here-directive.js b/plugins/CoreHome/angularjs/common/directives/focus-anywhere-but-here-directive.js
similarity index 100%
rename from plugins/CoreHome/javascripts/directives/focus-anywhere-but-here-directive.js
rename to plugins/CoreHome/angularjs/common/directives/focus-anywhere-but-here-directive.js
diff --git a/plugins/CoreHome/javascripts/directives/focusif.js b/plugins/CoreHome/angularjs/common/directives/focusif.js
similarity index 100%
rename from plugins/CoreHome/javascripts/directives/focusif.js
rename to plugins/CoreHome/angularjs/common/directives/focusif.js
diff --git a/plugins/CoreHome/javascripts/directives/ignore-click-directive.js b/plugins/CoreHome/angularjs/common/directives/ignore-click-directive.js
similarity index 100%
rename from plugins/CoreHome/javascripts/directives/ignore-click-directive.js
rename to plugins/CoreHome/angularjs/common/directives/ignore-click-directive.js
diff --git a/plugins/CoreHome/javascripts/directives/onenter.js b/plugins/CoreHome/angularjs/common/directives/onenter.js
similarity index 100%
rename from plugins/CoreHome/javascripts/directives/onenter.js
rename to plugins/CoreHome/angularjs/common/directives/onenter.js
diff --git a/plugins/CoreHome/javascripts/filters/evolution-filter.js b/plugins/CoreHome/angularjs/common/filters/evolution-filter.js
similarity index 100%
rename from plugins/CoreHome/javascripts/filters/evolution-filter.js
rename to plugins/CoreHome/angularjs/common/filters/evolution-filter.js
diff --git a/plugins/CoreHome/javascripts/filters/filter.js b/plugins/CoreHome/angularjs/common/filters/filter.js
similarity index 100%
rename from plugins/CoreHome/javascripts/filters/filter.js
rename to plugins/CoreHome/angularjs/common/filters/filter.js
diff --git a/plugins/CoreHome/javascripts/filters/startfrom-filter.js b/plugins/CoreHome/angularjs/common/filters/startfrom-filter.js
similarity index 100%
rename from plugins/CoreHome/javascripts/filters/startfrom-filter.js
rename to plugins/CoreHome/angularjs/common/filters/startfrom-filter.js
diff --git a/plugins/CoreHome/javascripts/filters/translate-filter.js b/plugins/CoreHome/angularjs/common/filters/translate-filter.js
similarity index 100%
rename from plugins/CoreHome/javascripts/filters/translate-filter.js
rename to plugins/CoreHome/angularjs/common/filters/translate-filter.js
diff --git a/plugins/CoreHome/javascripts/services/piwik-api-service.js b/plugins/CoreHome/angularjs/common/services/piwik-api-service.js
similarity index 100%
rename from plugins/CoreHome/javascripts/services/piwik-api-service.js
rename to plugins/CoreHome/angularjs/common/services/piwik-api-service.js
diff --git a/plugins/CoreHome/javascripts/services/piwik-service.js b/plugins/CoreHome/angularjs/common/services/piwik-service.js
similarity index 100%
rename from plugins/CoreHome/javascripts/services/piwik-service.js
rename to plugins/CoreHome/angularjs/common/services/piwik-service.js
diff --git a/plugins/CoreHome/javascripts/services/service.js b/plugins/CoreHome/angularjs/common/services/service.js
similarity index 100%
rename from plugins/CoreHome/javascripts/services/service.js
rename to plugins/CoreHome/angularjs/common/services/service.js
diff --git a/plugins/CoreHome/javascripts/piwikApp.js b/plugins/CoreHome/angularjs/piwikApp.js
similarity index 100%
rename from plugins/CoreHome/javascripts/piwikApp.js
rename to plugins/CoreHome/angularjs/piwikApp.js
diff --git a/plugins/CoreHome/javascripts/piwikAppConfig.js b/plugins/CoreHome/angularjs/piwikAppConfig.js
similarity index 100%
rename from plugins/CoreHome/javascripts/piwikAppConfig.js
rename to plugins/CoreHome/angularjs/piwikAppConfig.js
diff --git a/plugins/CoreHome/javascripts/siteselector/siteselector-controller.js b/plugins/CoreHome/angularjs/siteselector/siteselector-controller.js
similarity index 100%
rename from plugins/CoreHome/javascripts/siteselector/siteselector-controller.js
rename to plugins/CoreHome/angularjs/siteselector/siteselector-controller.js
diff --git a/plugins/CoreHome/javascripts/siteselector/siteselector-controller_test.js b/plugins/CoreHome/angularjs/siteselector/siteselector-controller_test.js
similarity index 100%
rename from plugins/CoreHome/javascripts/siteselector/siteselector-controller_test.js
rename to plugins/CoreHome/angularjs/siteselector/siteselector-controller_test.js
diff --git a/plugins/CoreHome/javascripts/siteselector/siteselector-directive.js b/plugins/CoreHome/angularjs/siteselector/siteselector-directive.js
similarity index 94%
rename from plugins/CoreHome/javascripts/siteselector/siteselector-directive.js
rename to plugins/CoreHome/angularjs/siteselector/siteselector-directive.js
index fc789da5b5..bcd5c0f0ab 100644
--- a/plugins/CoreHome/javascripts/siteselector/siteselector-directive.js
+++ b/plugins/CoreHome/angularjs/siteselector/siteselector-directive.js
@@ -27,7 +27,7 @@ angular.module('piwikApp').directive('piwikSiteselector', function($document, pi
allSitesText: '@',
allSitesLocation: '@'
},
- templateUrl: 'plugins/CoreHome/javascripts/siteselector/siteselector.html?cb=' + piwik.cacheBuster,
+ templateUrl: 'plugins/CoreHome/angularjs/siteselector/siteselector.html?cb=' + piwik.cacheBuster,
controller: 'SiteSelectorController',
compile: function (element, attrs) {
diff --git a/plugins/CoreHome/javascripts/siteselector/siteselector-model.js b/plugins/CoreHome/angularjs/siteselector/siteselector-model.js
similarity index 100%
rename from plugins/CoreHome/javascripts/siteselector/siteselector-model.js
rename to plugins/CoreHome/angularjs/siteselector/siteselector-model.js
diff --git a/plugins/CoreHome/javascripts/siteselector/siteselector.html b/plugins/CoreHome/angularjs/siteselector/siteselector.html
similarity index 100%
rename from plugins/CoreHome/javascripts/siteselector/siteselector.html
rename to plugins/CoreHome/angularjs/siteselector/siteselector.html
diff --git a/plugins/CoreHome/javascripts/siteselector/siteselector.less b/plugins/CoreHome/angularjs/siteselector/siteselector.less
similarity index 100%
rename from plugins/CoreHome/javascripts/siteselector/siteselector.less
rename to plugins/CoreHome/angularjs/siteselector/siteselector.less
diff --git a/plugins/MultiSites/MultiSites.php b/plugins/MultiSites/MultiSites.php
index 337e054476..284001d496 100644
--- a/plugins/MultiSites/MultiSites.php
+++ b/plugins/MultiSites/MultiSites.php
@@ -102,15 +102,15 @@ class MultiSites extends \Piwik\Plugin
public function getJsFiles(&$jsFiles)
{
- $jsFiles[] = "plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-model.js";
- $jsFiles[] = "plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-controller.js";
- $jsFiles[] = "plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-filter.js";
- $jsFiles[] = "plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-directive.js";
- $jsFiles[] = "plugins/MultiSites/javascripts/multisites-site/multisites-site-directive.js";
+ $jsFiles[] = "plugins/MultiSites/angularjs/dashboard/dashboard-model.js";
+ $jsFiles[] = "plugins/MultiSites/angularjs/dashboard/dashboard-controller.js";
+ $jsFiles[] = "plugins/MultiSites/angularjs/dashboard/dashboard-filter.js";
+ $jsFiles[] = "plugins/MultiSites/angularjs/dashboard/dashboard-directive.js";
+ $jsFiles[] = "plugins/MultiSites/angularjs/site/site-directive.js";
}
public function getStylesheetFiles(&$stylesheets)
{
- $stylesheets[] = "plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard.less";
+ $stylesheets[] = "plugins/MultiSites/angularjs/dashboard/dashboard.less";
}
}
diff --git a/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-controller.js b/plugins/MultiSites/angularjs/dashboard/dashboard-controller.js
similarity index 100%
rename from plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-controller.js
rename to plugins/MultiSites/angularjs/dashboard/dashboard-controller.js
diff --git a/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-directive.js b/plugins/MultiSites/angularjs/dashboard/dashboard-directive.js
similarity index 88%
rename from plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-directive.js
rename to plugins/MultiSites/angularjs/dashboard/dashboard-directive.js
index f29ea8876c..5a8da8170d 100644
--- a/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-directive.js
+++ b/plugins/MultiSites/angularjs/dashboard/dashboard-directive.js
@@ -26,7 +26,7 @@ angular.module('piwikApp').directive('piwikMultisitesDashboard', function($docum
showSparklines: '@',
dateSparkline: '@'
},
- templateUrl: 'plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard.html?cb=' + piwik.cacheBuster,
+ templateUrl: 'plugins/MultiSites/angularjs/dashboard/dashboard.html?cb=' + piwik.cacheBuster,
controller: 'MultiSitesDashboardController',
link: function (scope, element, attrs, controller) {
diff --git a/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-filter.js b/plugins/MultiSites/angularjs/dashboard/dashboard-filter.js
similarity index 100%
rename from plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-filter.js
rename to plugins/MultiSites/angularjs/dashboard/dashboard-filter.js
diff --git a/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-model.js b/plugins/MultiSites/angularjs/dashboard/dashboard-model.js
similarity index 100%
rename from plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-model.js
rename to plugins/MultiSites/angularjs/dashboard/dashboard-model.js
diff --git a/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard.html b/plugins/MultiSites/angularjs/dashboard/dashboard.html
similarity index 100%
rename from plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard.html
rename to plugins/MultiSites/angularjs/dashboard/dashboard.html
diff --git a/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard.less b/plugins/MultiSites/angularjs/dashboard/dashboard.less
similarity index 100%
rename from plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard.less
rename to plugins/MultiSites/angularjs/dashboard/dashboard.less
diff --git a/plugins/MultiSites/javascripts/multisites-site/multisites-site-directive.js b/plugins/MultiSites/angularjs/site/site-directive.js
similarity index 94%
rename from plugins/MultiSites/javascripts/multisites-site/multisites-site-directive.js
rename to plugins/MultiSites/angularjs/site/site-directive.js
index 14875dd3f6..d118a09889 100644
--- a/plugins/MultiSites/javascripts/multisites-site/multisites-site-directive.js
+++ b/plugins/MultiSites/angularjs/site/site-directive.js
@@ -29,7 +29,7 @@ angular.module('piwikApp').directive('piwikMultisitesSite', function($document,
dateSparkline: '=',
displayRevenueColumn: '='
},
- templateUrl: 'plugins/MultiSites/javascripts/multisites-site/multisites-site.html?cb=' + piwik.cacheBuster,
+ templateUrl: 'plugins/MultiSites/angularjs/site/site.html?cb=' + piwik.cacheBuster,
controller: function ($scope) {
$scope.period = piwik.period;
diff --git a/plugins/MultiSites/javascripts/multisites-site/multisites-site.html b/plugins/MultiSites/angularjs/site/site.html
similarity index 100%
rename from plugins/MultiSites/javascripts/multisites-site/multisites-site.html
rename to plugins/MultiSites/angularjs/site/site.html
diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo
index f9aabdf4a4..cd98a60c78 160000
--- a/plugins/SecurityInfo
+++ b/plugins/SecurityInfo
@@ -1 +1 @@
-Subproject commit f9aabdf4a4112b3c0505257978435dcee4039471
+Subproject commit cd98a60c785ce56b45e4d142e9af3a470619a60b
diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable
index 3189dec95a..f6e252d5dc 160000
--- a/plugins/TasksTimetable
+++ b/plugins/TasksTimetable
@@ -1 +1 @@
-Subproject commit 3189dec95a3b7be6e00a3d407837b26221513cdd
+Subproject commit f6e252d5dc5e3cf004263f7450c2ca55bd2c5a71
diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization
index 19978cb7cd..2cb15300a8 160000
--- a/plugins/TreemapVisualization
+++ b/plugins/TreemapVisualization
@@ -1 +1 @@
-Subproject commit 19978cb7cd926ec0fba111ce257b8f0450f34ce8
+Subproject commit 2cb15300a88f7ff2a1fc27ef633a1a1f4d5fef09
diff --git a/plugins/Zeitgeist/stylesheets/base.less b/plugins/Zeitgeist/stylesheets/base.less
index f6b45e8a4d..5fc643c4dd 100644
--- a/plugins/Zeitgeist/stylesheets/base.less
+++ b/plugins/Zeitgeist/stylesheets/base.less
@@ -16,7 +16,7 @@
@import "ui/_headerMessage.less";
-@import "../../CoreHome/javascripts/siteselector/siteselector.less";
+@import "../../CoreHome/angularjs/siteselector/siteselector.less";
@import "ui/_periodSelect.less";
--
GitLab