Refs #3089, reordered left side of visitor profile.

matomo-org · Aug 27, 2013 · eb00e87 · eb00e87
1 parent 781a359
commit eb00e87
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/plugins/Live/stylesheets/visitor_profile.less b/plugins/Live/stylesheets/visitor_profile.less
@@ -113,7 +113,7 @@
     }
 }
 
-.visitor-profile-map,.visitor-profile-important-visits {
+.visitor-profile-summary,.visitor-profile-important-visits {
     border-bottom:1px solid #d1cec8;
 }
 

diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig
@@ -26,8 +26,20 @@
         </div>
         <div>
             <div>
-                <div class="visitor-profile-map">
-                    {{ userCountryMap|raw }}
+                <div class="visitor-profile-summary">
+                    <h1>{{ 'General_Summary'|translate }}</h1>
+                    <div>
+                        <p>{{ 'Live_VisitSummary'|translate('<strong>', visitorData.totalVisitDurationPretty, '</strong>', '<strong>', visitorData.totalActionCount, visitorData.totalVisits, '</strong>')|raw }}</p>
+                        <p><strong>{{ 'Live_ConvertedNGoals'|translate(visitorData.totalGoalConversions) }}</strong>
+                        {%- if visitorData.totalGoalConversions %} (
+                            {%- for idGoal, totalConversions in visitorData.totalConversionsByGoal -%}
+                            {%- if not loop.first %}, {% endif -%}{{- totalConversions }} <span class="visitor-profile-goal-name">{{ goals[idGoal]['name'] -}}</span>
+                            {%- endfor -%}
+                        ){% endif %}.</p>
+                        {% if visitorData.totalEcommerceConversions is defined %}
+                        <p>{{ 'Live_EcommerceSummary'|translate('<strong>', visitorData.totalEcommerceConversions, visitorData.totalEcommerceRevenue|money(idSite), '</strong>', visitorData.totalEcommerceItems)|raw }}</p>
+                        {% endif %}
+                    </div>
                 </div>
                 <div class="visitor-profile-important-visits">
                     <div>
@@ -47,20 +59,8 @@
                         </div>
                     </div>
                 </div>
-                <div class="visitor-profile-summary">
-                    <h1>{{ 'General_Summary'|translate }}</h1>
-                    <div>
-                        <p>{{ 'Live_VisitSummary'|translate('<strong>', visitorData.totalVisitDurationPretty, '</strong>', '<strong>', visitorData.totalActionCount, visitorData.totalVisits, '</strong>')|raw }}</p>
-                        <p><strong>{{ 'Live_ConvertedNGoals'|translate(visitorData.totalGoalConversions) }}</strong>
-                        {%- if visitorData.totalGoalConversions %} (
-                            {%- for idGoal, totalConversions in visitorData.totalConversionsByGoal -%}
-                            {%- if not loop.first %}, {% endif -%}{{- totalConversions }} <span class="visitor-profile-goal-name">{{ goals[idGoal]['name'] -}}</span>
-                            {%- endfor -%}
-                        ){% endif %}.</p>
-                        {% if visitorData.totalEcommerceConversions is defined %}
-                        <p>{{ 'Live_EcommerceSummary'|translate('<strong>', visitorData.totalEcommerceConversions, visitorData.totalEcommerceRevenue|money(idSite), '</strong>', visitorData.totalEcommerceItems)|raw }}</p>
-                        {% endif %}
-                    </div>
+                <div class="visitor-profile-map">
+                    {{ userCountryMap|raw }}
                 </div>
             </div>
             <div class="visitor-profile-visits-info">