nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-18 08:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Box message fix part 2

Browse Source
This commit is contained in:
Peter Papp
2021-01-30 15:08:57 +01:00
parent 267556b39d
commit 6b32ae9795
8 changed files with 220 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
resources/js/components/Others/Forms/InfoBox.vue
View File

@@ -35,12 +35,19 @@
}
p {
@include font-size(15);
font-size: 15px;
line-height: 1.6;
word-break: break-word;
font-weight: 600;
/deep/ a {
font-size: 15px;
color: $theme;
}
/deep/ b {
font-size: 15px;
font-weight: 700;
color: $theme;
}
}
@@ -71,10 +78,6 @@
}
}
@media only screen and (max-width: 960px) {
}
@media only screen and (max-width: 690px) {
.info-box {

31
resources/js/components/Others/ShareCreate.vue
View File

@@ -10,10 +10,9 @@
<ThumbnailItem class="item-thumbnail" :item="pickedItem" info="metadata"/>
<!-- Infobox for successfull sended email -->
<div v-if="isGeneratedShared && shareViaEmail" class="info-box">
<InfoBox v-html="$t('shared_form.email_successfully_send_message')"/>
</div>
<InfoBox v-if="isGeneratedShared && sharedViaEmail" class="info-box-wrapper">
<p v-html="$t('shared_form.email_successfully_send_message')"></p>
</InfoBox>
<!--Form to set sharing-->
<ValidationObserver @submit.prevent v-if="! isGeneratedShared" ref="shareForm" v-slot="{ invalid }" tag="form" class="form-wrapper">
@@ -69,7 +68,7 @@
<!--Copy generated link-->
<div v-if="isGeneratedShared" class="form-wrapper">
<div class="input-wrapper">
<label class="input-label">{{ this.shareViaEmail ? $t('shared_form.label_share_vie_email') : $t('shared_form.label_shared_url') }}:</label>
<label class="input-label">{{ this.sharedViaEmail ? $t('shared_form.label_share_vie_email') : $t('shared_form.label_shared_url') }}:</label>
<CopyInput size="small" :item="pickedItem" />
</div>
</div>
@@ -170,14 +169,13 @@
permission: undefined,
type: undefined,
unique_id: undefined,
emails:undefined
emails: undefined
},
pickedItem: undefined,
shareLink: undefined,
isGeneratedShared: false,
isLoading: false,
isMoreOptions: false,
shareViaEmail: false
sharedViaEmail: false
}
},
methods: {
@@ -208,6 +206,10 @@
.post('/api/share', this.shareOptions)
.then(response => {
// Show infobox and reset emails container
if (this.shareOptions.emails)
this.sharedViaEmail = true
// End loading
this.isLoading = false
this.isGeneratedShared = true
@@ -254,7 +256,7 @@
}
this.isGeneratedShared = false
this.isMoreOptions = false
this.shareLink = undefined
this.sharedViaEmail = false
}, 150)
})
}
@@ -265,17 +267,6 @@
@import "@assets/vue-file-manager/_inapp-forms.scss";
@import '@assets/vue-file-manager/_forms';
.info-box {
padding: 0px 20px;
/deep/.info-box {
@include font-size(14);
font-weight: 700;
height: 40px;
display: flex;
align-items: center;
}
}
.more-options {
margin-bottom: 10px;
}

21
resources/js/components/Others/ShareEdit.vue
View File

@@ -10,16 +10,16 @@
<ThumbnailItem class="item-thumbnail" :item="pickedItem" info="metadata"/>
<!-- Infobox for successfull sended email -->
<div v-if="sendToRecipientsMenu && isEmailSended" class="info-box">
<InfoBox v-html="$t('shared_form.email_successfully_send_message')"/>
</div>
<InfoBox v-if="sendToRecipientsMenu && isEmailSended" class="info-box-wrapper">
<p v-html="$t('shared_form.email_successfully_send_message')"></p>
</InfoBox>
<div v-if="! sendToRecipientsMenu || (sendToRecipientsMenu && isEmailSended)" class="input-wrapper copy-input">
<label class="input-label">{{ $t('shared_form.label_share_vie_email') }}:</label>
<CopyInput size="small" :item="pickedItem" />
</div>
<ValidationObserver v-if="sendToRecipientsMenu && !isEmailSended" v-slot="{ invalid }" ref="shareEmail" tag="form" class="form-wrapper">
<ValidationObserver @submit.prevent v-if="sendToRecipientsMenu && !isEmailSended" v-slot="{ invalid }" ref="shareEmail" tag="form" class="form-wrapper">
<ValidationProvider tag="div" mode="passive" name="Email" rules="required" v-slot="{ errors }">
<MultiEmailInput rules="required" v-model="emails" :label="$t('shared_form.label_send_to_recipients')" :isError="errors[0]" />
@@ -28,7 +28,7 @@
</ValidationObserver>
<!--Form to set sharing-->
<ValidationObserver v-if="! sendToRecipientsMenu" ref="shareForm" v-slot="{ invalid }" tag="form" class="form-wrapper">
<ValidationObserver @submit.prevent v-if="! sendToRecipientsMenu" ref="shareForm" v-slot="{ invalid }" tag="form" class="form-wrapper">
<!--Permision Select-->
<ValidationProvider v-if="isFolder" tag="div" mode="passive" class="input-wrapper" name="Permission" rules="required" v-slot="{ errors }">
@@ -362,17 +362,6 @@
@import "@assets/vue-file-manager/_inapp-forms.scss";
@import '@assets/vue-file-manager/_forms';
.info-box {
padding: 0px 20px;
/deep/.info-box {
@include font-size(14);
font-weight: 700;
height: 40px;
display: flex;
align-items: center;
}
}
.input-wrapper {
&.password {

2
resources/js/i18n/lang/cn.json
View File

@@ -698,7 +698,7 @@
"expiration_hour": "{value}h.",
"expiration_day": "{value}d.",
"placeholder_permission": "请设置权限",
"email_successfully_send_message": "Your item was &nbsp; <span id='colored-text'>successfully sended</span> &nbsp; to recipients emails.",
"email_successfully_send_message": "Your item was <b>successfully sended</b> to recipients emails.",
"share_by_link": "Share by Link",
"share_by_email": "Share by Email",
"recipients_label": "Recipients",

2
resources/js/i18n/lang/en.json
View File

@@ -709,7 +709,7 @@
"expiration_hour": "{value}h.",
"expiration_day": "{value}d.",
"placeholder_permission": "Select your permission",
"email_successfully_send_message": "Your item was &nbsp; <span id='colored-text'>successfully sended</span> &nbsp; to recipients emails.",
"email_successfully_send_message": "Your item was <b>successfully sended</b> to recipients emails.",
"share_by_link": "Share by Link",
"share_by_email": "Share by Email",
"recipients_label": "Recipients",

2
resources/js/i18n/lang/sk.json
View File

@@ -700,7 +700,7 @@
"expiration_hour": "{value}h.",
"expiration_day": "{value}d.",
"placeholder_permission": "Zvoľte oprávnenia",
"email_successfully_send_message": "Vaša položka bola &nbsp; <span id='colored-text'>úspešne odoslaná</span> &nbsp; na e-maily príjemcov.",
"email_successfully_send_message": "Vaša položka bola <b>úspešne odoslaná</b> na e-maily príjemcov.",
"share_by_link": "Zdieľať odkazom",
"share_by_email": "Zdieľať e-mailom",
"recipients_label": "Príjemcovia",

7
resources/sass/app.scss vendored
View File

@@ -441,10 +441,9 @@
}
}
#colored-text {
color: $theme;
@include font-size(16);
font-weight: 700;
.info-box-wrapper {
margin: 0px 20px;
}
.windows {