Skip to content

Commit

Permalink
Revert icon changes and add new property iconSVG instead (matomo-org#…
Browse files Browse the repository at this point in the history 
…14199)

* Revert icon changes and add new property iconSVG instead

* update test files
  • Loading branch information
@sgiehl @diosmosis
sgiehl authored and diosmosis committed Mar 14, 2019
1 parent 00d15de commit 6d39aaa
Show file tree
Hide file tree
Showing 43 changed files with 3,553 additions and 1,782 deletions.
441 changes: 294 additions & 147 deletions ...ns/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
View file

Large diffs are not rendered by default.

24 changes: 16 additions & 8 deletions plugins/Actions/VisitorDetails.php
View file
Expand Up @@ -147,7 +147,8 @@ public function extendActionDetails(&$action, $nextAction, $visitorDetails)

switch ($action['type']) {
case 'goal':
$action['icon'] = 'plugins/Morpheus/images/goal.svg';
$action['icon'] = 'plugins/Morpheus/images/goal.png';
$action['iconSVG'] = 'plugins/Morpheus/images/goal.svg';
$action['title'] = Piwik::translate('Goals_GoalConversion');
$action['subtitle'] = $action['goalName'];
if (!empty($action['revenue'])) {
Expand All @@ -156,7 +157,8 @@ public function extendActionDetails(&$action, $nextAction, $visitorDetails)
break;
case Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER:
case Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART:
$action['icon'] = 'plugins/Morpheus/images/' . $action['type'] . '.svg';
$action['icon'] = 'plugins/Morpheus/images/' . $action['type'] . '.png';
$action['iconSVG'] = 'plugins/Morpheus/images/' . $action['type'] . '.svg';
if ($action['type'] == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER) {
$action['title'] = Piwik::translate('CoreHome_VisitStatusOrdered') . ' (' . $action['orderId'] . ')';
} else {
Expand All @@ -169,10 +171,12 @@ public function extendActionDetails(&$action, $nextAction, $visitorDetails)
break;
case Action::TYPE_CONTENT:
if (!empty($action['contentInteraction'])) {
$action['icon'] = 'plugins/Morpheus/images/contentinteraction.svg';
$action['icon'] = 'plugins/Morpheus/images/contentinteraction.png';
$action['iconSVG'] = 'plugins/Morpheus/images/contentinteraction.svg';
$action['title'] = Piwik::translate('Contents_ContentInteraction') . ' (' . $action['contentInteraction'] . ')';
} else {
$action['icon'] = 'plugins/Morpheus/images/contentimpression.svg';
$action['icon'] = 'plugins/Morpheus/images/contentimpression.png';
$action['iconSVG'] = 'plugins/Morpheus/images/contentimpression.svg';
$action['title'] = Piwik::translate('Contents_ContentImpression');
}

Expand All @@ -183,19 +187,22 @@ public function extendActionDetails(&$action, $nextAction, $visitorDetails)
break;
case Action::TYPE_DOWNLOAD:
$action['type'] = 'download';
$action['icon'] = 'plugins/Morpheus/images/download.svg';
$action['icon'] = 'plugins/Morpheus/images/download.png';
$action['iconSVG'] = 'plugins/Morpheus/images/download.svg';
$action['title'] = Piwik::translate('General_Download');
$action['subtitle'] = $action['url'];
break;
case Action::TYPE_OUTLINK:
$action['type'] = 'outlink';
$action['icon'] = 'plugins/Morpheus/images/link.svg';
$action['icon'] = 'plugins/Morpheus/images/link.png';
$action['iconSVG'] = 'plugins/Morpheus/images/link.svg';
$action['title'] = Piwik::translate('General_Outlink');
$action['subtitle'] = $action['url'];
break;
case Action::TYPE_SITE_SEARCH:
$action['type'] = 'search';
$action['icon'] = 'plugins/Morpheus/images/search.svg';
$action['icon'] = 'plugins/Morpheus/images/search.png';
$action['iconSVG'] = 'plugins/Morpheus/images/search.svg';
$action['title'] = Piwik::translate('Actions_SubmenuSitesearch');
$action['subtitle'] = $action['siteSearchKeyword'];
break;
Expand All @@ -207,7 +214,8 @@ public function extendActionDetails(&$action, $nextAction, $visitorDetails)
$action['subtitle'] = $action['url'];
}
$action['type'] = 'action';
$action['icon'] = 'plugins/Morpheus/images/action.svg';
$action['icon'] = '';
$action['iconSVG'] = 'plugins/Morpheus/images/action.svg';
break;
}

Expand Down
78 changes: 52 additions & 26 deletions plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
View file
Expand Up @@ -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>
Expand All @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand Down Expand Up @@ -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>
Expand All @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand Down

0 comments on commit 6d39aaa

Please sign in to comment.