master branch merge

This commit is contained in:
Cüneyt Şentürk
2020-05-29 14:04:34 +03:00
224 changed files with 3473 additions and 1549 deletions

View File

@ -1,40 +1,45 @@
<template>
<SlideYUpTransition :duration="animationDuration">
<div class="modal fade"
@click.self="closeModal"
:class="[{'show d-block': show}, {'d-none': !show}]"
v-show="show"
tabindex="-1"
role="dialog"
:aria-hidden="!show">
<div class="modal-dialog">
<slot name="modal-content">
<div class="modal-content">
<div class="card-header pb-2">
<slot name="card-header">
<h4 class="float-left"> {{ title }} </h4>
<button type="button" class="close" @click="onCancel" aria-hidden="true">&times;</button>
</slot>
</div>
<slot name="modal-body">
<div class="modal-body" v-html="message">
<div class="modal fade"
@click.self="closeModal"
:class="[{'show d-block': show}, {'d-none': !show}]"
v-show="show"
tabindex="-1"
role="dialog"
:aria-hidden="!show">
<div class="modal-dialog" :class="modalDialogClass">
<slot name="modal-content">
<div class="modal-content">
<div class="card-header pb-2">
<slot name="card-header">
<h4 class="float-left"> {{ title }} </h4>
<button type="button" class="close" @click="onCancel" aria-hidden="true">&times;</button>
</slot>
</div>
<slot name="modal-body">
<div class="modal-body" v-html="message">
</div>
</slot>
<div class="card-footer border-top-0 pt-0">
<slot name="card-footer">
<div class="float-right">
<button type="button" class="btn btn-outline-secondary" @click="onCancel">
{{ button_cancel }}
</button>
<button :disabled="form.loading" type="button" class="btn btn-danger button-submit" @click="onConfirm">
<div class="aka-loader"></div><span>{{ button_delete }}</span>
</button>
</div>
</slot>
</div>
</div>
</slot>
<div class="card-footer border-top-0 pt-0">
<slot name="card-footer">
<div class="float-right">
<button type="button" class="btn btn-outline-secondary" @click="onCancel">{{ button_cancel }}</button>
<button :disabled="form.loading" type="button" class="btn btn-danger" @click="onConfirm">
<div class="aka-loader"></div><span>{{ button_delete }}</span>
</button>
</div>
</slot>
</div>
</div>
</slot>
</div>
</div>
</SlideYUpTransition>
</template>
@ -58,6 +63,11 @@ export default {
props: {
show: Boolean,
modalDialogClass: {
type: String,
default: '',
description: "Modal Body size Class"
},
title: {
type: String,
default: '',
@ -96,12 +106,12 @@ export default {
};
},
created: function () {
if (this.show) {
created: function () {
if (this.show) {
let documentClasses = document.body.classList;
documentClasses.add("modal-open");
}
documentClasses.add("modal-open");
}
},
methods: {
@ -117,7 +127,7 @@ export default {
},
onCancel() {
let documentClasses = document.body.classList;
let documentClasses = document.body.classList;
documentClasses.remove("modal-open");
@ -143,4 +153,8 @@ export default {
.modal.show {
background-color: rgba(0, 0, 0, 0.3);
}
.modal-md {
max-width: 650px;
}
</style>

View File

@ -1,46 +1,48 @@
<template>
<SlideYUpTransition :duration="animationDuration">
<div class="modal modal-add-new fade"
@click.self="closeModal"
:class="[{'show d-block': show}, {'d-none': !show}]"
v-show="show"
tabindex="-1"
role="dialog"
:aria-hidden="!show">
<div class="modal-dialog" :class="modalDialogClass">
<slot name="modal-content">
<div class="modal-content">
<div class="card-header pb-2">
<slot name="card-header">
<h4 class="float-left"> {{ title }} </h4>
<button type="button" class="close" @click="onCancel" aria-hidden="true">&times;</button>
</slot>
</div>
<slot name="modal-body">
<div class="modal-body pb-0" v-if="!is_component" v-html="message">
</div>
<div class="modal-body pb-0" v-else>
<form id="form-create" method="POST" action="#"/>
<component v-bind:is="component"></component>
<div class="modal modal-add-new fade"
@click.self="closeModal"
:class="[{'show d-block': show}, {'d-none': !show}]"
v-show="show"
tabindex="-1"
role="dialog"
:aria-hidden="!show">
<div class="modal-dialog" :class="modalDialogClass">
<slot name="modal-content">
<div class="modal-content">
<div class="card-header pb-2">
<slot name="card-header">
<h4 class="float-left"> {{ title }} </h4>
<button type="button" class="close" @click="onCancel" aria-hidden="true">&times;</button>
</slot>
</div>
<slot name="modal-body">
<div class="modal-body pb-0" v-if="!is_component" v-html="message">
</div>
<div class="modal-body pb-0" v-else>
<form id="form-create" method="POST" action="#"/>
<component v-bind:is="component"></component>
</div>
</slot>
<div class="card-footer border-top-0 pt-0">
<slot name="card-footer">
<div class="float-right">
<button type="button" class="btn btn-outline-secondary" :class="buttons.cancel.class" @click="onCancel">
{{ buttons.cancel.text }}
</button>
<button :disabled="form.loading" type="button" class="btn button-submit" :class="buttons.confirm.class" @click="onSubmit">
<div class="aka-loader"></div><span>{{ buttons.confirm.text }}</span>
</button>
</div>
</slot>
</div>
</div>
</slot>
<div class="card-footer border-top-0 pt-0">
<slot name="card-footer">
<div class="float-right">
<button type="button" class="btn btn-outline-secondary" :class="buttons.cancel.class" @click="onCancel">
{{ buttons.cancel.text }}
</button>
<button :disabled="form.loading" type="button" class="btn button-submit" :class="buttons.confirm.class" @click="onSubmit">
<div class="aka-loader"></div><span>{{ buttons.confirm.text }}</span>
</button>
</div>
</slot>
</div>
</div>
</slot>
</div>
</div>
</SlideYUpTransition>
</template>
@ -262,4 +264,8 @@ export default {
.modal.show {
background-color: rgba(0, 0, 0, 0.3);
}
.modal-md {
max-width: 650px;
}
</style>

View File

@ -1127,6 +1127,10 @@ export default {
this.$emit('new', response.data.data);
this.change();
let documentClasses = document.body.classList;
documentClasses.remove("modal-open");
}
})
.catch(error => {
@ -1142,6 +1146,10 @@ export default {
this.add_new.show = false;
this.add_new.html = null;
this.add_new_html = null;
let documentClasses = document.body.classList;
documentClasses.remove("modal-open");
},
addModal() {

View File

@ -825,6 +825,10 @@ export default {
this.$emit('new', response.data.data);
this.change();
let documentClasses = document.body.classList;
documentClasses.remove("modal-open");
}
})
.catch(error => {
@ -840,6 +844,10 @@ export default {
this.add_new.show = false;
this.add_new.html = null;
this.add_new_html = null;
let documentClasses = document.body.classList;
documentClasses.remove("modal-open");
},
addModal() {