diff options
author | diosmosis <benaka@piwik.pro> | 2014-11-26 20:15:34 +0300 |
---|---|---|
committer | diosmosis <benaka@piwik.pro> | 2014-11-26 20:15:34 +0300 |
commit | dd0212dbec9a0b636befffb76cef994358985575 (patch) | |
tree | 15c97dfc93388b6c3e7ba495d2bafbcc0c01461d /plugins/Live | |
parent | 2183e1c6fe35dbd42714985ba9be52137c843dcf (diff) | |
parent | c23bff3e2ead46dd43533a6d54788c63fa14bced (diff) |
Merge branch 'master' into processed_metrics_metadata
Conflicts:
tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf
tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
Diffstat (limited to 'plugins/Live')
-rw-r--r-- | plugins/Live/templates/getSingleVisitSummary.twig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/Live/templates/getSingleVisitSummary.twig b/plugins/Live/templates/getSingleVisitSummary.twig index 9206c5ac51..77f1c8f2bb 100644 --- a/plugins/Live/templates/getSingleVisitSummary.twig +++ b/plugins/Live/templates/getSingleVisitSummary.twig @@ -31,7 +31,7 @@ {% endif %} <div class="visitor-profile-os"> - {% if visitData.operatingSystemIcon is defined %}<img src="{{ visitData.operatingSystemIcon }}"/>{% endif %}{% if visitData.operatingSystemShortName is defined %}<span>{{ visitData.operatingSystemShortName }}</span>{% endif %} + {% if visitData.operatingSystemIcon is defined %}<img src="{{ visitData.operatingSystemIcon }}"/>{% endif %}{% if visitData.operatingSystem is defined %}<span>{{ visitData.operatingSystem }}</span>{% endif %} </div> </li> {% if visitData.resolution is defined %}<li><span>{{ 'UserSettings_ColumnResolution'|translate }}</span><strong>{{ visitData.resolution }}</strong></li>{% endif %} |