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:
authorStefan Giehl <stefan@matomo.org>2019-03-14 22:30:25 +0300
committerdiosmosis <diosmosis@users.noreply.github.com>2019-03-14 22:30:25 +0300
commit6d39aaaf57a710c0f8314a2165d295ffc054868f (patch)
tree19c8a4f5c34cdc8613c94aea2ffbeffd6c56cc5d /plugins/Contents
parent00d15def20e9654d5855326012099a0c8654e3cb (diff)
Revert icon changes and add new property iconSVG instead (#14199)
* Revert icon changes and add new property iconSVG instead * update test files
Diffstat (limited to 'plugins/Contents')
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml78
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml78
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml78
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml78
-rw-r--r--plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml78
5 files changed, 260 insertions, 130 deletions
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
index 9a211ae6c6..7d32ba87bf 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
@@ -22,7 +22,8 @@
<interactionPosition>1</interactionPosition>
<title>Ads</title>
<subtitle>http://www.example.org/page</subtitle>
- <icon>plugins/Morpheus/images/action.svg</icon>
+ <icon />
+ <iconSVG>plugins/Morpheus/images/action.svg</iconSVG>
<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
@@ -41,7 +42,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - Unknown</subtitle>
@@ -62,7 +64,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd</subtitle>
@@ -83,7 +86,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>
@@ -104,7 +108,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad2.jpg</subtitle>
@@ -125,7 +130,8 @@
<contentInteraction>submit</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (submit)</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>
@@ -146,7 +152,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -167,7 +174,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click NOW</subtitle>
@@ -188,7 +196,8 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -209,7 +218,8 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click NOW</subtitle>
@@ -230,7 +240,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -251,7 +262,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>
@@ -272,7 +284,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>
@@ -398,7 +411,8 @@
<interactionPosition>1</interactionPosition>
<title>Ads</title>
<subtitle>http://www.example.org/page</subtitle>
- <icon>plugins/Morpheus/images/action.svg</icon>
+ <icon />
+ <iconSVG>plugins/Morpheus/images/action.svg</iconSVG>
<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
@@ -417,7 +431,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - Unknown</subtitle>
@@ -438,7 +453,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd</subtitle>
@@ -459,7 +475,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>
@@ -480,7 +497,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad2.jpg</subtitle>
@@ -501,7 +519,8 @@
<contentInteraction>submit</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (submit)</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>
@@ -522,7 +541,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -543,7 +563,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click NOW</subtitle>
@@ -564,7 +585,8 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -585,7 +607,8 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click NOW</subtitle>
@@ -606,7 +629,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -627,7 +651,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>
@@ -648,7 +673,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
index 9a211ae6c6..7d32ba87bf 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
@@ -22,7 +22,8 @@
<interactionPosition>1</interactionPosition>
<title>Ads</title>
<subtitle>http://www.example.org/page</subtitle>
- <icon>plugins/Morpheus/images/action.svg</icon>
+ <icon />
+ <iconSVG>plugins/Morpheus/images/action.svg</iconSVG>
<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
@@ -41,7 +42,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - Unknown</subtitle>
@@ -62,7 +64,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd</subtitle>
@@ -83,7 +86,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>
@@ -104,7 +108,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad2.jpg</subtitle>
@@ -125,7 +130,8 @@
<contentInteraction>submit</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (submit)</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>
@@ -146,7 +152,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -167,7 +174,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click NOW</subtitle>
@@ -188,7 +196,8 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -209,7 +218,8 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click NOW</subtitle>
@@ -230,7 +240,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -251,7 +262,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>
@@ -272,7 +284,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>
@@ -398,7 +411,8 @@
<interactionPosition>1</interactionPosition>
<title>Ads</title>
<subtitle>http://www.example.org/page</subtitle>
- <icon>plugins/Morpheus/images/action.svg</icon>
+ <icon />
+ <iconSVG>plugins/Morpheus/images/action.svg</iconSVG>
<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
@@ -417,7 +431,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - Unknown</subtitle>
@@ -438,7 +453,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd</subtitle>
@@ -459,7 +475,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>
@@ -480,7 +497,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad2.jpg</subtitle>
@@ -501,7 +519,8 @@
<contentInteraction>submit</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (submit)</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>
@@ -522,7 +541,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -543,7 +563,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click NOW</subtitle>
@@ -564,7 +585,8 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -585,7 +607,8 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click NOW</subtitle>
@@ -606,7 +629,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -627,7 +651,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>
@@ -648,7 +673,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
index 9a211ae6c6..7d32ba87bf 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
@@ -22,7 +22,8 @@
<interactionPosition>1</interactionPosition>
<title>Ads</title>
<subtitle>http://www.example.org/page</subtitle>
- <icon>plugins/Morpheus/images/action.svg</icon>
+ <icon />
+ <iconSVG>plugins/Morpheus/images/action.svg</iconSVG>
<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
@@ -41,7 +42,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - Unknown</subtitle>
@@ -62,7 +64,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd</subtitle>
@@ -83,7 +86,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>
@@ -104,7 +108,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad2.jpg</subtitle>
@@ -125,7 +130,8 @@
<contentInteraction>submit</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (submit)</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>
@@ -146,7 +152,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -167,7 +174,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click NOW</subtitle>
@@ -188,7 +196,8 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -209,7 +218,8 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click NOW</subtitle>
@@ -230,7 +240,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -251,7 +262,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>
@@ -272,7 +284,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>
@@ -398,7 +411,8 @@
<interactionPosition>1</interactionPosition>
<title>Ads</title>
<subtitle>http://www.example.org/page</subtitle>
- <icon>plugins/Morpheus/images/action.svg</icon>
+ <icon />
+ <iconSVG>plugins/Morpheus/images/action.svg</iconSVG>
<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
@@ -417,7 +431,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - Unknown</subtitle>
@@ -438,7 +453,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd</subtitle>
@@ -459,7 +475,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>
@@ -480,7 +497,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad2.jpg</subtitle>
@@ -501,7 +519,8 @@
<contentInteraction>submit</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (submit)</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>
@@ -522,7 +541,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -543,7 +563,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click NOW</subtitle>
@@ -564,7 +585,8 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -585,7 +607,8 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click NOW</subtitle>
@@ -606,7 +629,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -627,7 +651,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>
@@ -648,7 +673,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
index 9a211ae6c6..7d32ba87bf 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
@@ -22,7 +22,8 @@
<interactionPosition>1</interactionPosition>
<title>Ads</title>
<subtitle>http://www.example.org/page</subtitle>
- <icon>plugins/Morpheus/images/action.svg</icon>
+ <icon />
+ <iconSVG>plugins/Morpheus/images/action.svg</iconSVG>
<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
@@ -41,7 +42,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - Unknown</subtitle>
@@ -62,7 +64,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd</subtitle>
@@ -83,7 +86,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>
@@ -104,7 +108,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad2.jpg</subtitle>
@@ -125,7 +130,8 @@
<contentInteraction>submit</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (submit)</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>
@@ -146,7 +152,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -167,7 +174,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click NOW</subtitle>
@@ -188,7 +196,8 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -209,7 +218,8 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click NOW</subtitle>
@@ -230,7 +240,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -251,7 +262,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>
@@ -272,7 +284,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>
@@ -398,7 +411,8 @@
<interactionPosition>1</interactionPosition>
<title>Ads</title>
<subtitle>http://www.example.org/page</subtitle>
- <icon>plugins/Morpheus/images/action.svg</icon>
+ <icon />
+ <iconSVG>plugins/Morpheus/images/action.svg</iconSVG>
<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
@@ -417,7 +431,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - Unknown</subtitle>
@@ -438,7 +453,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd</subtitle>
@@ -459,7 +475,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>
@@ -480,7 +497,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad2.jpg</subtitle>
@@ -501,7 +519,8 @@
<contentInteraction>submit</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (submit)</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>
@@ -522,7 +541,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -543,7 +563,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click NOW</subtitle>
@@ -564,7 +585,8 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -585,7 +607,8 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click NOW</subtitle>
@@ -606,7 +629,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -627,7 +651,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>
@@ -648,7 +673,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>
diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
index 9a211ae6c6..7d32ba87bf 100644
--- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
@@ -22,7 +22,8 @@
<interactionPosition>1</interactionPosition>
<title>Ads</title>
<subtitle>http://www.example.org/page</subtitle>
- <icon>plugins/Morpheus/images/action.svg</icon>
+ <icon />
+ <iconSVG>plugins/Morpheus/images/action.svg</iconSVG>
<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
@@ -41,7 +42,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - Unknown</subtitle>
@@ -62,7 +64,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd</subtitle>
@@ -83,7 +86,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>
@@ -104,7 +108,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad2.jpg</subtitle>
@@ -125,7 +130,8 @@
<contentInteraction>submit</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (submit)</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>
@@ -146,7 +152,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -167,7 +174,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click NOW</subtitle>
@@ -188,7 +196,8 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -209,7 +218,8 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click NOW</subtitle>
@@ -230,7 +240,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -251,7 +262,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>
@@ -272,7 +284,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>
@@ -398,7 +411,8 @@
<interactionPosition>1</interactionPosition>
<title>Ads</title>
<subtitle>http://www.example.org/page</subtitle>
- <icon>plugins/Morpheus/images/action.svg</icon>
+ <icon />
+ <iconSVG>plugins/Morpheus/images/action.svg</iconSVG>
<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
@@ -417,7 +431,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - Unknown</subtitle>
@@ -438,7 +453,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd</subtitle>
@@ -459,7 +475,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>
@@ -480,7 +497,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad2.jpg</subtitle>
@@ -501,7 +519,8 @@
<contentInteraction>submit</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (submit)</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>
@@ -522,7 +541,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -543,7 +563,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click NOW</subtitle>
@@ -564,7 +585,8 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -585,7 +607,8 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentinteraction.svg</icon>
+ <icon>plugins/Morpheus/images/contentinteraction.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentinteraction.svg</iconSVG>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click NOW</subtitle>
@@ -606,7 +629,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>
@@ -627,7 +651,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>
@@ -648,7 +673,8 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
- <icon>plugins/Morpheus/images/contentimpression.svg</icon>
+ <icon>plugins/Morpheus/images/contentimpression.png</icon>
+ <iconSVG>plugins/Morpheus/images/contentimpression.svg</iconSVG>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>