diff options
| author | sgiehl <stefan@piwik.org> | 2013-08-14 22:35:44 +0400 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2013-08-15 00:57:24 +0400 |
| commit | 6e61f2725126e276862ec6153e80e5f6db5cb4e1 (patch) | |
| tree | 98087b064adf11ad1781345de9f72beb1c761ddb /plugins/UserCountryMap | |
| parent | 512a8f82444d6293ee0544354da888553f01f29d (diff) | |
replaced presentational html tags
Diffstat (limited to 'plugins/UserCountryMap')
| -rw-r--r-- | plugins/UserCountryMap/javascripts/realtime-map.js | 8 | ||||
| -rw-r--r-- | plugins/UserCountryMap/javascripts/visitor-map.js | 6 | ||||
| -rw-r--r-- | plugins/UserCountryMap/templates/visitorMap.twig | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/plugins/UserCountryMap/javascripts/realtime-map.js b/plugins/UserCountryMap/javascripts/realtime-map.js index ed06e8a9a1..a4182ae2a1 100644 --- a/plugins/UserCountryMap/javascripts/realtime-map.js +++ b/plugins/UserCountryMap/javascripts/realtime-map.js @@ -130,7 +130,7 @@ } function relativeTime(ds) { - var val = function (val) { return '<b>' + Math.round(val) + '</b>'; }; + var val = function (val) { return '<strong>' + Math.round(val) + '</strong>'; }; return (ds < 90 ? _.seconds_ago.replace('%s', val(ds)) : ds < 5400 ? _.minutes_ago.replace('%s', val(ds / 60)) : ds < 129600 ? _.hours_ago.replace('%s', val(ds / 3600)) @@ -158,11 +158,11 @@ // local time '<small>' + _.local_time + ': ' + r.visitLocalTime + '</small><br />' + // goals, if available - (self.config.siteHasGoals && r.goalConversions ? '<small>' + _.goal_conversions.replace('%s', '<b>' + r.goalConversions + '</b>') + + (self.config.siteHasGoals && r.goalConversions ? '<small>' + _.goal_conversions.replace('%s', '<strong>' + r.goalConversions + '</strong>') + (r.searches > 0 ? ', ' + _.searches.replace('%s', r.searches) : '') + '</small><br />' : '') + // actions and searches - '<small>' + _.actions.replace('%s', '<b>' + r.actions + '</b>') + - (r.searches > 0 ? ', ' + _.searches.replace('%s', '<b>' + r.searches + '</b>') : '') + '</small>'; + '<small>' + _.actions.replace('%s', '<strong>' + r.actions + '</strong>') + + (r.searches > 0 ? ', ' + _.searches.replace('%s', '<strong>' + r.searches + '</strong>') : '') + '</small>'; } /* diff --git a/plugins/UserCountryMap/javascripts/visitor-map.js b/plugins/UserCountryMap/javascripts/visitor-map.js index 5231865583..963a0f3ebc 100644 --- a/plugins/UserCountryMap/javascripts/visitor-map.js +++ b/plugins/UserCountryMap/javascripts/visitor-map.js @@ -114,7 +114,7 @@ function formatValueForTooltips(data, metric, id) { var val = data[metric] % 1 === 0 || Number(data[metric]) != data[metric] ? data[metric] : data[metric].toFixed(1), - v = _[metric].replace('%s', '<b>' + val + '</b>'); + v = _[metric].replace('%s', '<strong>' + val + '</strong>'); if (val == 1 && metric == 'nb_visits') v = _.one_visit; @@ -404,7 +404,7 @@ $('.map-stats').html(formatValueForTooltips(UserCountryMap.countriesByIso[id], metric, 'world')); } else { $('.map-stats').html( - _.nb_visits.replace('%s', '<b>' + formatNumber(totalVisits) + '</b>') + (id != 'world' ? ' (' + + _.nb_visits.replace('%s', '<strong>' + formatNumber(totalVisits) + '</strong>') + (id != 'world' ? ' (' + formatPercentage(totalVisits / worldTotalVisits) + ')' : '') ); } @@ -709,7 +709,7 @@ var metric = $$('.userCountryMapSelectMetrics').val(), region = regionDict[regionCode(data)]; if (region === undefined) { - return '<h3>' + data.name + '</h3><p>' + _.nb_visits.replace('%s', '<b>0</b>') + '</p>'; + return '<h3>' + data.name + '</h3><p>' + _.nb_visits.replace('%s', '<strong>0</strong>') + '</p>'; } return '<h3>' + data.name + '</h3>' + formatValueForTooltips(region, metric, iso); diff --git a/plugins/UserCountryMap/templates/visitorMap.twig b/plugins/UserCountryMap/templates/visitorMap.twig index 53a7974211..8e3308b297 100644 --- a/plugins/UserCountryMap/templates/visitorMap.twig +++ b/plugins/UserCountryMap/templates/visitorMap.twig @@ -4,7 +4,7 @@ <div class="UserCountryMap-overlay UserCountryMap-title"> <div class="content"> <!--<div class="map-title" style="font-weight:bold; color:#9A9386;"></div>--> - <div class="map-stats" style="color:#565656;"><b></b></div> + <div class="map-stats" style="color:#565656;"></div> </div> </div> <div class="UserCountryMap-overlay UserCountryMap-legend"> |