Skip to content

Commit b3d2315

Browse files
Merge pull request #36084 from nextcloud/backport/35893/stable25
[stable25] Replace custom tooltips with native ones in users page
2 parents 21f173d + 68ae7d0 commit b3d2315

File tree

6 files changed

+20
-22
lines changed

6 files changed

+20
-22
lines changed

apps/settings/src/components/UserList/UserRow.vue

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<div v-else class="name">
9494
{{ user.id }}
9595
<div class="displayName subtitle">
96-
<div v-tooltip="user.displayname.length > 20 ? user.displayname : ''" class="cellText">
96+
<div :title="user.displayname.length > 20 ? user.displayname : ''" class="cellText">
9797
{{ user.displayname }}
9898
</div>
9999
</div>
@@ -172,7 +172,7 @@
172172
<span slot="noResult">{{ t('settings', 'No results') }}</span>
173173
</NcMultiselect>
174174
</div>
175-
<div v-tooltip.auto="usedSpace"
175+
<div :title="usedSpace"
176176
:class="{'icon-loading-small': loading.quota}"
177177
class="quota">
178178
<NcMultiselect :allow-empty="false"
@@ -214,9 +214,9 @@
214214
class="toggleUserActions">
215215
<NcActions>
216216
<NcActionButton icon="icon-checkmark"
217-
@click="editing = false">
218-
{{ t('settings', 'Done') }}
219-
</NcActionButton>
217+
:title="t('settings', 'Done')"
218+
:aria-label="t('settings', 'Done')"
219+
@click="editing = false" />
220220
</NcActions>
221221
<div v-click-outside="hideMenu" class="userPopoverMenuWrapper">
222222
<button class="icon-more"
@@ -237,8 +237,7 @@
237237

238238
<script>
239239
import ClickOutside from 'vue-click-outside'
240-
import Vue from 'vue'
241-
import VTooltip from 'v-tooltip'
240+
242241
import {
243242
NcPopoverMenu,
244243
NcMultiselect,
@@ -248,8 +247,6 @@ import {
248247
import UserRowSimple from './UserRowSimple'
249248
import UserRowMixin from '../../mixins/UserRowMixin'
250249
251-
Vue.use(VTooltip)
252-
253250
export default {
254251
name: 'UserRow',
255252
components: {

apps/settings/src/components/UserList/UserRowSimple.vue

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
<div class="name">
1414
{{ user.id }}
1515
<div class="displayName subtitle">
16-
<div v-tooltip="user.displayname.length > 20 ? user.displayname : ''" class="cellText">
16+
<div :title="user.displayname.length > 20 ? user.displayname : ''" class="cellText">
1717
{{ user.displayname }}
1818
</div>
1919
</div>
2020
</div>
2121
<div />
2222
<div class="mailAddress">
23-
<div v-tooltip="user.email !== null && user.email.length > 20 ? user.email : ''" class="cellText">
23+
<div :title="user.email !== null && user.email.length > 20 ? user.email : ''" class="cellText">
2424
{{ user.email }}
2525
</div>
2626
</div>
@@ -46,20 +46,21 @@
4646
<div v-if="showConfig.showUserBackend" class="userBackend">
4747
{{ user.backend }}
4848
</div>
49-
<div v-if="showConfig.showStoragePath" v-tooltip="user.storageLocation" class="storageLocation subtitle">
49+
<div v-if="showConfig.showStoragePath" :title="user.storageLocation" class="storageLocation subtitle">
5050
{{ user.storageLocation }}
5151
</div>
5252
</div>
53-
<div v-if="showConfig.showLastLogin" v-tooltip.auto="userLastLoginTooltip" class="lastLogin">
53+
<div v-if="showConfig.showLastLogin" :title="userLastLoginTooltip" class="lastLogin">
5454
{{ userLastLogin }}
5555
</div>
5656

5757
<div class="userActions">
5858
<div v-if="canEdit && !loading.all" class="toggleUserActions">
5959
<NcActions>
60-
<NcActionButton icon="icon-rename" @click="toggleEdit">
61-
{{ t('settings', 'Edit User') }}
62-
</NcActionButton>
60+
<NcActionButton icon="icon-rename"
61+
:title="t('settings', 'Edit User')"
62+
:aria-label="t('settings', 'Edit User')"
63+
@click="toggleEdit" />
6364
</NcActions>
6465
<div class="userPopoverMenuWrapper">
6566
<button v-click-outside="hideMenu"

dist/settings-users-8351.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/settings-users-8351.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/settings-vue-settings-apps-users-management.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/settings-vue-settings-apps-users-management.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)