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.

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

Display user status by the side in sharing flow #40393

Merged
merged 2 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 10 additions & 6 deletions apps/files_sharing/src/components/SharingEntry.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,11 @@
:aria-label="tooltip"
:href="share.shareWithLink"
class="sharing-entry__desc">
<span>{{ title }}<span v-if="!isUnique" class="sharing-entry__desc-unique"> ({{
share.shareWithDisplayNameUnique }})</span></span>
<p v-if="hasStatus">
<span>{{ share.status.icon || '' }}</span>
<span>{{ share.status.message || '' }}</span>
</p>
<span>{{ title }}
<span v-if="!isUnique" class="sharing-entry__desc-unique"> ({{
share.shareWithDisplayNameUnique }})</span>
<small v-if="hasStatus && share.status.message">({{ share.status.message }})</small>
</span>
</component>
<QuickShareSelect :share="share"
:file-info="fileInfo"
Expand Down Expand Up @@ -168,6 +167,10 @@ export default {
&-unique {
color: var(--color-text-maxcontrast);
}

small {
color: var(--color-text-maxcontrast);
}
}

&__actions {
Expand All @@ -176,6 +179,7 @@ export default {

&__summary {
padding: 8px;
padding-left: 10px;
display: flex;
flex-direction: column;
justify-content: center;
Expand Down
16 changes: 10 additions & 6 deletions apps/files_sharing/src/views/SharingDetailsTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
</section>
</div>

<div class="sharingTabDetailsView__footer">
<div class="sharingTabDetailsView__delete">
<NcButton v-if="!isNewShare"
:aria-label="t('files_sharing', 'Delete share')"
:disabled="false"
Expand All @@ -176,6 +176,9 @@
</template>
{{ t('files_sharing', 'Delete share') }}
</NcButton>
</div>

<div class="sharingTabDetailsView__footer">
<div class="button-group">
<NcButton @click="$emit('close-sharing-details')">
{{ t('file_sharing', 'Cancel') }}
Expand Down Expand Up @@ -1008,6 +1011,12 @@ export default {
}
}

&__delete {
>button:first-child {
color: rgb(223, 7, 7);
}
}

&__footer {
width: 100%;
display: flex;
Expand All @@ -1017,11 +1026,6 @@ export default {
justify-content: space-between;
align-items: flex-start;

>button:first-child {
color: rgb(223, 7, 7);
background-color: #f5f5f5;
}

.button-group {
display: flex;
justify-content: space-between;
Expand Down
3 changes: 0 additions & 3 deletions dist/2785-2785.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/2785-2785.js.map

This file was deleted.

3 changes: 3 additions & 0 deletions dist/6547-6547.js

Large diffs are not rendered by default.

File renamed without changes.
1 change: 1 addition & 0 deletions dist/6547-6547.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/core-common.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-common.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/files_sharing-files_sharing_tab.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files_sharing-files_sharing_tab.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/systemtags-systemtags.js

Large diffs are not rendered by default.

24 changes: 24 additions & 0 deletions dist/systemtags-systemtags.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */

/**
* @copyright Copyright (c) 2016 Roeland Jago Douma <[email protected]>
*
Expand All @@ -21,6 +23,28 @@
*
*/

/**
* @copyright Copyright (c) 2023 Lucas Azevedo <[email protected]>
*
* @author Lucas Azevedo <[email protected]>
*
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

/**
* Copyright (c) 2016 Vincent Petry <[email protected]>
*
Expand Down
2 changes: 1 addition & 1 deletion dist/systemtags-systemtags.js.map

Large diffs are not rendered by default.

Loading