diff --git a/plugins/Actions/VisitorDetails.php b/plugins/Actions/VisitorDetails.php index ef48f4ac38bf..2229c1992ac0 100644 --- a/plugins/Actions/VisitorDetails.php +++ b/plugins/Actions/VisitorDetails.php @@ -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'])) { @@ -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 { @@ -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'); } @@ -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; diff --git a/plugins/Contents/templates/_actionContent.twig b/plugins/Contents/templates/_actionContent.twig index 138f0e350ead..ae8f19018e22 100644 --- a/plugins/Contents/templates/_actionContent.twig +++ b/plugins/Contents/templates/_actionContent.twig @@ -2,9 +2,11 @@ title="{{ postEvent('Live.renderActionTooltip', action, visitInfo) }}">
{% if action.contentInteraction %} - + {% else %} - + {% endif %} {% if action.contentInteraction %} [{{ action.contentInteraction }}] diff --git a/plugins/CoreHome/VisitorDetails.php b/plugins/CoreHome/VisitorDetails.php index 88ae63a09cdd..c9f71e1e24b2 100644 --- a/plugins/CoreHome/VisitorDetails.php +++ b/plugins/CoreHome/VisitorDetails.php @@ -35,9 +35,9 @@ protected function getVisitEcommerceStatusIcon() $status = $this->getVisitEcommerceStatus(); if (in_array($status, array('ordered', 'orderedThenAbandonedCart'))) { - return "plugins/Morpheus/images/ecommerceOrder.png"; + return "plugins/Morpheus/images/ecommerceOrder.svg"; } elseif ($status == 'abandonedCart') { - return "plugins/Morpheus/images/ecommerceAbandonedCart.png"; + return "plugins/Morpheus/images/ecommerceAbandonedCart.svg"; } // Note: it is important that there is no icon when there was no ecommerce conversion return null; diff --git a/plugins/Events/VisitorDetails.php b/plugins/Events/VisitorDetails.php index 5644874469be..7c62a9c18485 100644 --- a/plugins/Events/VisitorDetails.php +++ b/plugins/Events/VisitorDetails.php @@ -21,7 +21,7 @@ public function extendActionDetails(&$action, $nextAction, $visitorDetails) { if (!empty($action['eventType'])) { $action['type'] = 'event'; - $action['icon'] = 'plugins/Morpheus/images/event.png'; + $action['icon'] = 'plugins/Morpheus/images/event.svg'; $action['title'] = Piwik::translate('Events_Event'); $action['subtitle'] = Piwik::translate('Event_Category') . ': "' . $action['eventCategory'] . "'"; diff --git a/plugins/Events/templates/_actionEvent.twig b/plugins/Events/templates/_actionEvent.twig index 9b2588aa2c94..70bcf4e69ad3 100644 --- a/plugins/Events/templates/_actionEvent.twig +++ b/plugins/Events/templates/_actionEvent.twig @@ -3,7 +3,7 @@ {% if action.pageTitle|default(false) is not empty %} {{ action.pageTitle|rawSafeDecoded }} {% endif %} - + {{ action.eventCategory|rawSafeDecoded }} - {{ action.eventAction|rawSafeDecoded }} {% if action.eventName is defined %}- {{ action.eventName|rawSafeDecoded }}{% endif %} {% if action.eventValue is defined %}[{{ action.eventValue }}]{% endif %} {% if action.url is not empty %} diff --git a/plugins/Live/stylesheets/live.less b/plugins/Live/stylesheets/live.less index e73a16ecdb10..7979020af570 100644 --- a/plugins/Live/stylesheets/live.less +++ b/plugins/Live/stylesheets/live.less @@ -133,6 +133,7 @@ ol.visitorLog > li { margin-bottom: 7px; line-height: 20px; position: relative; + min-height: 25px; &:before { vertical-align: top; @@ -363,16 +364,11 @@ a.visitor-log-visitor-profile-link { .action-list-action-icon { display: inline; - margin: 2px 3px 0 0; - max-height: 16px; + max-height: 18px; position: absolute; - left: -16px; + left: -18px; background-color: #fff; z-index: 3; - - &.outlink { - border: 3px solid #fff; - } } .action-list-url { diff --git a/plugins/Morpheus/images/contentimpression.svg b/plugins/Morpheus/images/contentimpression.svg new file mode 100644 index 000000000000..2069ffca8918 --- /dev/null +++ b/plugins/Morpheus/images/contentimpression.svg @@ -0,0 +1,5 @@ + + +visibility + + diff --git a/plugins/Morpheus/images/contentinteraction.svg b/plugins/Morpheus/images/contentinteraction.svg new file mode 100644 index 000000000000..f7b6ce3d86bd --- /dev/null +++ b/plugins/Morpheus/images/contentinteraction.svg @@ -0,0 +1,5 @@ + + +touch_app + + diff --git a/plugins/Morpheus/images/download.svg b/plugins/Morpheus/images/download.svg new file mode 100644 index 000000000000..8c739dff43fe --- /dev/null +++ b/plugins/Morpheus/images/download.svg @@ -0,0 +1,5 @@ + + +cloud_download + + diff --git a/plugins/Morpheus/images/ecommerceAbandonedCart.svg b/plugins/Morpheus/images/ecommerceAbandonedCart.svg new file mode 100644 index 000000000000..c6f7e340e1e7 --- /dev/null +++ b/plugins/Morpheus/images/ecommerceAbandonedCart.svg @@ -0,0 +1,5 @@ + + +remove_shopping_cart + + diff --git a/plugins/Morpheus/images/ecommerceOrder.svg b/plugins/Morpheus/images/ecommerceOrder.svg new file mode 100644 index 000000000000..f5af6db02931 --- /dev/null +++ b/plugins/Morpheus/images/ecommerceOrder.svg @@ -0,0 +1,5 @@ + + +shopping_cart + + diff --git a/plugins/Morpheus/images/event.svg b/plugins/Morpheus/images/event.svg new file mode 100644 index 000000000000..6e2740d15492 --- /dev/null +++ b/plugins/Morpheus/images/event.svg @@ -0,0 +1,5 @@ + + +graphic_eq + + diff --git a/plugins/Morpheus/images/goal.svg b/plugins/Morpheus/images/goal.svg new file mode 100644 index 000000000000..ba4782fc8e65 --- /dev/null +++ b/plugins/Morpheus/images/goal.svg @@ -0,0 +1,5 @@ + + +flag + + diff --git a/plugins/Morpheus/images/link.svg b/plugins/Morpheus/images/link.svg new file mode 100644 index 000000000000..d70b064128aa --- /dev/null +++ b/plugins/Morpheus/images/link.svg @@ -0,0 +1,5 @@ + + +open_in_new + + diff --git a/plugins/Morpheus/images/search.svg b/plugins/Morpheus/images/search.svg new file mode 100644 index 000000000000..0b643a2423b8 --- /dev/null +++ b/plugins/Morpheus/images/search.svg @@ -0,0 +1,5 @@ + + +search + +