Refs #1652

 * Adding map in Location report
 * Adding submenu Visitors> Real-time Map + Hiding controls(calendar/about box)
 * Enabling UserCountryMap plugin on update
 * Final LEGALNOTICE update

2 files changed, 10 insertions, 9 deletions

diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php
index f34aa33efb..037817d21d 100644
--- a/plugins/UserCountry/Controller.php
+++ b/plugins/UserCountry/Controller.php
@@ -26,7 +26,8 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin
 		$view->dataTableContinent = $this->getContinent(true);
 		$view->dataTableRegion = $this->getRegion(true);
 		$view->dataTableCity = $this->getCity(true);
-		
+		$view->visitorMap = Piwik_FrontController::getInstance()->fetchDispatch('UserCountryMap', 'visitorMap');
+
 		echo $view->render();
 	}
 	
@@ -344,7 +345,7 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin
 
 	function getContinent( $fetch = false)
 	{
-		$view = $this->getStandardDataTableUserCountry(__FUNCTION__, "UserCountry.getContinent", 'graphVerticalBar');
+		$view = $this->getStandardDataTableUserCountry(__FUNCTION__, "UserCountry.getContinent", 'table');
 		$view->disableSearchBox();
 		$view->disableOffsetInformationAndPaginationControls();
 		$view->setColumnTranslation('label', Piwik_Translate('UserCountry_Continent'));
diff --git a/plugins/UserCountry/templates/index.tpl b/plugins/UserCountry/templates/index.tpl
index 8053722b12..f443dd19d7 100644
--- a/plugins/UserCountry/templates/index.tpl
+++ b/plugins/UserCountry/templates/index.tpl
@@ -1,22 +1,22 @@
-{postEvent name="template_headerUserCountry"}
 
 <div id="leftcolumn">
-
-<h2>{'UserCountry_Country'|translate}</h2>
-{$dataTableCountry}
+{postEvent name="template_leftColumnUserCountry"}
 
 <h2>{'UserCountry_Continent'|translate}</h2>
 {$dataTableContinent}
 
 <div class="sparkline">
-	{sparkline src=$urlSparklineCountries}
-	{'UserCountry_DistinctCountries'|translate:"<strong>$numberDistinctCountries</strong>"}
-</div>	
+{sparkline src=$urlSparklineCountries}
+{'UserCountry_DistinctCountries'|translate:"<strong>$numberDistinctCountries</strong>"}
+</div>
 
 </div>
 
 <div id="rightcolumn">
 
+<h2>{'UserCountry_Country'|translate}</h2>
+{$dataTableCountry}
+
 <h2>{'UserCountry_Region'|translate}</h2>
 {$dataTableRegion}