Refs #3089, several visitor profile tweaks.

8 files changed, 48 insertions, 17 deletions

diff --git a/plugins/Live/API.php b/plugins/Live/API.php
index 0b61f7bcce..ef6661d6aa 100644
--- a/plugins/Live/API.php
+++ b/plugins/Live/API.php
@@ -23,6 +23,7 @@ use Piwik\Period;
 use Piwik\Period\Range;
 use Piwik\Piwik;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
+use Piwik\Plugins\Referers\API as APIReferers;
 use Piwik\Segment;
 use Piwik\Site;
 use Piwik\Tracker\Action;
@@ -447,7 +448,8 @@ class API
             'date' => $serverDate,
             'prettyDate' => Date::factory($serverDate)->getLocalized(self::VISITOR_PROFILE_DATE_FORMAT),
             'daysAgo' => (int)Date::secondsToDays($today->getTimestamp() - Date::factory($serverDate)->getTimestamp()),
-            'referralSummary' => $this->getReferrerSummaryForVisit($visit),
+            'referrerType' => $visit->getColumn('referrerType'),
+            'referralSummary' => self::getReferrerSummaryForVisit($visit),
         );
     }
 
@@ -456,8 +458,9 @@ class API
      * 
      * @param Row $visit
      * @return bool|mixed|string
+     * @ignore
      */
-    private function getReferrerSummaryForVisit($visit)
+    public static function getReferrerSummaryForVisit($visit)
     {
         $referrerType = $visit->getColumn('referrerType');
         if ($referrerType === false
@@ -468,7 +471,9 @@ class API
             $result = $visit->getColumn('referrerName');
 
             $keyword = $visit->getColumn('referrerKeyword');
-            if ($keyword !== false) {
+            if ($keyword !== false
+                && $keyword != APIReferers::getKeywordNotDefinedString()
+            ) {
                 $result .= ' (' . $keyword . ')';
             }
         } else if ($referrerType == 'campaign') {
diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php
index bd556d2a89..c31b73c52f 100644
--- a/plugins/Live/Controller.php
+++ b/plugins/Live/Controller.php
@@ -170,6 +170,7 @@ class Controller extends \Piwik\Controller
             'date' => false
         ));
         $view->visitData = $visits->getFirstRow()->getColumns();
+        $view->visitReferralSummary = API::getReferrerSummaryForVisit($visits->getFirstRow());
         $view->showLocation = true;
         $this->setWidgetizedVisitorProfileUrl($view);
         $view->exportLink = $this->getVisitorProfileExportLink();
diff --git a/plugins/Live/stylesheets/live.less b/plugins/Live/stylesheets/live.less
index fe75ab6f0a..1dffbf56b4 100644
--- a/plugins/Live/stylesheets/live.less
+++ b/plugins/Live/stylesheets/live.less
@@ -192,4 +192,12 @@ a.visitor-log-visitor-profile-link {
     img {
         margin-top:-2px;
     }
+}
+
+.visitorLog,.visitor-profile-actions {
+    > li > div {
+        display:inline-block;
+        width:95%;
+        vertical-align:top;
+    }
 }
\ No newline at end of file
diff --git a/plugins/Live/stylesheets/visitor_profile.less b/plugins/Live/stylesheets/visitor_profile.less
index 6ded240325..1301022b8c 100644
--- a/plugins/Live/stylesheets/visitor_profile.less
+++ b/plugins/Live/stylesheets/visitor_profile.less
@@ -21,7 +21,7 @@
     }
 
     p {
-        font-size:13px;
+        font-size:14px;
         color:#5e5e5c;
         line-height:20px;
     }
@@ -211,11 +211,15 @@
 
 .visitor-profile-avatar ul li {
     display:inline-block;
-    height:24px;
+    min-height:24px;
     border-bottom:1px solid #d1cec8;
     width:100%;
 }
 
+.visitor-profile-id {
+    height:24px;
+}
+
 .visitor-profile-avatar ul li:last-child {
     border-bottom:none;
 }
@@ -383,9 +387,10 @@
     }
 
     ol > li ol li .action-list-url {
-        margin-left:15px;
+        margin-left:4px;
         line-height:14px;
         display:inline-block;
+        font-size:13px;
     }
 
     ol > li ol li img {
@@ -436,9 +441,8 @@
 }
 
 span.visitor-profile-goal-name {
-    font-weight:bold;
     font-style:italic;
-    font-size:13px;
+    font-size:14px;
 }
 
 .visitor-profile-see-more-cvars {
diff --git a/plugins/Live/templates/_actionsList.twig b/plugins/Live/templates/_actionsList.twig
index ef46ab86dd..611e9f0dc3 100644
--- a/plugins/Live/templates/_actionsList.twig
+++ b/plugins/Live/templates/_actionsList.twig
@@ -17,12 +17,13 @@
 {{ action.url }}{% endif %}{% if customVariablesTooltip|trim|length %}
 
 {{ customVariablesTooltip|trim }}{% endif -%}
-            {%- if action.timeSpentPretty is defined %}
-
-{{ 'General_TimeOnPage'|translate }}: {{ action.timeSpentPretty|raw }}{% endif -%}
             {%- if action.generationTime is defined %}
 
-{{ 'General_ColumnGenerationTime'|translate }}: {{ action.generationTime|raw }}{% endif %}">
+{{ 'General_ColumnGenerationTime'|translate }}: {{ action.generationTime|raw }}{% endif %}
+            {%- if action.timeSpentPretty is defined %}
+
+{{ 'General_TimeOnPage'|translate }}: {{ action.timeSpentPretty|raw }}{% endif -%}">
+            <div>
             {% if action.type == 'ecommerceOrder' or action.type == 'ecommerceAbandonedCart' %}
             {# Ecommerce Abandoned Cart / Ecommerce Order #}
                 <img src="{{ action.icon }}"/>
@@ -107,6 +108,7 @@
                     <strong>{{ action.revenue|money(clientSideParameters.idSite)|raw }}</strong>
                 {% endif %}
             {% endif %}
+            </div>
         </li>
     {% endif %}
 {% endfor %}
\ No newline at end of file
diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig
index bc0c3243b4..cd8f31ad75 100644
--- a/plugins/Live/templates/_dataTableViz_visitorLog.twig
+++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig
@@ -133,11 +133,12 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit
                         {% if visitor.getColumn('referrerKeyword') is not empty %} - {{ visitor.getColumn('referrerKeyword') }}{% endif %}
                     {% endif %}
                     {% if visitor.getColumn('referrerType') == 'search' %}
+                        {%- set keywordNotDefined = 'General_NotDefined'|translate('General_ColumnKeyword'|translate) -%}
                         {% if visitor.getColumn('searchEngineIcon') %}
                             <img src="{{ visitor.getColumn('searchEngineIcon') }}" alt="{{ visitor.getColumn('referrerName') }}"/>
                         {% endif %}
                         {{ visitor.getColumn('referrerName') }}
-                        {% if visitor.getColumn('referrerKeyword') is not empty %}{{ 'Referers_Keywords'|translate }}:
+                        {% if visitor.getColumn('referrerKeyword') is not empty and visitor.getColumn('referrerKeyword') != keywordNotDefined %}{{ 'Referers_Keywords'|translate }}:
                             <br/>
                             <a href="{{ visitor.getColumn('referrerUrl') }}" target="_blank" style="text-decoration:underline;">
                                 "{{ visitor.getColumn('referrerKeyword') }}"</a>
diff --git a/plugins/Live/templates/getSingleVisitSummary.twig b/plugins/Live/templates/getSingleVisitSummary.twig
index 4fcc03dd20..fa6195df0e 100644
--- a/plugins/Live/templates/getSingleVisitSummary.twig
+++ b/plugins/Live/templates/getSingleVisitSummary.twig
@@ -32,6 +32,13 @@
             </div>
         </li>
         <li><span>{{ 'UserSettings_ColumnResolution'|translate }}</span><strong>{{ visitData.resolution }}</strong></li>
+        {% if visitReferralSummary is defined %}
+        {%- set keywordNotDefined = 'General_NotDefined'|translate('General_ColumnKeyword'|translate) -%}
+        <li>
+            <span>{{ 'General_DateRangeFrom'|translate }}</span>
+            <strong {% if visitData.referrerType == 'search' and '(' not in visitReferralSummary %}title="{{ keywordNotDefined }}"{% endif %}>{{ visitReferralSummary }}</strong>
+        </li>
+        {% endif %}
     </ul>
 </div>
 <div class="visitor-profile-latest-visit-column">
diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig
index 85b4345ebd..55625942d6 100644
--- a/plugins/Live/templates/getVisitorProfilePopup.twig
+++ b/plugins/Live/templates/getVisitorProfilePopup.twig
@@ -30,8 +30,8 @@
                 <div class="visitor-profile-summary">
                     <h1>{{ 'General_Summary'|translate }}</h1>
                     <div>
-                        <p>{{ 'Live_VisitSummary'|translate('<strong>', visitorData.totalVisitDurationPretty, '</strong>', '<strong>', visitorData.totalActions, visitorData.totalVisits, '</strong>')|raw }}</p>
-                        <p><strong>{{ 'Live_ConvertedNGoals'|translate(visitorData.totalGoalConversions) }}</strong>
+                        <p>{{ 'Live_VisitSummary'|translate('<strong>' ~ visitorData.totalVisitDurationPretty ~ '</strong>', '', '', '<strong>', visitorData.totalActions, visitorData.totalVisits, '</strong>')|raw }}</p>
+                        <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:] -%}
@@ -60,22 +60,25 @@
                     </div>
                 </div>
                 <div class="visitor-profile-important-visits">
+                    {%- set keywordNotDefined = 'General_NotDefined'|translate('General_ColumnKeyword'|translate) -%}
                     <div>
                         <h1>{% if visitorData.visitsAggregated == 100 %}{{ 'General_Visit'|translate }}# 100{% else %}{{ 'Live_FirstVisit'|translate }}{% endif %}</h1>
                         <div>
                             <p><strong>{{ visitorData.firstVisit.prettyDate }}</strong><span>&nbsp;- {{ 'UserCountryMap_DaysAgo'|translate(visitorData.firstVisit.daysAgo) }}</span></p>
                             <p><span>{{ 'General_FromReferrer'|translate }}:</span>
-                            <strong>{{ visitorData.firstVisit.referralSummary }}</strong></p>
+                            <strong {% if visitorData.firstVisit.referrerType == 'search' and '(' not in visitorData.firstVisit.referralSummary %}title="{{ keywordNotDefined }}"{% endif %}>{{ visitorData.firstVisit.referralSummary }}</strong></p>
                         </div>
                     </div>
+                    {% if visitorData.lastVisits.getRowsCount() != 1 %}
                     <div>
                         <h1>{{ 'Live_LastVisit'|translate }}</h1>
                         <div>
                             <p><strong>{{ visitorData.lastVisit.prettyDate }}</strong><span>&nbsp;- {{ 'UserCountryMap_DaysAgo'|translate(visitorData.lastVisit.daysAgo) }}</span></p>
                             <p><span>{{ 'General_FromReferrer'|translate }}:</span>
-                            <strong>{{ visitorData.lastVisit.referralSummary }}</strong></p>
+                            <strong {% if visitorData.lastVisit.referrerType == 'search' and '(' not in visitorData.lastVisit.referralSummary %}title="{{ keywordNotDefined }}"{% endif %}>{{ visitorData.lastVisit.referralSummary }}</strong></p>
                         </div>
                     </div>
+                    {% endif %}
                 </div>
                 <div>
                     <div class="visitor-profile-location">