Show city / country in visitor details (#12534)

* Show city or country in visitor details

* update UI files

* Show country flag and location only if not unknown

* hide flag icon in icon list

* update UI files

8 files changed, 26 insertions, 12 deletions

diff --git a/plugins/Live/stylesheets/live.less b/plugins/Live/stylesheets/live.less
index 84e8a818b3..aadeb02e13 100644
--- a/plugins/Live/stylesheets/live.less
+++ b/plugins/Live/stylesheets/live.less
@@ -254,6 +254,12 @@ ol.visitorLog p {
   display: block;
 }
 
+.visitor-log-ip-location img.flag {
+  border: 1px solid lightgray;
+  top: 2px;
+  position: relative;
+}
+
 .visitor-log-page-list {
   position:relative;
   margin-top: 7px;
@@ -325,6 +331,10 @@ a.visitor-log-visitor-profile-link {
     height: 16px;
 }
 
+.visitorLogIconWithDetails.flag {
+  display: none;
+}
+
 .visitorLogIconWithDetails.flag>img {
     border: 1px solid lightgray;
 }
diff --git a/plugins/Live/templates/_visitorDetails.twig b/plugins/Live/templates/_visitorDetails.twig
index 63edc4fd80..373342098a 100644
--- a/plugins/Live/templates/_visitorDetails.twig
+++ b/plugins/Live/templates/_visitorDetails.twig
@@ -9,6 +9,10 @@
 {% endif %}{% if visitInfo.getColumn('latitude') or visitInfo.getColumn('longitude') %}{{ visitInfo.getColumn('location') }}
 GPS (lat/long): {{ visitInfo.getColumn('latitude') }},{{ visitInfo.getColumn('longitude') }}{% endif %}">
     IP: {{ visitInfo.getColumn('visitIp') }}
+    <br />
+    {% if visitInfo.getColumn('location') != 'General_Unknown'|translate %}<span><img width="16" class="flag" src="{{ visitInfo.getColumn('countryFlag') }}"/>&nbsp;
+    {% if visitInfo.getColumn('city') is not empty %}{{ visitInfo.getColumn('city') }}{% else %}{{ visitInfo.getColumn('country') }}{% endif %}</span>{% endif %}
+
     {% if visitInfo.getColumn('userId') is not empty %}<br/><br/>{{ visitInfo.getColumn('userId')|raw }}{% endif %}
 </span>{% endif %}
 {% if isWidget %}
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png
index e06a947ad8..6dcf9b7c49 100644
--- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7deb4c75a3aad96ac2ee39bb2d952eb2f98b262dc1a4956045a0326ab369a5b5
-size 418228
+oid sha256:6e6866f7c40225bc98dca028c5e336eef4ae5b509f0ccffb6a4dcd683dcad918
+size 426702
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_actions.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_actions.png
index 64ea2ff07a..bf27d05005 100644
--- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_actions.png
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_actions.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b037f3af9bc98346aac92757f5bc77a53dac5775e2ed8e35332247cac8d9d2f2
-size 52278
+oid sha256:4beb6ed662dc8aadcef53eca9d784fbd614c4b9de38cdcfba2d37553c381f0b6
+size 52229
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png
index a8d407f7e5..b49d8d8c32 100644
--- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af7d5108a4d513e8b7e59cf13f51808b6ab954cf987aeb0c0befc3bad8ac098c
-size 435477
+oid sha256:030ac555a08cc92f21a0e307d4fc948eb15be328a5a189b711813e84b088ad78
+size 435506
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_action_details.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_action_details.png
index e02fcb47bf..73d17051d9 100644
--- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_action_details.png
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_action_details.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1c59aa70ac11c94f38e413ed6711dea7b63bf1f235fc34d4949ceb4930c575b9
-size 295370
+oid sha256:85cea21a0e32747f7352df9d4d3d362c723ab9f192d164d3d31b62f04d8103e2
+size 296509
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_actions_hidden.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_actions_hidden.png
index fbeb1fb72f..41dcd147da 100644
--- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_actions_hidden.png
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_actions_hidden.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:284c12edcb06e0a32411d92d7091f5e369b0b0742f5763f603e87cd3c3d99815
-size 261019
+oid sha256:c1c905fcbf5015a07008841e5cd6d7ea2ff3c002f37a6d0f9fedced980fa5952
+size 261207
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_visit_details.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_visit_details.png
index 8975c15ecf..435ec3ea9d 100644
--- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_visit_details.png
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_visit_details.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f8f7d7a6300f18d35a3d9ff17a49ea2b58d5ca233d3d360c91e357eba10862d
-size 271089
+oid sha256:224649f99fc683e792f6a94e2d55da000c92e51a5e62c95f40a8dfa245e79d54
+size 272054