|
21 | 21 | --> |
22 | 22 |
|
23 | 23 | <template> |
24 | | - <li :class="{'sharing-entry--share': share}" class="sharing-entry sharing-entry__link"> |
| 24 | + <li :class="{ 'sharing-entry--share': share }" class="sharing-entry sharing-entry__link"> |
25 | 25 | <NcAvatar :is-no-user="true" |
26 | 26 | :icon-class="isEmailShareType ? 'avatar-link-share icon-mail-white' : 'avatar-link-share icon-public-white'" |
27 | 27 | class="sharing-entry__avatar" /> |
28 | | - <div class="sharing-entry__desc" @click.prevent="toggleQuickShareSelect"> |
29 | | - <span class="sharing-entry__title" :title="title"> |
30 | | - {{ title }} |
31 | | - </span> |
32 | | - <p v-if="subtitle"> |
33 | | - {{ subtitle }} |
34 | | - </p> |
35 | | - <QuickShareSelect v-if="share && share.permissions !== undefined" |
36 | | - :share="share" |
37 | | - :file-info="fileInfo" |
38 | | - :toggle="showDropdown" |
39 | | - @open-sharing-details="openShareDetailsForCustomSettings(share)" /> |
40 | | - </div> |
41 | 28 |
|
42 | | - <!-- clipboard --> |
43 | | - <NcActions v-if="share && !isEmailShareType && share.token" |
44 | | - ref="copyButton" |
45 | | - class="sharing-entry__copy"> |
46 | | - <NcActionLink :href="shareLink" |
47 | | - target="_blank" |
48 | | - :title="copyLinkTooltip" |
49 | | - :aria-label="copyLinkTooltip" |
50 | | - :icon="copied && copySuccess ? 'icon-checkmark-color' : 'icon-clippy'" |
51 | | - @click.stop.prevent="copyLink" /> |
52 | | - </NcActions> |
| 29 | + <div class="sharing-entry__summary"> |
| 30 | + <div class="sharing-entry__desc" @click.prevent="toggleQuickShareSelect"> |
| 31 | + <span class="sharing-entry__title" :title="title"> |
| 32 | + {{ title }} |
| 33 | + </span> |
| 34 | + <p v-if="subtitle"> |
| 35 | + {{ subtitle }} |
| 36 | + </p> |
| 37 | + <QuickShareSelect v-if="share && share.permissions !== undefined" |
| 38 | + :share="share" |
| 39 | + :file-info="fileInfo" |
| 40 | + :toggle="showDropdown" |
| 41 | + @open-sharing-details="openShareDetailsForCustomSettings(share)" /> |
| 42 | + </div> |
| 43 | + |
| 44 | + <!-- clipboard --> |
| 45 | + <NcActions v-if="share && !isEmailShareType && share.token" ref="copyButton" class="sharing-entry__copy"> |
| 46 | + <NcActionLink :href="shareLink" |
| 47 | + target="_blank" |
| 48 | + :title="copyLinkTooltip" |
| 49 | + :aria-label="copyLinkTooltip" |
| 50 | + :icon="copied && copySuccess ? 'icon-checkmark-color' : 'icon-clippy'" |
| 51 | + @click.stop.prevent="copyLink" /> |
| 52 | + </NcActions> |
| 53 | + </div> |
53 | 54 |
|
54 | 55 | <!-- pending actions --> |
55 | 56 | <NcActions v-if="!pending && (pendingPassword || pendingEnforcedPassword || pendingExpirationDate)" |
|
59 | 60 | :open.sync="open" |
60 | 61 | @close="onNewLinkShare"> |
61 | 62 | <!-- pending data menu --> |
62 | | - <NcActionText v-if="errors.pending" |
63 | | - icon="icon-error" |
64 | | - :class="{ error: errors.pending}"> |
| 63 | + <NcActionText v-if="errors.pending" icon="icon-error" :class="{ error: errors.pending }"> |
65 | 64 | {{ errors.pending }} |
66 | 65 | </NcActionText> |
67 | 66 | <NcActionText v-else icon="icon-info"> |
|
128 | 127 | @close="onMenuClose"> |
129 | 128 | <template v-if="share"> |
130 | 129 | <template v-if="share.canEdit && canReshare"> |
131 | | - <NcActionButton :disabled="saving" |
132 | | - @click.prevent="openSharingDetails"> |
| 130 | + <NcActionButton :disabled="saving" @click.prevent="openSharingDetails"> |
133 | 131 | <template #icon> |
134 | 132 | <Tune /> |
135 | 133 | </template> |
|
148 | 146 | :share="share" /> |
149 | 147 |
|
150 | 148 | <!-- external legacy sharing via url (social...) --> |
151 | | - <NcActionLink v-for="({icon, url, name}, index) in externalLegacyLinkActions" |
| 149 | + <NcActionLink v-for="({ icon, url, name }, index) in externalLegacyLinkActions" |
152 | 150 | :key="index" |
153 | 151 | :href="url(shareLink)" |
154 | 152 | :icon="icon" |
@@ -568,7 +566,7 @@ export default { |
568 | 566 | this.pending = false |
569 | 567 | component.open = true |
570 | 568 |
|
571 | | - // Nothing is enforced, creating share directly |
| 569 | + // Nothing is enforced, creating share directly |
572 | 570 | } else { |
573 | 571 | const share = new Share(shareDefaults) |
574 | 572 | await this.pushNewLinkShare(share) |
@@ -774,21 +772,33 @@ export default { |
774 | 772 | align-items: center; |
775 | 773 | min-height: 44px; |
776 | 774 |
|
| 775 | + &__summary { |
| 776 | + padding: 8px; |
| 777 | + padding-left: 10px; |
| 778 | + display: flex; |
| 779 | + justify-content: space-between; |
| 780 | + width: 80%; |
| 781 | + min-width: 80%; |
| 782 | +
|
777 | 783 | &__desc { |
778 | 784 | display: flex; |
779 | 785 | flex-direction: column; |
780 | | - justify-content: space-between; |
781 | | - padding: 8px; |
782 | 786 | line-height: 1.2em; |
783 | 787 |
|
784 | 788 | p { |
785 | 789 | color: var(--color-text-maxcontrast); |
786 | 790 | } |
787 | | - } |
788 | | - &__title { |
789 | | - text-overflow: ellipsis; |
790 | | - overflow: hidden; |
791 | | - white-space: nowrap; |
| 791 | +
|
| 792 | + &__title { |
| 793 | + text-overflow: ellipsis; |
| 794 | + overflow: hidden; |
| 795 | + white-space: nowrap; |
| 796 | + } |
| 797 | + } |
| 798 | +
|
| 799 | + &__copy { |
| 800 | +
|
| 801 | + } |
792 | 802 | } |
793 | 803 |
|
794 | 804 | &:not(.sharing-entry--share) &__actions { |
@@ -816,9 +826,9 @@ export default { |
816 | 826 | // put menus to the left |
817 | 827 | // but only the first one |
818 | 828 | .action-item { |
819 | | - margin-left: auto; |
820 | | - ~ .action-item, |
821 | | - ~ .sharing-entry__loading { |
| 829 | +
|
| 830 | + ~.action-item, |
| 831 | + ~.sharing-entry__loading { |
822 | 832 | margin-left: 0; |
823 | 833 | } |
824 | 834 | } |
|
0 commit comments