diff options
| author | Stefan Giehl <stefan@matomo.org> | 2019-03-14 22:30:25 +0300 |
|---|---|---|
| committer | diosmosis <diosmosis@users.noreply.github.com> | 2019-03-14 22:30:25 +0300 |
| commit | 6d39aaaf57a710c0f8314a2165d295ffc054868f (patch) | |
| tree | 19c8a4f5c34cdc8613c94aea2ffbeffd6c56cc5d /plugins/Actions | |
| parent | 00d15def20e9654d5855326012099a0c8654e3cb (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/Actions')
| -rw-r--r-- | plugins/Actions/VisitorDetails.php | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/plugins/Actions/VisitorDetails.php b/plugins/Actions/VisitorDetails.php index c7bddf2852..86d8692074 100644 --- a/plugins/Actions/VisitorDetails.php +++ b/plugins/Actions/VisitorDetails.php @@ -147,7 +147,8 @@ class VisitorDetails extends VisitorDetailsAbstract 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'])) { @@ -156,7 +157,8 @@ class VisitorDetails extends VisitorDetailsAbstract 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 { @@ -169,10 +171,12 @@ class VisitorDetails extends VisitorDetailsAbstract 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'); } @@ -183,19 +187,22 @@ class VisitorDetails extends VisitorDetailsAbstract 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; @@ -207,7 +214,8 @@ class VisitorDetails extends VisitorDetailsAbstract $action['subtitle'] = $action['url']; } $action['type'] = 'action'; - $action['icon'] = 'plugins/Morpheus/images/action.svg'; + $action['icon'] = ''; + $action['iconSVG'] = 'plugins/Morpheus/images/action.svg'; break; } |