Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeezyT <timo@ezdesign.de>2012-09-24 11:57:39 +0400
committerBeezyT <timo@ezdesign.de>2012-09-24 11:57:39 +0400
commit7ba5633252cb66be29494cee886e58f5b0060a73 (patch)
tree5689c279beeb31e5c2491e61213d2ff56ae3a46f /plugins/Transitions
parent8bcf12942fc6124d7e42090b6d29f8b4c329e906 (diff)
refs #3332 Transitions: main url, external referrers, outlinks and downloads open in new tab on click
git-svn-id: http://dev.piwik.org/svn/trunk@7046 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins/Transitions')
-rw-r--r--plugins/Transitions/templates/transitions.css4
-rw-r--r--plugins/Transitions/templates/transitions.js18
-rw-r--r--plugins/Transitions/templates/transitions.tpl2
3 files changed, 16 insertions, 8 deletions
diff --git a/plugins/Transitions/templates/transitions.css b/plugins/Transitions/templates/transitions.css
index 62a44b0844..50a9d2cd1e 100644
--- a/plugins/Transitions/templates/transitions.css
+++ b/plugins/Transitions/templates/transitions.css
@@ -43,10 +43,6 @@
z-index: 1503;
}
-#Transitions_CenterBox.Transitions_Loading {
- background: url(../../../themes/default/images/loading-blue.gif) no-repeat center center #f7f7f7;
-}
-
#Transitions_CenterBox h2 {
font-size: 12px;
line-height: 16px;
diff --git a/plugins/Transitions/templates/transitions.js b/plugins/Transitions/templates/transitions.js
index 9e82941c88..845492e44e 100644
--- a/plugins/Transitions/templates/transitions.js
+++ b/plugins/Transitions/templates/transitions.js
@@ -98,7 +98,10 @@ Piwik_Transitions.prototype.showPopover = function() {
self.centerBox = self.popover.find('#Transitions_CenterBox');
var link = Piwik_Transitions_Util.shortenUrl(self.link, true);
- self.centerBox.find('h2').html(Piwik_Transitions_Util.addBreakpoints(link));
+ var title = self.centerBox.find('h2').html(Piwik_Transitions_Util.addBreakpoints(link));
+ title.click(function() {
+ self.openExternalUrl(self.link);
+ }).css('cursor', 'pointer');
self.model.loadData(self.link, function() {
self.render();
@@ -169,8 +172,7 @@ Piwik_Transitions.prototype.reRenderIfNeededToCenter = function(side, onlyBg) {
/** Render the center box with the main metrics */
Piwik_Transitions.prototype.renderCenterBox = function() {
var box = this.centerBox;
- box.removeClass('Transitions_Loading');
-
+
Piwik_Transitions_Util.replacePlaceholderInHtml(
box.find('.Transitions_Pageviews'), this.model.pageviews);
@@ -345,6 +347,10 @@ Piwik_Transitions.prototype.renderOpenGroup = function(groupName, side, onlyBg)
onClick = (function(url) {
return function() { self.reloadPopover(url); };
})(label);
+ } else if (!isOthers && (groupName == 'outlinks' || groupName == 'websites' || groupName == 'downloads')) {
+ onClick = (function(url) {
+ return function() { self.openExternalUrl(url); };
+ })(label);
}
var tooltip = Piwik_Transitions_Translations.XOfY;
@@ -507,6 +513,12 @@ Piwik_Transitions.prototype.unHighlightGroup = function(groupName, side) {
this.renderLoops();
};
+/** Open a link in a new tab */
+Piwik_Transitions.prototype.openExternalUrl = function(url) {
+ url = piwik.piwik_url + '?module=Proxy&action=redirect&url=' + encodeURIComponent(url);
+ window.open(url, '_newtab');
+};
+
// --------------------------------------
// CANVAS
diff --git a/plugins/Transitions/templates/transitions.tpl b/plugins/Transitions/templates/transitions.tpl
index 7dd284e266..f9ae7c3b52 100644
--- a/plugins/Transitions/templates/transitions.tpl
+++ b/plugins/Transitions/templates/transitions.tpl
@@ -1,6 +1,6 @@
<div id="Transitions_Container">
- <div id="Transitions_CenterBox" class="Transitions_Text Transitions_Loading">
+ <div id="Transitions_CenterBox" class="Transitions_Text">
<h2></h2>
<div class="Transitions_CenterBoxMetrics">
<p class="Transitions_Pageviews Transitions_Margin">{$translations.pageviewsInline|translate}</p>