diff --git a/plugins/UserCountryMap/UserCountryMap.php b/plugins/UserCountryMap/UserCountryMap.php index 15f1d51d7eaa5d6ccf3c8859c810548d03ec9c7b..4315346eb11492cf4700b056cbdd3a52c1903baf 100644 --- a/plugins/UserCountryMap/UserCountryMap.php +++ b/plugins/UserCountryMap/UserCountryMap.php @@ -79,5 +79,6 @@ class UserCountryMap extends \Piwik\Plugin { $translationKeys[] = 'UserCountryMap_WithUnknownRegion'; $translationKeys[] = 'UserCountryMap_WithUnknownCity'; + $translationKeys[] = 'General_UserId'; } } diff --git a/plugins/UserCountryMap/javascripts/realtime-map.js b/plugins/UserCountryMap/javascripts/realtime-map.js index 32414a469d11fabad8aa44e2602609e6bbbbc408..4a0b9e317adcd3688110cc84eda1ce7c54883a02 100644 --- a/plugins/UserCountryMap/javascripts/realtime-map.js +++ b/plugins/UserCountryMap/javascripts/realtime-map.js @@ -142,7 +142,7 @@ 'visitLocalTime', 'city', 'country', 'referrerType', 'referrerName', 'referrerTypeName', 'browserIcon', 'operatingSystemIcon', 'countryFlag', 'idVisit', 'actionDetails', 'continentCode', - 'actions', 'searches', 'goalConversions', 'visitorId'].join(','), + 'actions', 'searches', 'goalConversions', 'visitorId', 'userId'].join(','), minTimestamp: firstRun ? -1 : lastTimestamp }); } @@ -214,6 +214,8 @@ return '<h3>' + (r.city ? r.city + ' / ' : '') + r.country + '</h3>' + // icons ico(r.countryFlag) + ico(r.browserIcon) + ico(r.operatingSystemIcon) + '<br/>' + + // User ID + (r.userId ? _pk_translate('General_UserId') + ': ' + r.userId + '<br/>' : '') + // last action (ad && ad.length && ad[ad.length - 1].pageTitle ? '<em>' + ad[ad.length - 1].pageTitle + '</em><br/>' : '') + // time of visit