Merge pull request #849 from nextcloud/fix/835-Replace_custom_tooltip…

…s_with_native_one_for_privacy_settings_page-stable25 [stable25] Replace custom tooltips with native ones
nextcloud · Jan 30, 2023 · e6d83b8 · e6d83b8
2 parents 1c87ca4 + 3ea13f4
commit e6d83b8
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/js/privacy-main.js b/js/privacy-main.js
diff --git a/js/privacy-main.js.map b/js/privacy-main.js.map
diff --git a/src/components/Admins.vue b/src/components/Admins.vue
@@ -24,22 +24,25 @@
  <span :class="{ hidden: !isLoading }" class="icon icon-loading" />
  <div v-for="admin in admins" :key="admin.id" class="admin-NcAvatar-container">
  <NcAvatar :user="admin.internal ? admin.id : null"
+ :title="admin.displayname"
  :display-name="admin.displayname"
  :size="64"
  :is-no-user="!admin.internal"
  :show-user-status="false" />
  <NcActions v-if="!admin.internal">
- <NcActionButton icon="icon-close" @click="deleteAdditionalAdmin(admin)">
- {{ $t('privacy', 'Remove external admin') }}
- </NcActionButton>
+ <NcActionButton icon="icon-close"
+ :aria-label="t('privacy', 'Remove external {propertyName} admin', { propertyName: admin.displayname })"
+ :title="t('privacy', 'Remove external {propertyName} admin', { propertyName: admin.displayname })"
+ @click="deleteAdditionalAdmin(admin)" />
  </NcActions>
  </div>
 
  <div v-if="$is_admin">
  <NcActions v-if="!isAdding" class="addAdditionalAdmin">
- <NcActionButton icon="icon-add" @click.stop.prevent="openNewAdmin">
- {{ $t('privacy', 'Add external admin') }}
- </NcActionButton>
+ <NcActionButton icon="icon-add"
+ :aria-label="t('privacy', 'Add external admin')"
+ :title="t('privacy', 'Add external admin')"
+ @click.stop.prevent="openNewAdmin" />
  </NcActions>
  <form v-if="isAdding"
  v-click-outside="closeNewAdmin"

diff --git a/src/components/Encryption.vue b/src/components/Encryption.vue
@@ -30,7 +30,10 @@
  <!--eslint-enable-->
  </div>
  <NcActions v-if="$is_admin && !isEditing">
- <NcActionButton icon="icon-rename" @click.stop.prevent="openEditFullDiskEncryptionForm" />
+ <NcActionButton icon="icon-rename"
+ :aria-label="t('privacy', 'Adapt encryption')"
+ :title="t('privacy', 'Adapt encryption')"
+ @click.stop.prevent="openEditFullDiskEncryptionForm" />
  </NcActions>
  <div v-if="isEditing" v-click-outside="cancelEditFullDiskEncryptionForm">
  <form>

diff --git a/src/components/Location.vue b/src/components/Location.vue
@@ -25,9 +25,10 @@
  <span v-show="country">{{ $t('privacy', 'Your data is located in:') }} <strong>{{ country }}</strong>.</span>
  <span v-show="!country">{{ $t('privacy', 'The admin has not selected the location of the server yet.') }}</span>
  <NcActions v-if="$is_admin">
- <NcActionButton icon="icon-rename" @click="editLocation">
- {{ t('privacy', 'Change data location') }}
- </NcActionButton>
+ <NcActionButton icon="icon-rename"
+ :aria-label="t('privacy', 'Change data location')"
+ :title="t('privacy', 'Change data location')"
+ @click="editLocation" />
  </NcActions>
  </p>
  <div v-show="isEditingLocation" class="NcMultiselect-container">

diff --git a/src/components/Shares.vue b/src/components/Shares.vue
@@ -29,6 +29,7 @@
  :key="uid"
  :user="uid"
  :display-name="uidDisplaynameMap[uid]"
+ :title="uidDisplaynameMap[uid]"
  :size="64"
  :show-user-status="false" />
  </div>