diff options
| author | Benaka Moorthi <benaka.moorthi@gmail.com> | 2013-09-21 11:58:12 +0400 |
|---|---|---|
| committer | Benaka Moorthi <benaka.moorthi@gmail.com> | 2013-09-21 11:58:12 +0400 |
| commit | 59e7280e088150da6e6551c30bdf2097cb3d2ed8 (patch) | |
| tree | 1e20d2cb90b7a5c24e715c1cdf40b5aa9f6b48fd /plugins/Live | |
| parent | 61f19d472a6c42bd586bde123052dd29ef407d47 (diff) | |
Refs #3089, show provider on hover of IP address, show browser plugin info on hover of browser and fix bug in realtime map URL used in visitor profile.
Diffstat (limited to 'plugins/Live')
| -rw-r--r-- | plugins/Live/Controller.php | 3 | ||||
| -rw-r--r-- | plugins/Live/templates/getSingleVisitSummary.twig | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php index f7a7a7079c..bd556d2a89 100644 --- a/plugins/Live/Controller.php +++ b/plugins/Live/Controller.php @@ -224,6 +224,7 @@ class Controller extends \Piwik\Controller 'module' => 'UserCountryMap', 'action' => 'realtimeMap', 'segment' => self::getSegmentWithVisitorId(), + 'visitorId' => false, 'changeVisitAlpha' => 0, 'removeOldVisits' => 0, 'realtimeWindow' => 'false', @@ -243,7 +244,7 @@ class Controller extends \Piwik\Controller $segment = urldecode($segment) . ';'; } - $idVisitor = Common::getRequestVar('idVisitor', false); + $idVisitor = Common::getRequestVar('visitorId', false); if ($idVisitor === false) { $idVisitor = Request::processRequest('Live.getMostRecentVisitorId'); } diff --git a/plugins/Live/templates/getSingleVisitSummary.twig b/plugins/Live/templates/getSingleVisitSummary.twig index 151e1cd27d..7b57636dab 100644 --- a/plugins/Live/templates/getSingleVisitSummary.twig +++ b/plugins/Live/templates/getSingleVisitSummary.twig @@ -11,7 +11,9 @@ {% endif %} <div class="visitor-profile-latest-visit-column"> <ul> - <li><span>{{ 'General_IP'|translate }}</span><strong>{{ visitData.visitIp }}</strong></li> + <li> + <span>{{ 'General_IP'|translate }}</span><strong {% if visitData.providerName is not empty %}title="{{ 'Provider_ColumnProvider'|translate }}: {{ visitData.providerName }}"{% endif %}>{{ visitData.visitIp }}</strong> + </li> <li class="visitor-profile-id"> <span>{{ 'General_Id'|translate|upper }}</span> {% if widgetizedLink is defined %}<a class="visitor-profile-widget-link" href="{{ widgetizedLink }}" target="_blank" title="{{ 'General_OpenInNewWindow'|translate }} - {{ 'Live_VisitorProfile'|translate }} {{ 'General_Id'|translate|upper }} {{ visitData.visitorId }}">{% endif %} @@ -22,7 +24,7 @@ </a> </li> <li> - <div class="visitor-profile-browser"> + <div class="visitor-profile-browser" title="{% if visitData.plugins is defined %}{{ 'UserSettings_BrowserWithPluginsEnabled'|translate(visitData.browserName, visitData.plugins) }}{% else %}{{ 'UserSettings_BrowserWithNoPluginsEnabled'|translate(visitData.browserName) }}{% endif %}"> <img src="{{ visitData.browserIcon }}"/><span>{{ visitData.browserName|split(' ')[0] }}</span> </div> <div class="visitor-profile-os"> |