Refs #4041, rename javascriptVariablesToSet to clientSideParameters and fix regression in visitor log.

3 files changed, 14 insertions, 14 deletions

diff --git a/plugins/Live/templates/_actionsList.twig b/plugins/Live/templates/_actionsList.twig
index cc09700869..ef46ab86dd 100644
--- a/plugins/Live/templates/_actionsList.twig
+++ b/plugins/Live/templates/_actionsList.twig
@@ -10,7 +10,7 @@
             {% endfor %}
         {% endif %}
     {% endset %}
-    {% if not javascriptVariablesToSet.filterEcommerce or action.type == 'ecommerceOrder' or action.type == 'ecommerceAbandonedCart' %}
+    {% if not clientSideParameters.filterEcommerce or action.type == 'ecommerceOrder' or action.type == 'ecommerceAbandonedCart' %}
         <li class="{% if action.goalName is defined %}goal{% else %}action{% endif %}"
             title="{{ action.serverTimePretty }}{% if action.url is defined and action.url|trim|length %}
 
@@ -34,7 +34,7 @@
                     <strong>{{'Goals_AbandonedCart'|translate}}</strong>
 
                     {# TODO: would be nice to have the icons Orders / Cart in the ecommerce log footer #}
-                    {% if javascriptVariablesToSet.filterEcommerce == 2 %}
+                    {% if clientSideParameters.filterEcommerce == 2 %}
                         {% set visitorHasSomeEcommerceActivity %}1{% endset %}
                     {% endif %}
                 {% endif %}
@@ -42,17 +42,17 @@
                 <span {% if not isWidget %}style='margin-left:20px;'{% endif %}>
                     {% if action.type == 'ecommerceOrder' %}
                     <abbr title="
-                        {{ 'General_ColumnRevenue'|translate }}: {{ action.revenue|money(javascriptVariablesToSet.idSite)|raw }}
-                        {% if action.revenueSubTotal is not empty %} - {{ 'General_Subtotal'|translate }}: {{ action.revenueSubTotal|money(javascriptVariablesToSet.idSite)|raw }}{% endif %}
-                        {% if action.revenueTax is not empty %} - {{ 'General_Tax'|translate }}: {{ action.revenueTax|money(javascriptVariablesToSet.idSite)|raw }}{% endif %}
-                        {% if action.revenueShipping is not empty %} - {{ 'General_Shipping'|translate }}: {{ action.revenueShipping|money(javascriptVariablesToSet.idSite)|raw }}{% endif %}
-                        {% if action.revenueDiscount is not empty %} - {{ 'General_Discount'|translate }}: {{ action.revenueDiscount|money(javascriptVariablesToSet.idSite)|raw }}{% endif %}
+                        {{ 'General_ColumnRevenue'|translate }}: {{ action.revenue|money(clientSideParameters.idSite)|raw }}
+                        {% if action.revenueSubTotal is not empty %} - {{ 'General_Subtotal'|translate }}: {{ action.revenueSubTotal|money(clientSideParameters.idSite)|raw }}{% endif %}
+                        {% if action.revenueTax is not empty %} - {{ 'General_Tax'|translate }}: {{ action.revenueTax|money(clientSideParameters.idSite)|raw }}{% endif %}
+                        {% if action.revenueShipping is not empty %} - {{ 'General_Shipping'|translate }}: {{ action.revenueShipping|money(clientSideParameters.idSite)|raw }}{% endif %}
+                        {% if action.revenueDiscount is not empty %} - {{ 'General_Discount'|translate }}: {{ action.revenueDiscount|money(clientSideParameters.idSite)|raw }}{% endif %}
                         ">{{ 'General_ColumnRevenue'|translate }}:
                     {% else %}
                         {% set revenueLeft %}{{ 'General_ColumnRevenue'|translate }}{% endset %}
                         {{ 'Goals_LeftInCart'|translate(revenueLeft) }}:
                     {% endif %}
-                        <strong>{{ action.revenue|money(javascriptVariablesToSet.idSite)|raw }}</strong>
+                        <strong>{{ action.revenue|money(clientSideParameters.idSite)|raw }}</strong>
                     {% if action.type == 'ecommerceOrder' %}
                     </abbr>
                     {% endif %}, {{ 'General_Quantity'|translate }}: {{ action.items }}
@@ -66,7 +66,7 @@
                                     {% if product.itemCategory is not empty %} ({{ product.itemCategory }}){% endif %}
                                     ,
                                     {{ 'General_Quantity'|translate }}: {{ product.quantity }},
-                                    {{ 'General_Price'|translate }}: {{ product.price|money(javascriptVariablesToSet.idSite)|raw }}
+                                    {{ 'General_Price'|translate }}: {{ product.price|money(clientSideParameters.idSite)|raw }}
                                 </li>
                             {% endfor %}
                         </ul>
@@ -96,7 +96,7 @@
                     {% if action.type == 'action' and action.pageTitle is not empty %}</p>{% endif %}
                 {% elseif action.type != 'search' %}
                     <p>
-                    <span style="margin-left: 25px;">{{ javascriptVariablesToSet.pageUrlNotDefined }}</span>
+                    <span style="margin-left: 25px;">{{ clientSideParameters.pageUrlNotDefined }}</span>
                     </p>
                 {% endif %}
             {% else %}
@@ -104,7 +104,7 @@
                 <img src="{{ action.icon }}" />
                 <strong>{{ action.goalName }}</strong>
                 {% if action.revenue > 0 %}, {{ 'General_ColumnRevenue'|translate }}:
-                    <strong>{{ action.revenue|money(javascriptVariablesToSet.idSite)|raw }}</strong>
+                    <strong>{{ action.revenue|money(clientSideParameters.idSite)|raw }}</strong>
                 {% endif %}
             {% endif %}
         </li>
diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig
index 5ca71b0c36..9b21c3cd5f 100644
--- a/plugins/Live/templates/_dataTableViz_visitorLog.twig
+++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig
@@ -43,7 +43,7 @@
             <img src="{{ visitor.getColumn('visitorTypeIcon') }}"
                  title="{{ 'General_ReturningVisitor'|translate }}{% if visitor.getColumn('visitorId') is not empty %}{% endif %}"/>
             {% if visitor.getColumn('visitorId') is not empty %}
-            <a class="rightLink" title="{{ 'Live_ViewVisitorProfile'|translate }}" data-visitor-id="{{ visitor.getColumn("visitorId") }}" class="visitor-log-visitor-profile-link">
+            <a class="rightLink visitor-log-visitor-profile-link" title="{{ 'Live_ViewVisitorProfile'|translate }}" data-visitor-id="{{ visitor.getColumn("visitorId") }}">
                 <img src="plugins/Live/images/visitorProfileLaunch.png"/>
             </a>
             {% endif %}
@@ -178,7 +178,7 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit
         </tr>
     {% endset %}
 
-    {% if not javascriptVariablesToSet.filterEcommerce or visitorHasSomeEcommerceActivity is not empty %}
+    {% if not clientSideParameters.filterEcommerce or visitorHasSomeEcommerceActivity is not empty %}
         {{ visitorRow }}
     {% endif %}
 {% endfor %}
diff --git a/plugins/Live/templates/getVisitList.twig b/plugins/Live/templates/getVisitList.twig
index 35a29f7663..ca8432a4b7 100644
--- a/plugins/Live/templates/getVisitList.twig
+++ b/plugins/Live/templates/getVisitList.twig
@@ -4,7 +4,7 @@
         <h2 class="visitor-profile-visit-title" data-idvisit="{{ visitInfo.getColumn('idVisit') }}" title="{{ 'Live_ClickToViewMoreAboutVisit'|translate }}">{{ 'General_Visit'|translate }} #{{ startCounter }}</h2>{% if visitInfo.getColumn('visitDuration') != 0 %}<span>&nbsp;- ({{ visitInfo.getColumn('visitDurationPretty')|raw }})</span>{% endif %}<span class="visitor-profile-date" title="{{ visitInfo.getColumn('serverDateTimePrettyFirstAction') }}">{{ visitInfo.getColumn('serverDatePrettyFirstAction') }}</span>
         <ol class="visitor-profile-actions">
             {% include "@Live/_actionsList.twig" with {'actionDetails': visitInfo.getColumn('actionDetails'),
-                                                       'javascriptVariablesToSet': {
+                                                       'clientSideParameters': {
                                                             'filterEcommerce': false,
                                                             'idSite': idSite
                                                         },