Merge branch 'master' into 3.0

Conflicts:
	core/Version.php
	plugins/CoreConsole/Commands/ManagePlugin.php
	plugins/CoreHome/angularjs/siteselector/siteselector.directive.js
	plugins/CoreHome/javascripts/corehome.js
	plugins/Ecommerce/Menu.php
	plugins/Events/Events.php
	plugins/Goals/Goals.php
	plugins/Live/templates/index.twig
	plugins/UserCountryMap/UserCountryMap.php
	plugins/UsersManager/stylesheets/usersManager.less
	plugins/VisitsSummary/Controller.php
	plugins/VisitsSummary/Reports/Get.php
	tests/UI/expected-ui-screenshots

1 files changed, 59 insertions, 0 deletions

diff --git a/plugins/CoreHome/javascripts/corehome.js b/plugins/CoreHome/javascripts/corehome.js
index 7b14515538..4526c9ec71 100755
--- a/plugins/CoreHome/javascripts/corehome.js
+++ b/plugins/CoreHome/javascripts/corehome.js
@@ -126,6 +126,65 @@
             handleSectionToggle(this, 'inline', !$(this).is(':checked'));
         });
 
+        //
+        // reports by dimension list behavior
+        //
+
+        // when a report dimension is clicked, load the appropriate report
+        var currentWidgetLoading = null;
+        $('body').on('click', '.reportDimension', function (e) {
+            var view = $(this).closest('.reportsByDimensionView'),
+                report = $('.dimensionReport', view),
+                loading = $('.loadingPiwik', view);
+
+            // make this dimension the active one
+            $('.activeDimension', view).removeClass('activeDimension');
+            $(this).addClass('activeDimension');
+
+            // hide the visible report & show the loading elem
+            report.hide();
+            loading.show();
+
+            // load the report using the data-url attribute (which holds the URL to the report)
+            var widgetParams = broadcast.getValuesFromUrl($(this).attr('data-url'));
+            for (var key in widgetParams) {
+                widgetParams[key] = decodeURIComponent(widgetParams[key]);
+            }
+
+            var widgetUniqueId = widgetParams.module + widgetParams.action;
+            currentWidgetLoading = widgetUniqueId;
+
+            var ajaxRequest = new ajaxHelper();
+            ajaxRequest.addParams(widgetParams, 'get');
+            ajaxRequest.setCallback(function (response) {
+                // if the widget that was loaded was not for the latest clicked link, do nothing w/ the response
+                if (widgetUniqueId != currentWidgetLoading) {
+                    return;
+                }
+
+                loading.hide();
+                report.css('display', 'inline-block').html($(response));
+
+                // scroll to report
+                piwikHelper.lazyScrollTo(report, 400);
+            });
+            ajaxRequest.setErrorCallback(function (deferred, status) {
+                if (status == 'abort' || !deferred || deferred.status < 400 || deferred.status >= 600) {
+                    return;
+                }
+
+                loading.hide();
+
+                var errorMessage = _pk_translate('General_ErrorRequest', ['', '']);
+                if ($('#loadingError').html()) {
+                    errorMessage = $('#loadingError').html();
+                }
+
+                report.css('display', 'inline-block').html('<div class="dimensionLoadingError">' + errorMessage + '</div>');
+            });
+            ajaxRequest.setFormat('html');
+            ajaxRequest.send(false);
+        });
     });
 
 }(jQuery));