diff options
author | sgiehl <stefan@piwik.org> | 2015-01-17 16:29:22 +0300 |
---|---|---|
committer | sgiehl <stefan@piwik.org> | 2015-01-17 16:29:22 +0300 |
commit | 6e28cba95ba5b1b53dc548c42d53ef006fb408ad (patch) | |
tree | a8530aee5269affecb588e617a85c606961406cf /plugins/Live | |
parent | 2926ed1c713ed5219e216366de476cc19ef771b1 (diff) | |
parent | 72af64bd3ccd1d9c1238c7c99319d48456377ad9 (diff) |
Merge branch 'master' into 6928
Diffstat (limited to 'plugins/Live')
-rw-r--r-- | plugins/Live/stylesheets/live.less | 4 | ||||
-rw-r--r-- | plugins/Live/templates/getLastVisitsStart.twig | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/Live/stylesheets/live.less b/plugins/Live/stylesheets/live.less index cb76a1078a..9e0f628904 100644 --- a/plugins/Live/stylesheets/live.less +++ b/plugins/Live/stylesheets/live.less @@ -18,7 +18,7 @@ } #visitsLive .country { - background: #FFF url(plugins/CoreHome/images/bullet1.gif) no-repeat scroll 0 0; + background: @theme-color-background-base url(plugins/CoreHome/images/bullet1.gif) no-repeat scroll 0 0; } #visitsLive .referrer { @@ -35,7 +35,7 @@ } #visitsLive .settings { - background: #FFF none repeat scroll 0 0; + background: @theme-color-background-base none repeat scroll 0 0; } #visitsLive .settings a { diff --git a/plugins/Live/templates/getLastVisitsStart.twig b/plugins/Live/templates/getLastVisitsStart.twig index ce7af8e36d..372daf2801 100644 --- a/plugins/Live/templates/getLastVisitsStart.twig +++ b/plugins/Live/templates/getLastVisitsStart.twig @@ -9,7 +9,7 @@ <span style="display:none;" class="serverTimestamp">{{ visitor.serverTimestamp|raw }}</span> {{ visitor.serverDatePretty }} - {{ visitor.serverTimePretty }} {% if visitor.visitDuration > 0 %}<em>({{ visitor.visitDurationPretty|raw }})</em>{% endif %} {% if visitor.countryFlag is defined %} <img src="{{ visitor.countryFlag }}" title="{{ visitor.location }}, {{ 'Provider_ColumnProvider'|translate }} {% if visitor.providerName is defined %}{{ visitor.providerName }}{% endif %}"/>{% endif %} - {% if visitor.browserIcon is defined %} <img src="{{ visitor.browserIcon }}" title="{{ visitor.browserName }}, {{ 'General_Plugins'|translate }}: {{ visitor.plugins }}"/>{% endif %} + {% if visitor.browserIcon is defined %} <img src="{{ visitor.browserIcon }}" title="{{ visitor.browserName }}{% if visitor.plugins is defined %}, {{ 'General_Plugins'|translate }}: {{ visitor.plugins }}{% endif %}"/>{% endif %} {% if visitor.operatingSystemIcon is defined %} <img src="{{ visitor.operatingSystemIcon }}" title="{{ visitor.operatingSystem }}{% if visitor.resolution is defined %}, {{ visitor.resolution }}{% endif %}"/>{% endif %} {% if visitor.visitConverted %} |