From 635cca81ecb819bdb37eb44e7bf2862d9af85a39 Mon Sep 17 00:00:00 2001
From: Gregor Aisch <contact@vis4.net>
Date: Wed, 27 Feb 2013 22:09:25 +0100
Subject: [PATCH] hiding visitor map if there's no data
---
plugins/UserCountryMap/.gitignore | 1 +
plugins/UserCountryMap/Controller.php | 1 +
plugins/UserCountryMap/css/visitor-map.css | 2 +-
plugins/UserCountryMap/templates/visitor-map.tpl | 11 +++++++----
4 files changed, 10 insertions(+), 5 deletions(-)
create mode 100644 plugins/UserCountryMap/.gitignore
diff --git a/plugins/UserCountryMap/.gitignore b/plugins/UserCountryMap/.gitignore
new file mode 100644
index 0000000000..91c1137523
--- /dev/null
+++ b/plugins/UserCountryMap/.gitignore
@@ -0,0 +1 @@
+deploy.sh
\ No newline at end of file
diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php
index 31e5e69630..13afafba14 100644
--- a/plugins/UserCountryMap/Controller.php
+++ b/plugins/UserCountryMap/Controller.php
@@ -82,6 +82,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller
$config['svgBasePath'] = 'plugins/UserCountryMap/svg/';
$config['mapCssPath'] = 'plugins/UserCountryMap/css/map.css';
$view->config = json_encode($config);
+ $view->noData = $config['visitsSummary']['nb_visits'] === 0;
echo $view->render();
}
diff --git a/plugins/UserCountryMap/css/visitor-map.css b/plugins/UserCountryMap/css/visitor-map.css
index 83bc8dee75..abc5360654 100644
--- a/plugins/UserCountryMap/css/visitor-map.css
+++ b/plugins/UserCountryMap/css/visitor-map.css
@@ -91,7 +91,7 @@
}
.mapWidgetStatus {
- height: 100px;
+ padding-bottom: 24px;
}
.widgetUserCountryMapvisitorMap .widgetTop .button {
diff --git a/plugins/UserCountryMap/templates/visitor-map.tpl b/plugins/UserCountryMap/templates/visitor-map.tpl
index 4a69c65c37..00a11924c8 100644
--- a/plugins/UserCountryMap/templates/visitor-map.tpl
+++ b/plugins/UserCountryMap/templates/visitor-map.tpl
@@ -18,12 +18,13 @@
<div class="UserCountryMap-info-btn" data-tooltip-target=".UserCountryMap-tooltip"></div>
</div>
<div class="mapWidgetStatus">
+ {if $noData }
+ <div class="pk-emptyDataTable">{'CoreHome_ThereIsNoDataForThisReport'|translate}</div>
+ {else}
<span class="loadingPiwik">
<img src="{$piwikUrl}themes/default/images/loading-blue.gif"> {'General_LoadingData'|translate}...
</span>
- <span class="noDataForReport" style="display:none">
- {'CoreHome_ThereIsNoDataForThisReport'|translate}...
- </span>
+ {/if}
</div>
<div class="dataTableFeatures" style="padding-top:0px;">
<div class="dataTableFooterIcons">
@@ -64,6 +65,8 @@
</div>
</div>
+{if !$noData }
+
<!-- configure some piwik vars -->
<script type="text/javascript">
@@ -96,4 +99,4 @@
{/literal}
</script>
-
+{/if}
--
GitLab