refs #3332 Transitions:

 * Showing referrals from campaigns in the center box
 * Proper error message when URL was not found or truncated from the actions report (introducing general popover error method)
 * Stylish icon for row-action
 * Minor JS and CSS fixes

git-svn-id: http://dev.piwik.org/svn/trunk@7051 59fd770c-687e-43c8-a1e3-f5a4ff64c105

7 files changed, 36 insertions, 10 deletions

diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php
index ceb0438514..8e3d0acff2 100644
--- a/plugins/Transitions/API.php
+++ b/plugins/Transitions/API.php
@@ -119,7 +119,7 @@ class Piwik_Transitions_API
 		
 		if ($dataTable->getRowsCount() == 0)
 		{
-			throw new Exception("The label '$label' could not be found in Actions.getPageUrls\n");
+			throw new Exception('NoDataForUrl');
 		}
 		
 		$row = $dataTable->getFirstRow();
diff --git a/plugins/Transitions/Controller.php b/plugins/Transitions/Controller.php
index 61a85908fa..b913eb73df 100644
--- a/plugins/Transitions/Controller.php
+++ b/plugins/Transitions/Controller.php
@@ -52,7 +52,10 @@ class Piwik_Transitions_Controller extends Piwik_Controller
 	 */
 	private static $jsTranslations = array(
 		'XOfY' => 'Transitions_XOutOfYVisits',
-		'XOfAllPageviews' => 'Transitions_XOfAllPageviews'
+		'XOfAllPageviews' => 'Transitions_XOfAllPageviews',
+		'NoDataForUrl' => 'Transitions_NoDataForUrl',
+		'NoDataForUrlDetails' => 'Transitions_NoDataForUrlDetails',
+		'NoDataForUrlBack' => 'Transitions_ErrorBack'
 	);
 
 	public static function getTranslation($key)
diff --git a/plugins/Transitions/templates/transitions.css b/plugins/Transitions/templates/transitions.css
index b49d3aee9b..6df6c7695f 100644
--- a/plugins/Transitions/templates/transitions.css
+++ b/plugins/Transitions/templates/transitions.css
@@ -32,7 +32,7 @@
 #Transitions_CenterBox {
 	margin: 60px 0 0 345px;
 	width: 208px;
-	height: 344px;
+	height: 354px;
 	background: #f7f7f7;
 	border: 1px solid #a9a399;
 	border-radius:10px;
@@ -86,7 +86,7 @@
 }
 
 #Transitions_Loops {
-	margin: 435px 0 0 346px;
+	margin: 445px 0 0 346px;
 	width: 208px;
 	text-align: center;
 	line-height: 25px;
@@ -101,7 +101,7 @@
 	padding: 0;
 	cursor: default;
 	font-size: 12px;
-	line-height: 16px;
+	line-height: 15px;
 }
 
 .Transitions_CenterBoxMetrics p.Transitions_Margin {
diff --git a/plugins/Transitions/templates/transitions.js b/plugins/Transitions/templates/transitions.js
index 4522771150..bd41ef0a48 100644
--- a/plugins/Transitions/templates/transitions.js
+++ b/plugins/Transitions/templates/transitions.js
@@ -37,7 +37,7 @@ DataTable_RowActions_Registry.register({
 	
 	name: 'Transitions',
 	
-	dataTableIcon: 'plugins/Transitions/templates/transitions_rowaction.png',
+	dataTableIcon: 'plugins/Transitions/templates/transitions_icon.png',
 	
 	createInstance: function(dataTable) {
 		return new DataTable_RowActions_Transitions(dataTable);
@@ -208,6 +208,7 @@ Piwik_Transitions.prototype.renderCenterBox = function() {
 	showMetric('PreviousPages', 'previousPagesNbTransitions', 'left');
 	showMetric('SearchEngines', 'searchEnginesNbTransitions', 'left');
 	showMetric('Websites', 'websitesNbTransitions', 'left');
+	showMetric('Campaigns', 'campaignsNbTransitions', 'left');
 
 	showMetric('FollowingPages', 'followingPagesNbTransitions', 'right');
 	showMetric('Outlinks', 'outlinksNbTransitions', 'right');
@@ -875,7 +876,7 @@ Piwik_Transitions_Canvas.prototype.renderLoops = function(share) {
 	
 	// curve from the upper left connection to the center box to the lower left connection to the text box 
 	var point1 = {x: this.leftCurveEndX, y: this.leftCurvePositionY};
-	var point2 = {x: this.leftCurveEndX, y: 460};
+	var point2 = {x: this.leftCurveEndX, y: 470};
 	
 	var cpLeftX = (this.leftCurveBeginX + this.leftCurveEndX) / 2 + 30;
 	var cp1 = {x: cpLeftX, y: point1.y};
@@ -1144,7 +1145,27 @@ Piwik_Transitions_Ajax.prototype.callApi = function(method, params, callback) {
 
 	piwikHelper.queueAjaxRequest($.post('index.php', params, function(result) {
 		if (typeof result.result != 'undefined' && result.result == 'error') {
-			alert(result.message);
+			var errorName = result.message;
+			var errorTitle = Piwik_Transitions_Translations[errorName];
+			var errorMessage = Piwik_Transitions_Translations[errorName + 'Details'];
+			var errorBack = Piwik_Transitions_Translations[errorName + 'Back'];
+			
+			if (typeof errorTitle == 'undefined') {
+				alert(result.message);
+				return;
+			}
+			
+			if (typeof params.pageUrl != 'undefined') {
+				var url = params.pageUrl;
+				url = Piwik_Transitions_Util.addBreakpoints(url, '|||');
+				url = $(document.createElement('p')).text(url).html();
+				url = url.replace(/\|\|\|/g, '<wbr />');
+				errorTitle = errorTitle.replace(/%s/, '<span>' + url + '</span>');
+			}
+			
+			errorMessage = errorMessage.replace(/%s/g, '<br />');
+			
+			Piwik_Popover.showError(errorTitle, errorMessage, errorBack);
 		} else {
 			callback(result);
 		}
@@ -1180,8 +1201,9 @@ Piwik_Transitions_Util = {
 	},
 
 	/** Add break points to string so that it can be displayed more compactly */
-	addBreakpoints: function(text) {
-		return text.replace(/([\/&=?\.%#:])/g, '$1<wbr>');
+	addBreakpoints: function(text, breakpointMarkup) {
+		return text.replace(/([\/&=?\.%#:])/g, '$1' + 
+			(typeof breakpointMarkup == 'undefined' ? '<wbr>' : breakpointMarkup));
 	},
 
 	/**
diff --git a/plugins/Transitions/templates/transitions.tpl b/plugins/Transitions/templates/transitions.tpl
index f9ae7c3b52..b15b799490 100644
--- a/plugins/Transitions/templates/transitions.tpl
+++ b/plugins/Transitions/templates/transitions.tpl
@@ -11,6 +11,7 @@
 				<p class="Transitions_PreviousPages">{$translations.fromPreviousPagesInline|translate}</p>
 				<p class="Transitions_SearchEngines">{$translations.fromSearchEnginesInline|translate}</p>
 				<p class="Transitions_Websites">{$translations.fromWebsitesInline|translate}</p>
+				<p class="Transitions_Campaigns">{$translations.fromCampaignsInline|translate}</p>
 			</div>
 			
 			<div class="Transitions_OutgoingTraffic">
diff --git a/plugins/Transitions/templates/transitions_icon.png b/plugins/Transitions/templates/transitions_icon.png
new file mode 100755
index 0000000000..08cc2f302e
--- /dev/null
+++ b/plugins/Transitions/templates/transitions_icon.png
diff --git a/plugins/Transitions/templates/transitions_rowaction.png b/plugins/Transitions/templates/transitions_rowaction.png
deleted file mode 100755
index 5e31bbe260..0000000000
--- a/plugins/Transitions/templates/transitions_rowaction.png
+++ /dev/null