Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Winkler <Findus23@users.noreply.github.com>2017-03-29 23:19:15 +0300
committerMatthieu Aubry <mattab@users.noreply.github.com>2017-03-29 23:19:15 +0300
commita21b868d63b1a210016c9a43a3a470b5e88f6c64 (patch)
tree5190179fd24d4bb8bf9f40338eae3a3b66a1ca5e /plugins/UserCountryMap/javascripts
parent9c86cd6f9cbcb8c0bbb2825f725658f2b6b1fc3f (diff)
New flag icons (#11553)
* updated flag icons * remove lines completly * Visitors in Real-time * added ti flag * fix merge * readd logoHeight * remove flags from plugins/UserCountry/images/ * change flag directory * (hopefully) fix all tests * UserCountry system tests * Fix tests refs https://github.com/piwik/piwik/pull/11553 * Fixed CustomDimensions tests * remove unused flags * remove flag of united nations * System tests with new path * light border around flags in goals and live view * Fix BC system test * border around flag in visitor profile * Border around country flags in reports * border around flag icons in HTML reports * simpler css * System tests * UI tests show new flags + borders around them
Diffstat (limited to 'plugins/UserCountryMap/javascripts')
-rw-r--r--plugins/UserCountryMap/javascripts/realtime-map.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/UserCountryMap/javascripts/realtime-map.js b/plugins/UserCountryMap/javascripts/realtime-map.js
index 105f12eae0..8e1240228c 100644
--- a/plugins/UserCountryMap/javascripts/realtime-map.js
+++ b/plugins/UserCountryMap/javascripts/realtime-map.js
@@ -215,10 +215,10 @@
function visitTooltip(r) {
var ds = new Date().getTime() / 1000 - r.lastActionTimestamp,
ad = r.actionDetails,
- ico = function (src, square) { return '<img' + (square ? ' width="16px" height="16px"' : '') + ' src="' + src + '" alt="" class="icon" />&nbsp;'; };
+ ico = function (src) { return '<img height="16px" src="' + src + '" alt="" class="icon" />&nbsp;'; };
return '<h3>' + (r.city ? r.city + ' / ' : '') + r.country + '</h3>' +
// icons
- ico(r.countryFlag) + ico(r.browserIcon, true) + ico(r.operatingSystemIcon, true) + '<br/>' +
+ ico(r.countryFlag) + ico(r.browserIcon) + ico(r.operatingSystemIcon) + '<br/>' +
// User ID
(r.userId ? _pk_translate('General_UserId') + ':&nbsp;' + r.userId + '<br/>' : '') +
// last action