Skip to content

[stable25] Replace custom tooltips with native ones #849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChristophWurst merged 1 commit into from
Jan 30, 2023
Merged

[stable25] Replace custom tooltips with native ones #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions js/privacy-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/privacy-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 9 additions & 6 deletions src/components/Admins.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion src/components/Encryption.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 4 additions & 3 deletions src/components/Location.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
1 change: 1 addition & 0 deletions src/components/Shares.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
:key="uid"
:user="uid"
:display-name="uidDisplaynameMap[uid]"
:title="uidDisplaynameMap[uid]"
:size="64"
:show-user-status="false" />
</div>
Expand Down