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:
authorStefan Giehl <stefan@piwik.org>2017-01-05 16:46:10 +0300
committerGitHub <noreply@github.com>2017-01-05 16:46:10 +0300
commit57e33fffc158ad086c6bf7c8fc5ce5e0a6263bb2 (patch)
tree30076ff6dd3e0a55e1ec158e46adccef09ab32b7 /plugins/UserCountryMap
parente0ea5d928a31a0baf14eff6c81bec442da20ebb7 (diff)
Improves various icons (#11148)
* updated browser and os icons (#11063) * updated browser-icons from https://github.com/Findus23/device-icons 72d5ffef94a597c4ba226b33344e0badaadc3c35 * added os icons * added previous icons * changed macOS icon * replaced optipng with pngquant (36% size reduction) * center icons vertically * sharpen icons * increased icon size to 48x48 * fixed visitorPopup and realtimemap * revert css change * fixed HTML-Reports * replaced Windows icon https://github.com/piwik/piwik/pull/11063#issuecomment-270221316 * max-width and max-height for datatables * removed submodul (sorry wrong commit) * add explicit max-size for dataTableRowActions * fixed UNK.png * first try at fixing system tests * fixed cookie.gif * updates icons in System tests * updated plugin icons (#11121) * updated plugin icons * increased icon size to 48x48 * updated searchEngine and social icons (#11093) * updated and added searchEngine and social icons * removed unnecessary icons * sharpen icons * increased icon size to 48x48 * fixed promovideo socialicons http://builds-artifacts.piwik.org/piwik/piwik/3.x-dev/21859/UIIntegrationTest_dashboard1.png * fixed xx.png * updates plugin icons in system tests * [tests] RockMelt has it's own icon * updates expected UI test files * submodule update * fix some last tests
Diffstat (limited to 'plugins/UserCountryMap')
-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 c116709ff7..105f12eae0 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) { return '<img src="' + src + '" alt="" class="icon" />&nbsp;'; };
+ ico = function (src, square) { return '<img' + (square ? ' width="16px" height="16px"' : '') + ' src="' + src + '" alt="" class="icon" />&nbsp;'; };
return '<h3>' + (r.city ? r.city + ' / ' : '') + r.country + '</h3>' +
// icons
- ico(r.countryFlag) + ico(r.browserIcon) + ico(r.operatingSystemIcon) + '<br/>' +
+ ico(r.countryFlag) + ico(r.browserIcon, true) + ico(r.operatingSystemIcon, true) + '<br/>' +
// User ID
(r.userId ? _pk_translate('General_UserId') + ':&nbsp;' + r.userId + '<br/>' : '') +
// last action