refs #5983 make sites manager working again, more naming fixes

plugins/CoreHome/CoreHome.php

@@ -66,8 +66,8 @@ class CoreHome extends \Piwik\Plugin
         $stylesheets[] = "plugins/CoreHome/stylesheets/sparklineColors.less";
         $stylesheets[] = "plugins/CoreHome/stylesheets/notification.less";
         $stylesheets[] = "plugins/CoreHome/stylesheets/zen-mode.less";
-        $stylesheets[] = "plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.less";
-        $stylesheets[] = "plugins/CoreHome/angularjs/menudropdown/menudropdown.less";
+        $stylesheets[] = "plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.less";
+        $stylesheets[] = "plugins/CoreHome/angularjs/menudropdown/menudropdown.directive.less";
         $stylesheets[] = "plugins/CoreHome/angularjs/dialogtoggler/ngdialog.less";
     }
 
@@ -138,7 +138,7 @@ class CoreHome extends \Piwik\Plugin
         $jsFiles[] = "plugins/CoreHome/angularjs/anchorLinkFix.js";
         $jsFiles[] = "plugins/CoreHome/angularjs/http404check.js";
 
-        $jsFiles[] = "plugins/CoreHome/angularjs/siteselector/siteselector.model.js";
+        $jsFiles[] = "plugins/CoreHome/angularjs/siteselector/siteselector-model.service.js";
         $jsFiles[] = "plugins/CoreHome/angularjs/siteselector/siteselector.controller.js";
         $jsFiles[] = "plugins/CoreHome/angularjs/siteselector/siteselector.directive.js";
 

plugins/Feedback/Feedback.php

@@ -29,13 +29,12 @@ class Feedback extends \Piwik\Plugin
     public function getStylesheetFiles(&$stylesheets)
     {
         $stylesheets[] = "plugins/Feedback/stylesheets/feedback.less";
-
-        $stylesheets[] = "plugins/Feedback/angularjs/ratefeature/ratefeature.less";
+        $stylesheets[] = "plugins/Feedback/angularjs/ratefeature/ratefeature.directive.less";
     }
 
     public function getJsFiles(&$jsFiles)
     {
-        $jsFiles[] = "plugins/Feedback/angularjs/ratefeature/ratefeature.model.js";
+        $jsFiles[] = "plugins/Feedback/angularjs/ratefeature/ratefeature-model.service.js";
         $jsFiles[] = "plugins/Feedback/angularjs/ratefeature/ratefeature.controller.js";
         $jsFiles[] = "plugins/Feedback/angularjs/ratefeature/ratefeature.directive.js";
     }

plugins/Morpheus/stylesheets/base.less

@@ -23,8 +23,8 @@
 
 @import "uibase/_headerMessage.less";
 
-@import "../../CoreHome/angularjs/siteselector/siteselector.less";
-@import "../../CoreHome/angularjs/menudropdown/menudropdown.less";
+@import "../../CoreHome/angularjs/siteselector/siteselector.directive.less";
+@import "../../CoreHome/angularjs/menudropdown/menudropdown.directive.less";
 
 @import "uibase/_periodSelect.less";
 

plugins/MultiSites/MultiSites.php

@@ -72,15 +72,15 @@ class MultiSites extends \Piwik\Plugin
 
     public function getJsFiles(&$jsFiles)
     {
-        $jsFiles[] = "plugins/MultiSites/angularjs/dashboard/dashboard.model.js";
+        $jsFiles[] = "plugins/MultiSites/angularjs/dashboard/dashboard-model.service.js";
         $jsFiles[] = "plugins/MultiSites/angularjs/dashboard/dashboard.controller.js";
-        $jsFiles[] = "plugins/MultiSites/angularjs/dashboard/dashboard.filter.js";
+        $jsFiles[] = "plugins/MultiSites/angularjs/dashboard/dashboard-group.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/angularjs/dashboard/dashboard.less";
+        $stylesheets[] = "plugins/MultiSites/angularjs/dashboard/dashboard.directive.less";
     }
 }

plugins/SitesManager/angularjs/sites-manager/api-core.service.js

@@ -15,7 +15,7 @@
         var api = sitesManagerApiHelper;
 
         return {
-            getIpFromHeader: getIpFromHeader
+            getIpFromHeader: getIpFromHeader()
         };
 
         function getIpFromHeader() {

plugins/SitesManager/angularjs/sites-manager/api-coreadmin.service.js

@@ -15,7 +15,7 @@
         var api = sitesManagerApiHelper;
 
         return {
-            isPluginActivated: isPluginActivated
+            isPluginActivated: isPluginActivated()
         };
 
         function isPluginActivated() {

plugins/SitesManager/angularjs/sites-manager/api-helper.service.js

@@ -51,12 +51,12 @@
 
         function fetchApi(apiMethod, jsonResponseAdaptor, params) {
 
-            return this.fetch({method: apiMethod}, jsonResponseAdaptor, params);
+            return fetch({method: apiMethod}, jsonResponseAdaptor, params);
         }
 
         function fetchAction(module, action, jsonResponseAdaptor, params) {
 
-            return this.fetch({module: module, action: action}, jsonResponseAdaptor, params);
+            return fetch({module: module, action: action}, jsonResponseAdaptor, params);
         }
 
         function singleObjectAdaptor(response) {

plugins/SitesManager/angularjs/sites-manager/api-site.service.js

@@ -14,11 +14,11 @@
         var api = sitesManagerApiHelper;
 
         return {
-            getCurrencyList: getCurrencyList,
-            getSitesWithAdminAccess: getSitesWithAdminAccess,
-            getTimezonesList: getTimezonesList,
-            isTimezoneSupportEnabled: isTimezoneSupportEnabled,
-            getGlobalSettings: getGlobalSettings
+            getCurrencyList: getCurrencyList(),
+            getSitesWithAdminAccess: getSitesWithAdminAccess(),
+            getTimezonesList: getTimezonesList(),
+            isTimezoneSupportEnabled: isTimezoneSupportEnabled(),
+            getGlobalSettings: getGlobalSettings()
         };
 
         function getCurrencyList () {

plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js

@@ -80,7 +80,7 @@
 
         var triggerAddSiteIfRequested = function() {
 
-            if(piwikHelper.getArrayFromQueryString(String(window.location.search))['showaddsite'] == 1)
+            if(piwik.helper.getArrayFromQueryString(String(window.location.search))['showaddsite'] == 1)
                 addSite();
         };
 
@@ -205,7 +205,7 @@
 
         var cancelEditSite = function ($event) {
             $event.stopPropagation();
-            piwikHelper.redirect($scope.redirectParams);
+            piwik.helper.redirect($scope.redirectParams);
         };
 
         var lookupCurrentEditSite = function () {

plugins/ZenMode/ZenMode.php

@@ -45,7 +45,7 @@ class ZenMode extends \Piwik\Plugin
 
     public function getStylesheetFiles(&$stylesheets)
     {
-        $stylesheets[] = "plugins/ZenMode/angularjs/quick-access/quick-access.less";
+        $stylesheets[] = "plugins/ZenMode/angularjs/quick-access/quick-access.directive.less";
         $stylesheets[] = "plugins/ZenMode/angularjs/zen-mode/zen-mode.less";
     }
 }