Merge pull request #40393 from nextcloud/fix-user-status-sharing-flow

Display user status by the side in sharing flow
This commit is contained in:
Arthur Schiwon 2023-09-13 21:36:44 +02:00 committed by GitHub
commit 80f3e46ce3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 57 additions and 25 deletions

View file

@ -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"
@ -168,6 +167,10 @@ export default {
&-unique {
color: var(--color-text-maxcontrast);
}
small {
color: var(--color-text-maxcontrast);
}
}
&__actions {
@ -176,6 +179,7 @@ export default {
&__summary {
padding: 8px;
padding-left: 10px;
display: flex;
flex-direction: column;
justify-content: center;

View file

@ -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"
@ -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') }}
@ -1008,6 +1011,12 @@ export default {
}
}
&__delete {
>button:first-child {
color: rgb(223, 7, 7);
}
}
&__footer {
width: 100%;
display: flex;
@ -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;

3
dist/2785-2785.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

3
dist/6547-6547.js vendored Normal file

File diff suppressed because one or more lines are too long

1
dist/6547-6547.js.map vendored Normal file

File diff suppressed because one or more lines are too long

4
dist/core-common.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -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 <roeland@famdouma.nl>
*
@ -21,6 +23,28 @@
*
*/
/**
* @copyright Copyright (c) 2023 Lucas Azevedo <lhs_azevedo@hotmail.com>
*
* @author Lucas Azevedo <lhs_azevedo@hotmail.com>
*
* @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 <pvince81@owncloud.com>
*

File diff suppressed because one or more lines are too long