Skip to content

Commit b6a1f90

Browse files
authored
Merge pull request #5724 from Countly/tooltip-fixes
Replace repetitive spans with tooltip-icon component
2 parents 64cc0db + 3af0e9e commit b6a1f90

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

frontend/express/public/core/device-and-type/templates/devices-tab.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<div class="bu-p-3">
1616
<div class="bu-level-left bu-p-3 bu-pb-4">
1717
<span class="text-small text-uppercase bu-has-text-weight-medium" :data-test-id="item.title.replaceAll(' ', '-').toLowerCase() + '-label'">{{item.title}}</span>
18-
<span class="cly-vue-tooltip-icon ion ion-help-circled has-tooltip bu-ml-2" v-tooltip.top-center="item.description" :data-test-id="item.title.replaceAll(' ', '-').toLowerCase() + '-tooltip'"></span>
18+
<cly-tooltip-icon class="bu-ml-2" :tooltip="item.description" placement="top-center" :data-test-id="item.title.replaceAll(' ', '-').toLowerCase() + '-tooltip'"></cly-tooltip-icon>
1919
</div>
2020
<div class="topData">
2121
<div v-if="!item.data.length">

frontend/express/public/core/device-and-type/templates/technologyHomeWidget.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<cly-section :class="(idx === 0 || idx === 1)? 'bu-pb-2' : 'bu-pt-2 bu-pb-2'">
66
<div class="bu-level-left bu-p-5">
77
<span class="text-medium text-uppercase" :data-test-id="`cly-section-label-${item.title.toLowerCase().replaceAll(/\s/g, '-')}`">{{item.title}}</span>
8-
<span class="cly-vue-tooltip-icon ion ion-help-circled has-tooltip" :data-test-id="`cly-section-${item.title.toLowerCase().replaceAll(/\s/g, '-')}-tooltip`" style="margin-left:10px" v-tooltip.top-center="item.description"></span>
8+
<cly-tooltip-icon class="bu-ml-2" :tooltip="item.description" placement="top-center" :data-test-id="`cly-section-${item.title.toLowerCase().replaceAll(/\s/g, '-')}-tooltip`"></cly-tooltip-icon>
99
</div>
1010
<div class="topData bu-pl-3 bu-pr-3 bu-pb-5" :data-test-id="`cly-section-${item.title.toLowerCase().replaceAll(/\s/g, '-')}-data-block`">
1111
<div :key="idx2" v-for="(item2, idx2) in item.data" >

frontend/express/public/core/home/templates/sessionsWidget.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="bu-is-flex bu-is-flex-direction-column bu-is-justify-content-space-between">
88
<div>
99
<span class="text-medium">{{item.label}}</span>
10-
<span v-if="item.description" class="cly-vue-tooltip-icon ion ion-help-circled bu-pl-2" v-tooltip.top-center="item.description"></span>
10+
<cly-tooltip-icon v-if="item.description" class="bu-pl-2" :tooltip="item.description" placement="top-center"></cly-tooltip-icon>
1111
</div>
1212
</div>
1313
<div class="bu-is-flex bu-is-align-items-baseline number">

frontend/express/public/core/home/templates/widgetTitle.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="bu-level bu-pb-3">
22
<div class="bu-level-left" :data-test-id="`widget-label-${widget.label.toLowerCase().replaceAll(/\s/g, '-')}`">
33
<h2>{{i18n(widget.label)}}</h2>
4-
<span class="cly-vue-tooltip-icon ion ion-help-circled" :data-test-id="`widget-tooltip-${widget.label.toLowerCase().replaceAll(/\s/g, '-')}`" style="margin-left:10px" v-tooltip.top-center="widget.description"></span>
4+
<cly-tooltip-icon :data-test-id="`widget-tooltip-${widget.label.toLowerCase().replaceAll(/\s/g, '-')}`" class="bu-ml-2" :tooltip="widget.description" placement="top-center"></cly-tooltip-icon>
55
</div>
66
<div class="bu-level-right">
77
<a v-if="widget.linkTo" class="cly-back-link text-medium" :data-test-id="`widget-link-${widget.linkTo.label.toLowerCase().replaceAll(/\s/g, '-')}`" :href="widget.linkTo.href"><span>{{i18n(widget.linkTo.label)}}<i class="fas fa-arrow-right bu-pl-3" :data-test-id="`widget-arrow-${widget.linkTo.label.toLowerCase().replaceAll(/\s/g, '-')}`"></i></span></a>

frontend/express/public/core/session-overview/templates/sessionsHomeWidget.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<div class="bu-is-flex bu-is-flex-direction-column bu-is-justify-content-space-between" :data-test-id="`tab-box-label-tooltip-container-${item.label.toLowerCase().replace('.', '').replaceAll(/\s/g, '-')}`">
99
<div class="text-medium" :data-test-id="`tab-box-label-tooltip-${item.label.toLowerCase().replace('.', '').replaceAll(/\s/g, '-')}`">
1010
<span :data-test-id="`tab-box-label-${item.label.toLowerCase().replace('.', '').replaceAll(/\s/g, '-')}`">{{item.label}}</span>
11-
<span v-if="item.description" class="cly-vue-tooltip-icon ion ion-help-circled bu-ml-1" :data-test-id="`tab-box-tooltip-${item.label.toLowerCase().replace('.', '').replaceAll(/\s/g, '-')}`" v-tooltip.top-center="item.description"></span>
11+
<cly-tooltip-icon v-if="item.description" class="bu-ml-1" :tooltip="item.description" placement="top-center" :data-test-id="`tab-box-tooltip-${item.label.toLowerCase().replace('.', '').replaceAll(/\s/g, '-')}`"></cly-tooltip-icon>
1212
</div>
1313
</div>
1414
<div class="bu-is-flex bu-is-align-items-center number" :data-test-id="`tab-box-center-${item.label.toLowerCase().replace('.', '').replaceAll(/\s/g, '-')}`">

frontend/express/public/javascripts/countly/vue/templates/breakdown.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="bu-is-relative">
44
<div class="bu-level-left bu-p-5" v-if="typeof name !== 'undefined'">
55
<span class="text-medium">{{name}}</span>
6-
<span v-if="description" class="cly-vue-tooltip-icon ion ion-help-circled has-tooltip bu-ml-3" v-tooltip.top-center="description"></span>
6+
<cly-tooltip-icon v-if="description" class="bu-ml-3" :tooltip="description" placement="top-center"></cly-tooltip-icon>
77
</div>
88
<div class="bu-level-left bu-p-2" v-if="typeof name === 'undefined'"></div>
99
<div v-if="values.length === 0" class="bu-pl-3 bu-pr-3 cly-vue-metric-breakdown__empty" style="height: 264px;">

plugins/crashes/frontend/public/templates/tab-label.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="bu-is-flex bu-is-flex-direction-column bu-is-justify-content-space-between">
33
<div class="text-medium" :data-test-id="`cly-section-${title.toLowerCase().replaceAll(/\s/g, '-').replace('/', 'or')}-title`">
44
<span>{{title}}</span>
5-
<span v-if="tooltip" :data-test-id="`cly-section-${title.toLowerCase().replaceAll(/\s/g, '-').replace('/', 'or')}-tooltip`" class="cly-vue-tooltip-icon ion ion-help-circled bu-ml-1" v-tooltip.top-center="tooltip"></span>
5+
<cly-tooltip-icon v-if="tooltip" class="bu-ml-1" :tooltip="tooltip" placement="top-center" :data-test-id="`cly-section-${title.toLowerCase().replaceAll(/\s/g, '-').replace('/', 'or')}-tooltip`"></cly-tooltip-icon>
66
</div>
77
</div>
88
<div class="bu-is-flex bu-is-align-items-center">

plugins/server-stats/frontend/public/templates/data-points.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ <h4 data-test-id="top-applications-by-data-points-in-the-last-two-hours-label">{
3636
<el-table-column min-width="150" :formatter="numberFormatter" sortable="custom" prop="sessions" :label="i18n('sidebar.analytics.sessions')">
3737
<template v-slot:header>
3838
{{i18n('sidebar.analytics.sessions')}}
39-
<span class="cly-vue-tooltip-icon ion ion-help-circled bu-pl-1" v-tooltip.top-center="i18n('server-stats.sessions-description')"></span>
39+
<cly-tooltip-icon class="bu-pl-1" :tooltip="i18n('server-stats.sessions-description')" placement="top-center"></cly-tooltip-icon>
4040
</template>
4141
</el-table-column>
4242
<el-table-column min-width="150" :formatter="numberFormatter" sortable="custom" prop="events" :label="i18n('server-stats.events')">
4343
<template v-slot:header>
4444
{{i18n('server-stats.events')}}
45-
<span class="cly-vue-tooltip-icon ion ion-help-circled bu-pl-1" v-tooltip.top-center="i18n('server-stats.events-description')"></span>
45+
<cly-tooltip-icon class="bu-pl-1" :tooltip="i18n('server-stats.events-description')" placement="top-center"></cly-tooltip-icon>
4646
</template>
4747
<div slot-scope="scopeRow">
4848
<el-popover

0 commit comments

Comments
 (0)