diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2019-02-18 14:16:34 +0300 |
|---|---|---|
| committer | Stefan Giehl <stefan@matomo.org> | 2019-02-18 14:16:34 +0300 |
| commit | 99d42f5b8ca81f5481635c0cbea794d4b7de783b (patch) | |
| tree | 0daccf5d999bf093e6b2baebcf8b3b1c5565f4bf | |
| parent | 7cf47ffa7577bb4a4c33266cd1b6c0be53e07236 (diff) | |
Add spans to realtime visitor log tooltips. (#14050)
* Add spans to visitor log tooltips.
* Extra newline for tooltip.
3 files changed, 10 insertions, 8 deletions
diff --git a/plugins/Live/templates/getLastVisitsStart.twig b/plugins/Live/templates/getLastVisitsStart.twig index c4bc6363a6..adf24ce9c3 100644 --- a/plugins/Live/templates/getLastVisitsStart.twig +++ b/plugins/Live/templates/getLastVisitsStart.twig @@ -75,12 +75,14 @@ {% if action.type == 'action' %} {# white spacing matters as Chrome tooltip display whitespaces #} {% set title %} -{% if action.pageTitle is not empty %}{{ action.pageTitle }}{% endif %} +{% if action.url|trim is not empty %}<span class='tooltip-action-url'>{{ action.url }}</span>{% endif %} -{{ action.serverTimePretty }} -{% if action.timeSpentPretty is defined %}{{ 'General_TimeOnPage'|translate }}: {{ action.timeSpentPretty|raw }}{% endif %} +{% if action.pageTitle is not empty %}<span class='tooltip-action-page-title'>{{ action.pageTitle }}</span>{% endif %} + +<span class="tooltip-action-server-time">{{ action.serverTimePretty }}</span> + {% if action.timeSpentPretty is defined %}<span class='tooltip-time-on-page'>{{ 'General_TimeOnPage'|translate }}: {{ action.timeSpentPretty|raw }}</span>{% endif %} {%- endset %} - <img class='iconPadding' src="{{ action.icon }}" title="{% if action.url|trim is not empty %}{{ action.url|e('html_attr') }}<br/>{% endif %}{{- title -}}"/> + <img class='iconPadding' src="{{ action.icon }}" title="{{- title|e('html_attr') -}}"/> {% elseif action.type == 'outlink' or action.type == 'download' %} <img class='iconPadding' src="{{ action.icon }}" title="{% if action.url is defined %}{{ action.url }} - {% endif %}{{ action.serverTimePretty }}"/> diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png index 30451c571c..60847a7c09 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ed4e40289c0251823ab7d195e5bde2ab27c7cc2dfd1581ec784754f95775000 -size 400835 +oid sha256:2bc3c513800c1574b598ac3a90e64de20a9df53b51b058ab63c106ff31299247 +size 401152 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png index 67d87818c8..c20d01cd0f 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9307467ecbf4e0e4ed4441b1aaa5911c2118ef26170f832f5f849f8034dbd7c2 -size 493166 +oid sha256:28820af973fa0fab192cf07106ea3dd0eefe19ed74b9322343a0994be0faafd9 +size 495160 |
