Skip to content

Commit

Permalink
Merge pull request #36084 from nextcloud/backport/35893/stable25
Browse files Browse the repository at this point in the history
[stable25] Replace custom tooltips with native ones in users page
  • Loading branch information
ChristophWurst authored Jan 25, 2023
2 parents 21f173d + 68ae7d0 commit b3d2315
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 22 deletions.
15 changes: 6 additions & 9 deletions apps/settings/src/components/UserList/UserRow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<div v-else class="name">
{{ user.id }}
<div class="displayName subtitle">
<div v-tooltip="user.displayname.length > 20 ? user.displayname : ''" class="cellText">
<div :title="user.displayname.length > 20 ? user.displayname : ''" class="cellText">
{{ user.displayname }}
</div>
</div>
Expand Down Expand Up @@ -172,7 +172,7 @@
<span slot="noResult">{{ t('settings', 'No results') }}</span>
</NcMultiselect>
</div>
<div v-tooltip.auto="usedSpace"
<div :title="usedSpace"
:class="{'icon-loading-small': loading.quota}"
class="quota">
<NcMultiselect :allow-empty="false"
Expand Down Expand Up @@ -214,9 +214,9 @@
class="toggleUserActions">
<NcActions>
<NcActionButton icon="icon-checkmark"
@click="editing = false">
{{ t('settings', 'Done') }}
</NcActionButton>
:title="t('settings', 'Done')"
:aria-label="t('settings', 'Done')"
@click="editing = false" />
</NcActions>
<div v-click-outside="hideMenu" class="userPopoverMenuWrapper">
<button class="icon-more"
Expand All @@ -237,8 +237,7 @@

<script>
import ClickOutside from 'vue-click-outside'
import Vue from 'vue'
import VTooltip from 'v-tooltip'
import {
NcPopoverMenu,
NcMultiselect,
Expand All @@ -248,8 +247,6 @@ import {
import UserRowSimple from './UserRowSimple'
import UserRowMixin from '../../mixins/UserRowMixin'
Vue.use(VTooltip)
export default {
name: 'UserRow',
components: {
Expand Down
15 changes: 8 additions & 7 deletions apps/settings/src/components/UserList/UserRowSimple.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
<div class="name">
{{ user.id }}
<div class="displayName subtitle">
<div v-tooltip="user.displayname.length > 20 ? user.displayname : ''" class="cellText">
<div :title="user.displayname.length > 20 ? user.displayname : ''" class="cellText">
{{ user.displayname }}
</div>
</div>
</div>
<div />
<div class="mailAddress">
<div v-tooltip="user.email !== null && user.email.length > 20 ? user.email : ''" class="cellText">
<div :title="user.email !== null && user.email.length > 20 ? user.email : ''" class="cellText">
{{ user.email }}
</div>
</div>
Expand All @@ -46,20 +46,21 @@
<div v-if="showConfig.showUserBackend" class="userBackend">
{{ user.backend }}
</div>
<div v-if="showConfig.showStoragePath" v-tooltip="user.storageLocation" class="storageLocation subtitle">
<div v-if="showConfig.showStoragePath" :title="user.storageLocation" class="storageLocation subtitle">
{{ user.storageLocation }}
</div>
</div>
<div v-if="showConfig.showLastLogin" v-tooltip.auto="userLastLoginTooltip" class="lastLogin">
<div v-if="showConfig.showLastLogin" :title="userLastLoginTooltip" class="lastLogin">
{{ userLastLogin }}
</div>

<div class="userActions">
<div v-if="canEdit && !loading.all" class="toggleUserActions">
<NcActions>
<NcActionButton icon="icon-rename" @click="toggleEdit">
{{ t('settings', 'Edit User') }}
</NcActionButton>
<NcActionButton icon="icon-rename"
:title="t('settings', 'Edit User')"
:aria-label="t('settings', 'Edit User')"
@click="toggleEdit" />
</NcActions>
<div class="userPopoverMenuWrapper">
<button v-click-outside="hideMenu"
Expand Down
4 changes: 2 additions & 2 deletions dist/settings-users-8351.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-users-8351.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-vue-settings-apps-users-management.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-vue-settings-apps-users-management.js.map

Large diffs are not rendered by default.

0 comments on commit b3d2315

Please sign in to comment.