From c6cc4cd89e3b64767219293aab33863b9c501684 Mon Sep 17 00:00:00 2001
From: Stefan Giehl <stefan@matomo.org>
Date: Tue, 12 Feb 2019 23:31:08 +0100
Subject: Show actions in visitorlog as a (unnumerated) timeline (#13916)

* Show actions in visitorlog as a (unnumerated) timeline

* use new svg icons in visitor log

* use new icons also for visitor type

* ligthen icons a bit

* improve icon alignment

* lighten icons bit more

* adjust line color

* Lighten svg images even further.

* Updating screenshots.

* show conversion count as green circle

* Fixing tests.

* Update expected screenshots.
---
 ...tatusOrdered__Live.getLastVisitsDetails_day.xml | 20 +++++-----
 ...derWithItems__Live.getLastVisitsDetails_day.xml | 44 +++++++++++-----------
 2 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'plugins/Ecommerce')

diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
index 27699ade88..0655339b33 100644
--- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
@@ -25,7 +25,7 @@
 						<quantity>2</quantity>
 					</row>
 				</itemDetails>
-				<icon>plugins/Morpheus/images/ecommerceOrder.png</icon>
+				<icon>plugins/Morpheus/images/ecommerceOrder.svg</icon>
 				<title>Ordered (666)</title>
 				<subtitle>$ 240 revenue - 2 items: TRIPOD - bought day after)</subtitle>
 				
@@ -42,7 +42,7 @@
 				
 				<itemDetails>
 				</itemDetails>
-				<icon>plugins/Morpheus/images/ecommerceOrder.png</icon>
+				<icon>plugins/Morpheus/images/ecommerceOrder.svg</icon>
 				<title>Ordered (777)</title>
 				<subtitle>$ 10000 revenue - 0 items: )</subtitle>
 				
@@ -66,10 +66,10 @@
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon>
 		<visitCount>1</visitCount>
 		<visitEcommerceStatus>ordered</visitEcommerceStatus>
-		<visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.png</visitEcommerceStatusIcon>
+		<visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.svg</visitEcommerceStatusIcon>
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>363</visitDuration>
@@ -177,7 +177,7 @@
 				<interactionPosition>1</interactionPosition>
 				<title>View product left in cart</title>
 				<subtitle>http://example.org/index.htm</subtitle>
-				<icon />
+				<icon>plugins/Morpheus/images/action.svg</icon>
 				
 				<customVariables>
 					<row>
@@ -213,7 +213,7 @@
 				<interactionPosition>2</interactionPosition>
 				<title>View product left in cart</title>
 				<subtitle>http://example.org/index.htm</subtitle>
-				<icon />
+				<icon>plugins/Morpheus/images/action.svg</icon>
 				
 				<customVariables>
 					<row>
@@ -249,7 +249,7 @@
 				<interactionPosition>3</interactionPosition>
 				<title>View product left in cart</title>
 				<subtitle>http://example.org/index.htm</subtitle>
-				<icon />
+				<icon>plugins/Morpheus/images/action.svg</icon>
 				
 				<customVariables>
 					<row>
@@ -295,7 +295,7 @@
 						<quantity>2</quantity>
 					</row>
 				</itemDetails>
-				<icon>plugins/Morpheus/images/ecommerceAbandonedCart.png</icon>
+				<icon>plugins/Morpheus/images/ecommerceAbandonedCart.svg</icon>
 				<title>Abandoned Cart</title>
 				<subtitle>$ 2510.11 revenue - 4 items: PRODUCT THREE LEFT in cart, PRODUCT ONE LEFT in cart, PRODUCT TWO LEFT in cart)</subtitle>
 				
@@ -319,10 +319,10 @@
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon>
 		<visitCount>1</visitCount>
 		<visitEcommerceStatus>orderedThenAbandonedCart</visitEcommerceStatus>
-		<visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.png</visitEcommerceStatusIcon>
+		<visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.svg</visitEcommerceStatusIcon>
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>1</daysSinceLastEcommerceOrder>
 		<visitDuration>1081</visitDuration>
diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
index d6046d240b..b276f6e95c 100644
--- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
@@ -20,7 +20,7 @@
 				<interactionPosition>1</interactionPosition>
 				<title>View product left in cart</title>
 				<subtitle>http://example.org/index.htm</subtitle>
-				<icon />
+				<icon>plugins/Morpheus/images/action.svg</icon>
 				
 				<customVariables>
 					<row>
@@ -56,7 +56,7 @@
 				<interactionPosition>2</interactionPosition>
 				<title>View product left in cart</title>
 				<subtitle>http://example.org/index.htm</subtitle>
-				<icon />
+				<icon>plugins/Morpheus/images/action.svg</icon>
 				
 				<customVariables>
 					<row>
@@ -92,7 +92,7 @@
 				<interactionPosition>3</interactionPosition>
 				<title>View product left in cart</title>
 				<subtitle>http://example.org/index.htm</subtitle>
-				<icon />
+				<icon>plugins/Morpheus/images/action.svg</icon>
 				
 				<customVariables>
 					<row>
@@ -138,7 +138,7 @@
 						<quantity>2</quantity>
 					</row>
 				</itemDetails>
-				<icon>plugins/Morpheus/images/ecommerceAbandonedCart.png</icon>
+				<icon>plugins/Morpheus/images/ecommerceAbandonedCart.svg</icon>
 				<title>Abandoned Cart</title>
 				<subtitle>$ 2510.11 revenue - 4 items: PRODUCT THREE LEFT in cart, PRODUCT ONE LEFT in cart, PRODUCT TWO LEFT in cart)</subtitle>
 				
@@ -165,7 +165,7 @@
 		<visitConvertedIcon />
 		<visitCount>2</visitCount>
 		<visitEcommerceStatus>abandonedCart</visitEcommerceStatus>
-		<visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceAbandonedCart.png</visitEcommerceStatusIcon>
+		<visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceAbandonedCart.svg</visitEcommerceStatusIcon>
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>721</visitDuration>
@@ -273,7 +273,7 @@
 				<interactionPosition>1</interactionPosition>
 				<title>Looking at Electronics &amp; Cameras page with a page level custom variable</title>
 				<subtitle>http://example.org/index.htm</subtitle>
-				<icon />
+				<icon>plugins/Morpheus/images/action.svg</icon>
 				
 				<customVariables>
 					<row>
@@ -297,7 +297,7 @@
 				<interactionPosition>2</interactionPosition>
 				<title>Looking at Electronics &amp; Cameras page again</title>
 				<subtitle>http://example.org/index.htm</subtitle>
-				<icon />
+				<icon>plugins/Morpheus/images/action.svg</icon>
 				
 				<customVariables>
 					<row>
@@ -321,7 +321,7 @@
 				<interactionPosition>3</interactionPosition>
 				<title>Looking at product page</title>
 				<subtitle>http://example.org/index.htm</subtitle>
-				<icon />
+				<icon>plugins/Morpheus/images/action.svg</icon>
 				
 				<customVariables>
 					<row>
@@ -369,7 +369,7 @@
 						<quantity>6</quantity>
 					</row>
 				</itemDetails>
-				<icon>plugins/Morpheus/images/ecommerceOrder.png</icon>
+				<icon>plugins/Morpheus/images/ecommerceOrder.svg</icon>
 				<title>Ordered (937nsjusu 3894)</title>
 				<subtitle>$ 1111.11 revenue - 8 items: PRODUCT name, PRODUCT name BIS)</subtitle>
 				
@@ -400,7 +400,7 @@
 						<quantity>1</quantity>
 					</row>
 				</itemDetails>
-				<icon>plugins/Morpheus/images/ecommerceOrder.png</icon>
+				<icon>plugins/Morpheus/images/ecommerceOrder.svg</icon>
 				<title>Ordered (1037nsjusu4s3894)</title>
 				<subtitle>$ 2000 revenue - 2 items: PRODUCT name, Canon SLR)</subtitle>
 				
@@ -419,7 +419,7 @@
 				<interactionPosition>4</interactionPosition>
 				<title>View product left in cart</title>
 				<subtitle>http://example.org/index.htm</subtitle>
-				<icon />
+				<icon>plugins/Morpheus/images/action.svg</icon>
 				
 				<customVariables>
 					<row>
@@ -455,7 +455,7 @@
 				<interactionPosition>5</interactionPosition>
 				<title>View product left in cart</title>
 				<subtitle>http://example.org/index.htm</subtitle>
-				<icon />
+				<icon>plugins/Morpheus/images/action.svg</icon>
 				
 				<customVariables>
 					<row>
@@ -491,7 +491,7 @@
 				<interactionPosition>6</interactionPosition>
 				<title>View product left in cart</title>
 				<subtitle>http://example.org/index.htm</subtitle>
-				<icon />
+				<icon>plugins/Morpheus/images/action.svg</icon>
 				
 				<customVariables>
 					<row>
@@ -537,7 +537,7 @@
 						<quantity>2</quantity>
 					</row>
 				</itemDetails>
-				<icon>plugins/Morpheus/images/ecommerceAbandonedCart.png</icon>
+				<icon>plugins/Morpheus/images/ecommerceAbandonedCart.svg</icon>
 				<title>Abandoned Cart</title>
 				<subtitle>$ 2510.11 revenue - 4 items: PRODUCT THREE LEFT in cart, PRODUCT ONE LEFT in cart, PRODUCT TWO LEFT in cart)</subtitle>
 				
@@ -561,10 +561,10 @@
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon>
 		<visitCount>2</visitCount>
 		<visitEcommerceStatus>orderedThenAbandonedCart</visitEcommerceStatus>
-		<visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.png</visitEcommerceStatusIcon>
+		<visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.svg</visitEcommerceStatusIcon>
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>3961</visitDuration>
@@ -672,7 +672,7 @@
 				<interactionPosition>1</interactionPosition>
 				<title>incredible title!</title>
 				<subtitle>http://example.org/index.htm</subtitle>
-				<icon />
+				<icon>plugins/Morpheus/images/action.svg</icon>
 				
 				<customVariables>
 					<row>
@@ -702,7 +702,7 @@
 				<goalPageId>1</goalPageId>
 				
 				<url>http://example.org/index.htm</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
+				<icon>plugins/Morpheus/images/goal.svg</icon>
 				<title>Goal conversion</title>
 				<subtitle>title match, triggered ONCE ($ 10 revenue)</subtitle>
 				
@@ -721,7 +721,7 @@
 				<interactionPosition>2</interactionPosition>
 				<title>Another Product page</title>
 				<subtitle>http://example.org/index.htm</subtitle>
-				<icon />
+				<icon>plugins/Morpheus/images/action.svg</icon>
 				
 				<customVariables>
 					<row>
@@ -757,7 +757,7 @@
 				<interactionPosition>3</interactionPosition>
 				<title>Another Product page with no category</title>
 				<subtitle>http://example.org/index.htm</subtitle>
-				<icon />
+				<icon>plugins/Morpheus/images/action.svg</icon>
 				
 				<customVariables>
 					<row>
@@ -791,7 +791,7 @@
 				<interactionPosition>4</interactionPosition>
 				<title>Another Product page with multiple categories</title>
 				<subtitle>http://example.org/index.htm</subtitle>
-				<icon />
+				<icon>plugins/Morpheus/images/action.svg</icon>
 				
 				<customVariables>
 					<row>
@@ -828,7 +828,7 @@
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon>
 		<visitCount>1</visitCount>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
-- 
cgit v1.2.3