diff options
8 files changed, 23 insertions, 13 deletions
diff --git a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png index 5c798816e7..04ed00d9a4 100644 --- a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png +++ b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d561093a3d75de90996f2cc2e46ba72c181cfa7186f307267e08a3ea3055432 -size 183405 +oid sha256:182c8776bdf177945552a5845b8e47fb2473b73e274253190e8682b12c50549e +size 177521 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png index 8f6b109c3e..02c9c00dbc 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5208b9f5357685bee38a8c97544368bcfeb4c7b9c0ebe0c2a61e3a85d791c01a -size 183858 +oid sha256:4b837c5b31cc067d7f45970989f6412c2c6d224d12d1e9756e686605aafa20f9 +size 177892 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png index 395edfff42..5968874a82 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:703af3646babff2759ce67616d462b155b49c99b2b3b71247d3a45d6c5042380 -size 182971 +oid sha256:65e373f1147fbdbe2f97f4083241c776aac3b18848755a1e83f0ae2e0ca84e53 +size 176964 diff --git a/plugins/UserCountryMap/javascripts/visitor-map.js b/plugins/UserCountryMap/javascripts/visitor-map.js index 9f9f94153c..396fac73a3 100644 --- a/plugins/UserCountryMap/javascripts/visitor-map.js +++ b/plugins/UserCountryMap/javascripts/visitor-map.js @@ -69,7 +69,6 @@ citySelectedLabelColor = colors['city-selected-label-color'], regionLayerStrokeColor = colors['region-layer-stroke-color'], hasUserZoomed = false; - ; /* * our own custom selector to only select stuff of this widget @@ -375,8 +374,8 @@ infobtn.off('mouseenter').on('mouseenter',function (e) { $(infobtn.data('tooltip-target')).show(); }).off('mouseleave').on('mouseleave', function (e) { - $(infobtn.data('tooltip-target')).hide(); - }); + $(infobtn.data('tooltip-target')).hide(); + }); $('.UserCountryMap-tooltip').hide(); } @@ -700,6 +699,11 @@ } function displayUnlocatableCount(unlocated, total, regionOrCity) { + + if (0 == unlocated) { + return; + } + $('.unlocated-stats').html( $('.unlocated-stats').data('tpl') .replace('%s', unlocated) diff --git a/plugins/UserCountryMap/stylesheets/visitor-map.less b/plugins/UserCountryMap/stylesheets/visitor-map.less index 6becb0c902..4c96011302 100644 --- a/plugins/UserCountryMap/stylesheets/visitor-map.less +++ b/plugins/UserCountryMap/stylesheets/visitor-map.less @@ -81,6 +81,7 @@ position: absolute; z-index: 700; opacity: 0.9; + display: none; } /* this should me moved to TableView css sometimes */ diff --git a/plugins/UserCountryMap/templates/visitorMap.twig b/plugins/UserCountryMap/templates/visitorMap.twig index cbfc53f02a..f87a2df356 100644 --- a/plugins/UserCountryMap/templates/visitorMap.twig +++ b/plugins/UserCountryMap/templates/visitorMap.twig @@ -20,6 +20,9 @@ </div> <div class="mapWidgetStatus"> {% if noData %} + {% if not isWidget %} + <h2>{{ 'UserCountryMap_VisitorMap'|translate }}</h2> + {% endif %} <div class="pk-emptyDataTable">{{ 'CoreHome_ThereIsNoDataForThisReport'|translate }}</div> {% else %} <span class="loadingPiwik"> @@ -28,6 +31,7 @@ </span> {% endif %} </div> + {% if not noData %} <div class="dataTableFeatures" style="padding-top:0;"> <div class="dataTableFooterIcons"> <div class="dataTableFooterWrap" var="graphVerticalBar"> @@ -70,6 +74,7 @@ </select> </div> </div> + {% endif %} </div> </section> diff --git a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png index b35c9c0fe3..2b903e0d67 100644 --- a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png +++ b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9fb473bc96a5749312cc1928b506df81fbabf474c02dd465d22c8c9c52a7ef04 -size 114792 +oid sha256:31f3a972fd727b7be525d242a0c95ffafc619ce64969c981d783f5151dedafa3 +size 114527 diff --git a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png index 3f2df782b7..6e61d68d4d 100644 --- a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png +++ b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1679723fce50ccd125e64475330ae1dbf134ef70ec0fd157ff5caeb315e0a99a -size 114252 +oid sha256:826285bbd7d36882f590a4d6a489a2161fb42e2683b3b44809524e6b6ea35184 +size 113986 |
