Revert icon changes and add new property iconSVG instead (#14199)

* Revert icon changes and add new property iconSVG instead

* update test files

4 files changed, 11 insertions, 11 deletions

diff --git a/plugins/Live/templates/_actionCommon.twig b/plugins/Live/templates/_actionCommon.twig
index 548c1b44c7..a697485a0e 100644
--- a/plugins/Live/templates/_actionCommon.twig
+++ b/plugins/Live/templates/_actionCommon.twig
@@ -7,14 +7,14 @@
         {% endif %}
         {% if action.siteSearchKeyword is defined %}
             {% if action.type == 'search' %}
-                <img src='{{ action.icon }}' title='{{ 'Actions_SubmenuSitesearch'|translate }}'
+                <img src='{{ action.iconSVG|default(action.icon) }}' title='{{ 'Actions_SubmenuSitesearch'|translate }}'
                      class="action-list-action-icon search">
             {% endif %}
             <span class="truncated-text-line">{{ action.siteSearchKeyword|rawSafeDecoded }}</span>
         {% endif %}
         {% if action.url is not empty %}
-            {% if action.icon is not empty %}
-                <img src='{{ action.icon }}' class="action-list-action-icon {{ action.type }}">
+            {% if action.iconSVG|default(action.icon) is not empty %}
+                <img src='{{ action.iconSVG|default(action.icon) }}' class="action-list-action-icon {{ action.type }}">
             {% endif %}
             {% if action.type == 'action' and action.pageTitle|default(false) is not empty %}<p>{% endif %}
             {% if action.url|trim|lower starts with 'javascript:' or
diff --git a/plugins/Live/templates/_actionEcommerce.twig b/plugins/Live/templates/_actionEcommerce.twig
index a4b9858105..fc914503d4 100644
--- a/plugins/Live/templates/_actionEcommerce.twig
+++ b/plugins/Live/templates/_actionEcommerce.twig
@@ -2,7 +2,7 @@
     title="{{ postEvent('Live.renderActionTooltip', action, visitInfo) }}">
     <div>
         {# Ecommerce Abandoned Cart / Ecommerce Order #}
-        <img src="{{ action.icon }}" class="action-list-action-icon"/>
+        <img src="{{ action.iconSVG|default(action.icon) }}" class="action-list-action-icon"/>
         {% if action.type == 'ecommerceOrder' %}
             <strong>{{ 'Goals_EcommerceOrder'|translate }}</strong>
             <span style='color:#666;'>({{ action.orderId }})</span>
diff --git a/plugins/Live/templates/_actionGoal.twig b/plugins/Live/templates/_actionGoal.twig
index dadfc566e8..30c06299dc 100644
--- a/plugins/Live/templates/_actionGoal.twig
+++ b/plugins/Live/templates/_actionGoal.twig
@@ -2,7 +2,7 @@
     title="{{ postEvent('Live.renderActionTooltip', action, visitInfo) }}">
     <div>
         {# Goal conversion #}
-        <img src="{{ action.icon }}" class="action-list-action-icon" />
+        <img src="{{ action.iconSVG|default(action.icon) }}" class="action-list-action-icon" />
         <strong>{{ action.goalName }}</strong>
         {% if action.revenue > 0 %}, {{ 'General_ColumnRevenue'|translate }}:
             <strong>{{ action.revenue|money(visitInfo.idSite)|raw }}</strong>
diff --git a/plugins/Live/templates/getLastVisitsStart.twig b/plugins/Live/templates/getLastVisitsStart.twig
index adf24ce9c3..04969679f3 100644
--- a/plugins/Live/templates/getLastVisitsStart.twig
+++ b/plugins/Live/templates/getLastVisitsStart.twig
@@ -61,7 +61,7 @@
                                 {%- endif %}
                             {% endset %}
                             <span title="{{- title -}}">
-						        <img class='iconPadding' src="{{ action.icon }}"/>
+						        <img class='iconPadding' src="{{ action.iconSVG|default(action.icon) }}"/>
                                 {% if action.type == 'ecommerceOrder' %}
                                     {{ 'General_ColumnRevenue'|translate }}: {{ action.revenue|money(idSite)|raw }}
                                 {% endif %}
@@ -82,19 +82,19 @@
 <span class="tooltip-action-server-time">{{ action.serverTimePretty }}</span>
     {% if action.timeSpentPretty is defined %}<span class='tooltip-time-on-page'>{{ 'General_TimeOnPage'|translate }}: {{ action.timeSpentPretty|raw }}</span>{% endif %}
 {%- endset %}
-                                    <img class='iconPadding' src="{{ action.icon }}" title="{{- title|e('html_attr') -}}"/>
+                                    <img class='iconPadding' src="{{ action.iconSVG|default(action.icon) }}" title="{{- title|e('html_attr') -}}"/>
                                 {% elseif action.type == 'outlink' or action.type == 'download' %}
-                                    <img class='iconPadding' src="{{ action.icon }}"
+                                    <img class='iconPadding' src="{{ action.iconSVG|default(action.icon) }}"
                                          title="{% if action.url is defined %}{{ action.url }} - {% endif %}{{ action.serverTimePretty }}"/>
                                 {% elseif action.type == 'search' %}
-                                    <img class='iconPadding' src="{{ action.icon }}"
+                                    <img class='iconPadding' src="{{ action.iconSVG|default(action.icon) }}"
                                          title="{{ 'Actions_SubmenuSitesearch'|translate }}: {{ action.siteSearchKeyword }} - {{ action.serverTimePretty }}"/>
                                 {% elseif action.eventCategory|default(false) is not empty %}
-                                    <img  class="iconPadding" src='{{ action.icon }}'
+                                    <img  class="iconPadding" src='{{ action.iconSVG|default(action.icon) }}'
                                         title="{{ 'Events_Event'|translate }} {{ action.eventCategory }} - {{ action.eventAction }} {% if action.eventName is defined %}- {{ action.eventName }}{% endif %} {% if action.eventValue is defined %}- {{ action.eventValue }}{% endif %}"/>
                                 {% elseif action.type == 'goal' or action.type == constant('Piwik\\Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER') or
                                           action.type == constant('Piwik\\Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART') %}
-                                    <img class='iconPadding' src="{{ action.icon }}"
+                                    <img class='iconPadding' src="{{ action.iconSVG|default(action.icon) }}"
                                          title="{{ action.goalName }} - {% if action.revenue > 0 %}{{ 'General_ColumnRevenue'|translate }}: {{ action.revenue|money(idSite)|raw }} - {% endif %} {{ action.serverTimePretty }}"/>
                                 {% endif %}
                             {% if action.url is defined and action.url is not empty %}