mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Wiswedel/inherited shares/design polishing (#18447) 

Wiswedel/inherited shares/design polishing
This commit is contained in:
John Molakvoæ 2019-12-19 08:45:16 +01:00 committed by GitHub
parent b175211366 f4f69da4b8
commit 8cd86f110b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/files_sharing/js/dist/files_sharing_tab.js vendored
View File

File diff suppressed because one or more lines are too long

2
apps/files_sharing/js/dist/files_sharing_tab.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
apps/files_sharing/src/components/SharingEntryInherited.vue
View File

@ -33,17 +33,17 @@
tooltip-message="" /> tooltip-message="" />
</template> </template>
<ActionText icon="icon-user"> <ActionText icon="icon-user">
{{ t('files_sharing', 'Invited by {initiator}', { initiator: share.ownerDisplayName }) }} {{ t('files_sharing', 'Added by {initiator}', { initiator: share.ownerDisplayName }) }}
</ActionText> </ActionText>
<ActionLink v-if="share.fileSource" <ActionLink v-if="share.fileSource"
icon="icon-folder" icon="icon-folder"
:href="fileTargetUrl"> :href="fileTargetUrl">
{{ t('files_sharing', 'Open folder') }} {{ t('files_sharing', 'Via folder') }}
</ActionLink> </ActionLink>
<ActionButton v-if="share.canDelete" <ActionButton v-if="share.canDelete"
icon="icon-delete" icon="icon-delete"
@click.prevent="onDelete"> @click.prevent="onDelete">
{{ t('files_sharing', 'Delete share') }} {{ t('files_sharing', 'Unshare') }}
</actionbutton> </actionbutton>
</SharingEntrySimple> </SharingEntrySimple>
</template> </template>

4
apps/files_sharing/src/views/SharingInherited.vue
View File

@ -86,9 +86,7 @@ export default {
return 'icon-triangle-s' return 'icon-triangle-s'
}, },
mainTitle() { mainTitle() {
return t('files_sharing', 'Others with access {count}', { return t('files_sharing', 'Others with access')
count: this.loaded ? `: ${this.shares.length}` : ''
})
}, },
toggleTooltip() { toggleTooltip() {
return this.fileInfo.type === 'dir' return this.fileInfo.type === 'dir'