Skip to content
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

Wiswedel/inherited shares/design polishing #18447

Merged
merged 4 commits into from
Dec 19, 2019
+8 −10
Merged

Wiswedel/inherited shares/design polishing #18447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08b34aa
replace "invited by" with "added by"
wiswedel Dec 17, 2019
73b1011
Streamline "unshare" wording
wiswedel Dec 17, 2019
4d1a3a3
clarifying share source folder link string
wiswedel Dec 17, 2019
f4f69da
removed inherited shares counter
wiswedel Dec 17, 2019
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
6 changes: 3 additions & 3 deletions apps/files_sharing/js/dist/files_sharing_tab.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/files_sharing/js/dist/files_sharing_tab.js.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions apps/files_sharing/src/components/SharingEntryInherited.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@
tooltip-message="" />
</template>
<ActionText icon="icon-user">
{{ t('files_sharing', 'Invited by {initiator}', { initiator: share.ownerDisplayName }) }}
{{ t('files_sharing', 'Added by {initiator}', { initiator: share.ownerDisplayName }) }}
</ActionText>
<ActionLink v-if="share.fileSource"
icon="icon-folder"
:href="fileTargetUrl">
{{ t('files_sharing', 'Open folder') }}
{{ t('files_sharing', 'Via folder') }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Via parent folder" would be clearer, as per #18202

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't really like either.

  • "Parent folder" implies parent of the one I'm currently in to me.
  • "Via folder" is also kind of bumpy wording.

@jancborchardt Do you have any other smart ideas?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then say "Via foldername", actually naming the folder in question. :)

If that is not possible, "Via parent folder" is the best compromise between concise and informative atm. We can always enhance this later.

Copy link
Contributor Author

@wiswedel wiswedel Dec 18, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Via foldername

I like that - however, that's where my vue half knowledge ends. Can you help me retrieving that folder name @jancborchardt ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I likely have even less knowledge there. :) @skjnldsv @juliushaertl?

</ActionLink>
<ActionButton v-if="share.canDelete"
icon="icon-delete"
@click.prevent="onDelete">
{{ t('files_sharing', 'Delete share') }}
{{ t('files_sharing', 'Unshare') }}
</actionbutton>
</SharingEntrySimple>
</template>
Expand Down
4 changes: 1 addition & 3 deletions apps/files_sharing/src/views/SharingInherited.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,7 @@ export default {
return 'icon-triangle-s'
},
mainTitle() {
return t('files_sharing', 'Others with access {count}', {
count: this.loaded ? `: ${this.shares.length}` : ''
})
return t('files_sharing', 'Others with access')
},
toggleTooltip() {
return this.fileInfo.type === 'dir'
Expand Down