refs #9489 fix visitor profile summary uses too many styles

matomo-org · Jan 12, 2016 · ae78d35 · ae78d35
1 parent a131584
commit ae78d35
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/plugins/Live/lang/en.json b/plugins/Live/lang/en.json
@@ -35,8 +35,8 @@
         "VisitorsInRealTime": "Visitors in Real-time",
         "VisitorsLastVisit": "This visitor's last visit was %s days ago.",
         "VisitsFrom": "%1$s%2$s visits%3$s from",
-        "VisitSummary": "Spent a total of %1$s%2$s on the website%3$s, and %4$sviewed %5$s pages in %6$s visits.%7$s",
-        "VisitSummaryWithActionDetails": "Spent a total of %1$s%2$s on the website%3$s, and %4$sperformed %5$s actions (%6$s) in %7$s visits.%8$s",
+        "VisitSummary": "Spent a total of %1$s%2$s on the website%3$s, and viewed %4$s pages%5$s in %6$s visits%7$s.",
+        "VisitSummaryWithActionDetails": "Spent a total of %1$s%2$s on the website%3$s, and performed %4$s actions%5$s (%6$s) in %7$s visits%8$s.",
         "RowActionTooltipDefault": "Show Visitor Log segmented by this row",
         "RowActionTooltipWithDimension": "Show Visitor Log segmented by this %s",
         "RowActionTooltipTitle": "Open segmented Visitor Log",

diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig
@@ -47,15 +47,15 @@
                             {% if visitorData.totalDownloads > 0 %}{% set actionDetails = actionDetails|merge([visitorData.totalDownloads ~ ' ' ~ 'General_Downloads'|translate]) %}{% endif %}
                             {% if visitorData.totalOutlinks > 0 %}{% set actionDetails = actionDetails|merge([visitorData.totalOutlinks ~ ' ' ~ 'General_Outlinks'|translate]) %}{% endif %}
                             {% if visitorData.totalSearches > 0 %}{% set actionDetails = actionDetails|merge([visitorData.totalSearches ~ ' ' ~ 'Actions_ColumnSearches'|translate]) %}{% endif %}
-                            <p>{{ 'Live_VisitSummaryWithActionDetails'|translate('<strong>' ~ visitorData.totalVisitDurationPretty ~ '</strong>', '', '', '<strong>', visitorData.totalActions, actionDetails|join(', ') , visitorData.totalVisits, '</strong>')|raw }}</p>
+                            <p>{{ 'Live_VisitSummaryWithActionDetails'|translate('<strong>' ~ visitorData.totalVisitDurationPretty ~ '</strong>', '', '', '<strong>' ~ visitorData.totalActions, '</strong>', actionDetails|join(', ') , '<strong>' ~ visitorData.totalVisits, '</strong>')|raw }}</p>
                         {% else %}
-                            <p>{{ 'Live_VisitSummary'|translate('<strong>' ~ visitorData.totalVisitDurationPretty ~ '</strong>', '', '', '<strong>', visitorData.totalActions, visitorData.totalVisits, '</strong>')|raw }}</p>
+                            <p>{{ 'Live_VisitSummary'|translate('<strong>' ~ visitorData.totalVisitDurationPretty ~ '</strong>', '', '', '<strong>' ~ visitorData.totalActions,  '</strong>', '<strong>' ~ visitorData.totalVisits, '</strong>')|raw }}</p>
                         {% endif %}
                         <p>{% if visitorData.totalGoalConversions %}<strong>{% endif %}{{ 'Live_ConvertedNGoals'|translate(visitorData.totalGoalConversions) }}{% if visitorData.totalGoalConversions %}</strong>{% endif %}
                         {%- if visitorData.totalGoalConversions %} (
                             {%- for idGoal, totalConversions in visitorData.totalConversionsByGoal -%}
                             {%- set idGoal = idGoal[7:] -%}
-                            {%- if not loop.first %}, {% endif -%}{{- totalConversions }} <span class="visitor-profile-goal-name">{{ goals[idGoal]['name'] -}}</span>
+                            {%- if not loop.first %}, {% endif -%}{{- totalConversions }} {{ goals[idGoal]['name'] -}}
                             {%- endfor -%}
                         ){% endif %}.</p>
                         {% if visitorData.totalEcommerceConversions|default(0) > 0 or visitorData.totalAbandonedCarts|default(0) > 0%}