Skip to content

Commit

Permalink
Show actions in visitorlog as a (unnumerated) timeline (matomo-org#13916
Browse files Browse the repository at this point in the history 
)

* 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.
  • Loading branch information
@sgiehl @diosmosis
sgiehl authored and diosmosis committed Feb 12, 2019
1 parent 6c4bfb8 commit c6cc4cd
Show file tree
Hide file tree
Showing 78 changed files with 2,349 additions and 2,251 deletions.
364 changes: 182 additions & 182 deletions ...ns/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
View file

Large diffs are not rendered by default.

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

switch ($action['type']) {
case 'goal':
$action['icon'] = 'plugins/Morpheus/images/goal.png';
$action['icon'] = 'plugins/Morpheus/images/goal.svg';
$action['title'] = Piwik::translate('Goals_GoalConversion');
$action['subtitle'] = $action['goalName'];
if (!empty($action['revenue'])) {
Expand All @@ -156,7 +156,7 @@ 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'] . '.png';
$action['icon'] = '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 +169,10 @@ public function extendActionDetails(&$action, $nextAction, $visitorDetails)
break;
case Action::TYPE_CONTENT:
if (!empty($action['contentInteraction'])) {
$action['icon'] = 'plugins/Morpheus/images/contentinteraction.png';
$action['icon'] = 'plugins/Morpheus/images/contentinteraction.svg';
$action['title'] = Piwik::translate('Contents_ContentInteraction') . ' (' . $action['contentInteraction'] . ')';
} else {
$action['icon'] = 'plugins/Morpheus/images/contentimpression.png';
$action['icon'] = 'plugins/Morpheus/images/contentimpression.svg';
$action['title'] = Piwik::translate('Contents_ContentImpression');
}

Expand All @@ -183,19 +183,19 @@ public function extendActionDetails(&$action, $nextAction, $visitorDetails)
break;
case Action::TYPE_DOWNLOAD:
$action['type'] = 'download';
$action['icon'] = 'plugins/Morpheus/images/download.png';
$action['icon'] = '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.png';
$action['icon'] = '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_ico.png';
$action['icon'] = 'plugins/Morpheus/images/search.svg';
$action['title'] = Piwik::translate('Actions_SubmenuSitesearch');
$action['subtitle'] = $action['siteSearchKeyword'];
break;
Expand All @@ -207,7 +207,7 @@ public function extendActionDetails(&$action, $nextAction, $visitorDetails)
$action['subtitle'] = $action['url'];
}
$action['type'] = 'action';
$action['icon'] = null;
$action['icon'] = 'plugins/Morpheus/images/action.svg';
break;
}

Expand Down
4 changes: 2 additions & 2 deletions ...ctions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions plugins/Contents/templates/_actionContent.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
title="{{ postEvent('Live.renderActionTooltip', action, visitInfo) }}">
<div>
{% if action.contentInteraction %}
<span class="icon-document action-list-action-icon" title="{{ 'Contents_ContentInteraction'|translate }}"></span>
<img src='{{ action.icon }}' title='{{ 'Contents_ContentInteraction'|translate }}'
class="action-list-action-icon content-interaction">
{% else %}
<span class="icon-show action-list-action-icon" title="{{ 'Contents_ContentImpression'|translate }}"></span>
<img src='{{ action.icon }}' title='{{ 'Contents_ContentImpression'|translate }}'
class="action-list-action-icon content-impression">
{% endif %}
{% if action.contentInteraction %}
[{{ action.contentInteraction }}]
Expand Down
52 changes: 26 additions & 26 deletions plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<interactionPosition>1</interactionPosition>
<title>Ads</title>
<subtitle>http://www.example.org/page</subtitle>
<icon />
<icon>plugins/Morpheus/images/action.svg</icon>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -41,7 +41,7 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentimpression.png</icon>
<icon>plugins/Morpheus/images/contentimpression.svg</icon>
<title>Content Impression</title>
<subtitle>ImageAd - Unknown</subtitle>

Expand All @@ -62,7 +62,7 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentimpression.png</icon>
<icon>plugins/Morpheus/images/contentimpression.svg</icon>
<title>Content Impression</title>
<subtitle>ImageAd</subtitle>

Expand All @@ -83,7 +83,7 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentimpression.png</icon>
<icon>plugins/Morpheus/images/contentimpression.svg</icon>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>

Expand All @@ -104,7 +104,7 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentimpression.png</icon>
<icon>plugins/Morpheus/images/contentimpression.svg</icon>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad2.jpg</subtitle>

Expand All @@ -125,7 +125,7 @@
<contentInteraction>submit</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentinteraction.png</icon>
<icon>plugins/Morpheus/images/contentinteraction.svg</icon>
<title>Content Interaction (submit)</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>

Expand All @@ -146,7 +146,7 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentimpression.png</icon>
<icon>plugins/Morpheus/images/contentimpression.svg</icon>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>

Expand All @@ -167,7 +167,7 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentimpression.png</icon>
<icon>plugins/Morpheus/images/contentimpression.svg</icon>
<title>Content Impression</title>
<subtitle>Text Ad - Click NOW</subtitle>

Expand All @@ -188,7 +188,7 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentinteraction.png</icon>
<icon>plugins/Morpheus/images/contentinteraction.svg</icon>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>

Expand All @@ -209,7 +209,7 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentinteraction.png</icon>
<icon>plugins/Morpheus/images/contentinteraction.svg</icon>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click NOW</subtitle>

Expand All @@ -230,7 +230,7 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentimpression.png</icon>
<icon>plugins/Morpheus/images/contentimpression.svg</icon>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>

Expand All @@ -251,7 +251,7 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentimpression.png</icon>
<icon>plugins/Morpheus/images/contentimpression.svg</icon>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>

Expand All @@ -272,7 +272,7 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentimpression.png</icon>
<icon>plugins/Morpheus/images/contentimpression.svg</icon>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>

Expand Down Expand Up @@ -398,7 +398,7 @@
<interactionPosition>1</interactionPosition>
<title>Ads</title>
<subtitle>http://www.example.org/page</subtitle>
<icon />
<icon>plugins/Morpheus/images/action.svg</icon>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -417,7 +417,7 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentimpression.png</icon>
<icon>plugins/Morpheus/images/contentimpression.svg</icon>
<title>Content Impression</title>
<subtitle>ImageAd - Unknown</subtitle>

Expand All @@ -438,7 +438,7 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentimpression.png</icon>
<icon>plugins/Morpheus/images/contentimpression.svg</icon>
<title>Content Impression</title>
<subtitle>ImageAd</subtitle>

Expand All @@ -459,7 +459,7 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentimpression.png</icon>
<icon>plugins/Morpheus/images/contentimpression.svg</icon>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>

Expand All @@ -480,7 +480,7 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentimpression.png</icon>
<icon>plugins/Morpheus/images/contentimpression.svg</icon>
<title>Content Impression</title>
<subtitle>ImageAd - /path/ad2.jpg</subtitle>

Expand All @@ -501,7 +501,7 @@
<contentInteraction>submit</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentinteraction.png</icon>
<icon>plugins/Morpheus/images/contentinteraction.svg</icon>
<title>Content Interaction (submit)</title>
<subtitle>ImageAd - /path/ad.jpg</subtitle>

Expand All @@ -522,7 +522,7 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentimpression.png</icon>
<icon>plugins/Morpheus/images/contentimpression.svg</icon>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>

Expand All @@ -543,7 +543,7 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentimpression.png</icon>
<icon>plugins/Morpheus/images/contentimpression.svg</icon>
<title>Content Impression</title>
<subtitle>Text Ad - Click NOW</subtitle>

Expand All @@ -564,7 +564,7 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentinteraction.png</icon>
<icon>plugins/Morpheus/images/contentinteraction.svg</icon>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>

Expand All @@ -585,7 +585,7 @@
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentinteraction.png</icon>
<icon>plugins/Morpheus/images/contentinteraction.svg</icon>
<title>Content Interaction (click)</title>
<subtitle>Text Ad - Click NOW</subtitle>

Expand All @@ -606,7 +606,7 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentimpression.png</icon>
<icon>plugins/Morpheus/images/contentimpression.svg</icon>
<title>Content Impression</title>
<subtitle>Text Ad - Click to download Piwik now</subtitle>

Expand All @@ -627,7 +627,7 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentimpression.png</icon>
<icon>plugins/Morpheus/images/contentimpression.svg</icon>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>

Expand All @@ -648,7 +648,7 @@
<contentInteraction />
<bandwidth />
<interactionPosition>1</interactionPosition>
<icon>plugins/Morpheus/images/contentimpression.png</icon>
<icon>plugins/Morpheus/images/contentimpression.svg</icon>
<title>Content Impression</title>
<subtitle>Video Ad - movie.mov</subtitle>

Expand Down
Loading

0 comments on commit c6cc4cd

Please sign in to comment.