From 4f67ac26c4a169c0b6e3d4e84ce63daa231a07ec Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Tue, 26 Feb 2013 13:13:18 +1300
Subject: [PATCH] Minor updates to maps
---
LEGALNOTICE | 9 +++++--
plugins/API/css/styles.css | 3 ++-
plugins/UserCountry/Controller.php | 1 -
plugins/UserCountry/templates/index.tpl | 27 ++++++++++---------
plugins/UserCountryMap/UserCountryMap.php | 2 +-
plugins/UserCountryMap/js/visitor-map.js | 3 ++-
.../UserCountryMap/templates/realtime-map.tpl | 22 ++++++++-------
7 files changed, 39 insertions(+), 28 deletions(-)
diff --git a/LEGALNOTICE b/LEGALNOTICE
index 6702ccb127..be17b77d20 100644
--- a/LEGALNOTICE
+++ b/LEGALNOTICE
@@ -40,7 +40,8 @@ CREDITS
For detailed contribution history, refer to the source, tickets,
patches, and Git revision history, available at
- http://dev.piwik.org/trac/.
+ http://dev.piwik.org/trac/
+ https://github.com/piwik/piwik
SEPARATELY LICENSED COMPONENTS AND LIBRARIES
@@ -99,10 +100,14 @@ THIRD-PARTY COMPONENTS AND LIBRARIES
Link: http://plugins.jquery.com/project/ScrollTo
License: Dual licensed: MIT or GPL
- Name: Tooltip
+ Name: jquery Tooltip
Link: http://bassistance.de/jquery-plugins/jquery-plugin-tooltip/
License: Dual licensed: MIT or GPL
+ Name: jquery placeholder
+ Link: http://mths.be/placeholder
+ License: Dual licensed: MIT or GPL
+
Name: json2.js
Link: http://json.org/
License: Public domain
diff --git a/plugins/API/css/styles.css b/plugins/API/css/styles.css
index b62e0c822e..2b2f547da6 100644
--- a/plugins/API/css/styles.css
+++ b/plugins/API/css/styles.css
@@ -1,4 +1,5 @@
-#token_auth {
+
+#token_auth {
background-color:#E8FFE9;
border:1px solid #00CC3A;
margin: 0 0 16px 8px;
diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php
index 037817d21d..07d5e24987 100644
--- a/plugins/UserCountry/Controller.php
+++ b/plugins/UserCountry/Controller.php
@@ -26,7 +26,6 @@ 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();
}
diff --git a/plugins/UserCountry/templates/index.tpl b/plugins/UserCountry/templates/index.tpl
index f443dd19d7..ab29fa57ef 100644
--- a/plugins/UserCountry/templates/index.tpl
+++ b/plugins/UserCountry/templates/index.tpl
@@ -2,27 +2,28 @@
<div id="leftcolumn">
{postEvent name="template_leftColumnUserCountry"}
-<h2>{'UserCountry_Continent'|translate}</h2>
-{$dataTableContinent}
+ <h2>{'UserCountry_Continent'|translate}</h2>
+ {$dataTableContinent}
-<div class="sparkline">
-{sparkline src=$urlSparklineCountries}
-{'UserCountry_DistinctCountries'|translate:"<strong>$numberDistinctCountries</strong>"}
-</div>
+ <div class="sparkline">
+ {sparkline src=$urlSparklineCountries}
+ {'UserCountry_DistinctCountries'|translate:"<strong>$numberDistinctCountries</strong>"}
+ </div>
+
+{postEvent name="template_footerUserCountry"}
</div>
<div id="rightcolumn">
-<h2>{'UserCountry_Country'|translate}</h2>
-{$dataTableCountry}
+ <h2>{'UserCountry_Country'|translate}</h2>
+ {$dataTableCountry}
-<h2>{'UserCountry_Region'|translate}</h2>
-{$dataTableRegion}
+ <h2>{'UserCountry_Region'|translate}</h2>
+ {$dataTableRegion}
-<h2>{'UserCountry_City'|translate}</h2>
-{$dataTableCity}
+ <h2>{'UserCountry_City'|translate}</h2>
+ {$dataTableCity}
</div>
-{postEvent name="template_footerUserCountry"}
diff --git a/plugins/UserCountryMap/UserCountryMap.php b/plugins/UserCountryMap/UserCountryMap.php
index 38c4e291cf..ad536bea20 100644
--- a/plugins/UserCountryMap/UserCountryMap.php
+++ b/plugins/UserCountryMap/UserCountryMap.php
@@ -19,7 +19,7 @@ class Piwik_UserCountryMap extends Piwik_Plugin
{
return array(
'name' => 'User Country Map',
- 'description' => 'This plugin provides the widgets Visitor Map and Real-time Map.',
+ 'description' => 'This plugin provides the widgets Visitor Map and Real-time Map. Note: Requires the UserCountry plugin enabled.',
'author' => 'Piwik',
'author_homepage' => 'http://piwik.org/',
'version' => Piwik_Version::VERSION
diff --git a/plugins/UserCountryMap/js/visitor-map.js b/plugins/UserCountryMap/js/visitor-map.js
index 7a6cedd508..34b1656706 100644
--- a/plugins/UserCountryMap/js/visitor-map.js
+++ b/plugins/UserCountryMap/js/visitor-map.js
@@ -255,7 +255,7 @@
// handle window resizes
$(window).off('resize').resize(onResizeLazy);
- // enable mertic changes
+ // enable metric changes
$$('.userCountryMapSelectMetrics').off('change').change(function() {
updateState(self.lastSelected);
});
@@ -284,6 +284,7 @@
})($$('.UserCountryMap-btn-region'));
// add loading indicator overlay
+
var bl = $('<div id="UserCountryMap-black"></div>');
bl.hide();
$$('.UserCountryMap_map').append(bl);
diff --git a/plugins/UserCountryMap/templates/realtime-map.tpl b/plugins/UserCountryMap/templates/realtime-map.tpl
index d4c2827f47..355f365189 100644
--- a/plugins/UserCountryMap/templates/realtime-map.tpl
+++ b/plugins/UserCountryMap/templates/realtime-map.tpl
@@ -129,15 +129,19 @@
{* If the map is loaded from the menu, do a few tweaks to clean up the display *}
{if $mapIsStandaloneNotWidget}
- $('.top_controls').hide();
- $('ul.nav').on('piwikSwitchPage', function(event, item) {ldelim}
- var clickedMenuIsNotMap = ($(item).text() != "{'UserCountryMap_RealTimeMap'|translate|escape:'js'}");
- if(clickedMenuIsNotMap) {ldelim}
- $('.top_controls').show();
- {rdelim}
- {rdelim});
- $('.realTimeMap_overlay').css('top', '0px');
- $('.realTimeMap_datetime').css('top', '20px');
+ function initStandaloneMap() {ldelim}
+ $('.top_controls').hide();
+ $('ul.nav').on('piwikSwitchPage', function(event, item) {ldelim}
+ var clickedMenuIsNotMap = ($(item).text() != "{'UserCountryMap_RealTimeMap'|translate|escape:'js'}");
+ if(clickedMenuIsNotMap) {ldelim}
+ $('.top_controls').show();
+ {rdelim}
+ {rdelim});
+ $('.realTimeMap_overlay').css('top', '0px');
+ $('.realTimeMap_datetime').css('top', '20px');
+ {rdelim}
+
+ initStandaloneMap();
{/if}
{literal}
--
GitLab