diff --git a/core/Metrics.php b/core/Metrics.php index 0d5c9d19cc5..5c30fd17e6d 100644 --- a/core/Metrics.php +++ b/core/Metrics.php @@ -310,7 +310,8 @@ static public function getMetricIdsToProcessReportTotal() self::INDEX_PAGE_ENTRY_NB_VISITS, self::INDEX_PAGE_ENTRY_NB_ACTIONS, self::INDEX_PAGE_EXIT_NB_VISITS, - self::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS + self::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS, + self::INDEX_REVENUE ); } diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php index 39342f37811..849adb148b5 100644 --- a/plugins/CoreHome/CoreHome.php +++ b/plugins/CoreHome/CoreHome.php @@ -68,8 +68,9 @@ public function getJsFiles(&$jsFiles) $jsFiles[] = "libs/jquery/jquery.mousewheel.js"; $jsFiles[] = "libs/jquery/mwheelIntent.js"; $jsFiles[] = "libs/javascript/sprintf.js"; - $jsFiles[] = "libs/angularjs/angular.js"; - $jsFiles[] = "libs/angularjs/angular-sanitize.js"; + $jsFiles[] = "libs/angularjs/angular.min.js"; + $jsFiles[] = "libs/angularjs/angular-sanitize.min.js"; + $jsFiles[] = "libs/angularjs/angular-animate.min.js"; $jsFiles[] = "plugins/Zeitgeist/javascripts/piwikHelper.js"; $jsFiles[] = "plugins/Zeitgeist/javascripts/ajaxHelper.js"; $jsFiles[] = "plugins/CoreHome/javascripts/require.js"; diff --git a/plugins/CoreHome/javascripts/piwikApp.js b/plugins/CoreHome/javascripts/piwikApp.js index a726aa9ca57..87079ecb36e 100644 --- a/plugins/CoreHome/javascripts/piwikApp.js +++ b/plugins/CoreHome/javascripts/piwikApp.js @@ -1,5 +1,6 @@ angular.module('piwikApp', [ 'ngSanitize', + 'ngAnimate', 'piwikApp.config', 'piwikApp.service', 'piwikApp.directive', diff --git a/plugins/CoreHome/javascripts/siteselector/siteselector-controller.js b/plugins/CoreHome/javascripts/siteselector/siteselector-controller.js index c0d835229eb..ec30264be76 100644 --- a/plugins/CoreHome/javascripts/siteselector/siteselector-controller.js +++ b/plugins/CoreHome/javascripts/siteselector/siteselector-controller.js @@ -27,7 +27,7 @@ angular.module('piwikApp').controller('SiteSelectorController', function($scope, } }; - $scope.getUrlAllSites = function () { + $scope.getUrlAllSites = function () { var newParameters = 'module=MultiSites&action=index' return piwik.helper.getCurrentQueryStringWithParametersModified(newParameters); } diff --git a/plugins/MultiSites/MultiSites.php b/plugins/MultiSites/MultiSites.php index 09dd10587f3..5dd89f3f743 100644 --- a/plugins/MultiSites/MultiSites.php +++ b/plugins/MultiSites/MultiSites.php @@ -53,6 +53,7 @@ public function getClientSideTranslationKeys(&$translations) $translations[] = 'General_Previous'; $translations[] = 'General_GoTo'; $translations[] = 'Dashboard_DashboardOf'; + $translations[] = 'Actions_SubmenuSitesearch'; } public function getReportMetadata(&$reports) diff --git a/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-model.js b/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-model.js index 738d9e8f745..a0f9151fbba 100644 --- a/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-model.js +++ b/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-model.js @@ -38,6 +38,7 @@ angular.module('piwikApp').factory('multisitesDashboardModel', function (piwikAp model.allSites = processedReport.reportData; model.totalVisits = processedReport.reportTotal.nb_visits; model.totalActions = processedReport.reportTotal.nb_actions; + model.totalRevenue = processedReport.reportTotal.revenue; model.prettyDate = processedReport.prettyDate; var sitesByGroup = []; diff --git a/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard.html b/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard.html index c325ff2e131..68d3d0d2362 100644 --- a/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard.html +++ b/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard.html @@ -3,7 +3,7 @@

{{ 'General_AllWebsitesDashboard'|translate }} + ng-bind-html="'General_TotalVisitsPageviewsRevenue' | translate:(''+model.totalVisits+''):(''+model.totalActions+''):('' + model.totalRevenue + '')"> Loading

@@ -45,6 +45,18 @@

+ + + Loading all websites + + + + - +