shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1222 from batuhawk/master

Browse Source 
All button icons removed in modals
This commit is contained in:
Batuhan Baş 2020-02-03 15:58:08 +03:00 committed by GitHub
commit 2cdd395327
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
resources/assets/js/components/AkauntingModal.vue
View File

@ -23,15 +23,12 @@
<div class="card-footer border-top-0 pt-0"> <div class="card-footer border-top-0 pt-0">
<slot name="card-footer"> <slot name="card-footer">
<div class="float-right"> <div class="float-right">
<button type="button" class="btn btn-icon btn-outline-secondary" @click="onCancel"> <button type="button" class="btn btn-outline-secondary" @click="onCancel">
<span class="btn-inner--icon"><i class="fas fa-times"></i></span> {{ button_cancel }}
<span class="btn-inner--text">{{ button_cancel }}</span>
</button> </button>
<button :disabled="form.loading" type="button" class="btn btn-icon btn-danger button-submit" @click="onConfirm"> <button :disabled="form.loading" type="button" class="btn btn-danger button-submit" @click="onConfirm">
<div v-if="form.loading" class="aka-loader-frame btn-delete"><div class="aka-loader"></div></div> <div class="aka-loader"></div><span>{{ button_delete }}</span>
<span v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-trash"></i></span>
<span v-if="!form.loading" class="btn-inner--text">{{ button_delete }}</span>
</button> </button>
</div> </div>
</slot> </slot>

11
resources/assets/js/components/AkauntingModalAddNew.vue
View File

@ -27,15 +27,12 @@
<div class="card-footer border-top-0 pt-0"> <div class="card-footer border-top-0 pt-0">
<slot name="card-footer"> <slot name="card-footer">
<div class="float-right"> <div class="float-right">
<button type="button" class="btn btn-icon" :class="buttons.cancel.class" @click="onCancel"> <button type="button" class="btn btn-outline-secondary" :class="buttons.cancel.class" @click="onCancel">
<span class="btn-inner--icon"><i :class="buttons.cancel.icon"></i></span> {{ buttons.cancel.text }}
<span class="btn-inner--text">{{ buttons.cancel.text }}</span>
</button> </button>
<button :disabled="form.loading" type="button" class="btn btn-icon button-submit" :class="buttons.confirm.class" @click="onSubmit"> <button :disabled="form.loading" type="button" class="btn button-submit" :class="buttons.confirm.class" @click="onSubmit">
<div v-if="form.loading" class="aka-loader-frame btn-delete"><div class="aka-loader"></div></div> <div class="aka-loader"></div><span>{{ buttons.confirm.text }}</span>
<span v-if="!form.loading" class="btn-inner--icon"><i :class="buttons.confirm.icon"></i></span>
<span v-if="!form.loading" class="btn-inner--text">{{ buttons.confirm.text }}</span>
</button> </button>
</div> </div>
</slot> </slot>

4
resources/assets/js/views/settings/settings.js vendored
View File

@ -119,6 +119,10 @@ const app = new Vue({
this.template.errors = this.invoice_form.errors; this.template.errors = this.invoice_form.errors;
} }
this.form.loading = true;
this.$emit("confirm");
}, },
closeTemplate() { closeTemplate() {

2
resources/views/partials/form/save_buttons.blade.php
View File

@ -14,7 +14,7 @@
</a> </a>
{!! Form::button( {!! Form::button(
'<div v-if="form.loading" class="aka-loader-frame"><div class="aka-loader"></div></div> <span v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-save"></i></span>' . '<span v-if="!form.loading" class="btn-inner--text"> ' . trans('general.save') . '</span>', '<div v-if="form.loading" class="aka-loader-frame"><div class="aka-loader"></div></div> <span v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-save"></i></span>' . '<span v-if="!form.loading" class="btn-inner--text">' . trans('general.save') . '</span>',
[':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success button-submit header-button-top', 'data-loading-text' => trans('general.loading')]) !!} [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success button-submit header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
</div> </div>

11
resources/views/purchases/bills/show.blade.php
View File

@ -605,15 +605,12 @@
<template #card-footer> <template #card-footer>
<div class="float-right"> <div class="float-right">
<button type="button" class="btn btn-icon btn-outline-secondary header-button-top" @click="closePayment"> <button type="button" class="btn btn-outline-secondary header-button-top" @click="closePayment">
<span class="btn-inner--icon"><i class="fas fa-times"></i></span> {{ trans('general.cancel') }}
<span class="btn-inner--text">{{ trans('general.cancel') }}</span>
</button> </button>
<button :disabled="form.loading" type="button" class="btn btn-icon btn-success button-submit header-button-top" @click="addPayment"> <button :disabled="form.loading" type="button" class="btn btn-success button-submit header-button-top" @click="addPayment">
<div v-if="form.loading" class="aka-loader-frame btn-confirm"><div class="aka-loader"></div></div> <div class="aka-loader"></div><span>{{ trans('general.confirm') }}</span>
<span v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-check"></i></span>
<span v-if="!form.loading" class="btn-inner--text">{{ trans('general.confirm') }}</span>
</button> </button>
</div> </div>
</template> </template>

16
resources/views/sales/invoices/show.blade.php
View File

@ -664,20 +664,16 @@
<template #card-footer> <template #card-footer>
<div class="float-right"> <div class="float-right">
<button type="button" class="btn btn-icon btn-outline-secondary header-button-top" @click="closePayment"> <button type="button" class="btn btn-outline-secondary header-button-top" @click="closePayment">
<span class="btn-inner--icon"><i class="fas fa-times"></i></span> {{ trans('general.cancel') }}
<span class="btn-inner--text">{{ trans('general.cancel') }}</span>
</button> </button>
<a href="{{ route('apps.categories.show', 'payment-method') }}" class="btn btn-icon btn-white header-button-top long-texts"> <a href="{{ route('apps.categories.show', 'payment-method') }}" class="btn btn-white header-button-top long-texts">
<span class="btn-inner--icon"><i class="fas fa-credit-card"></i></span> {{ trans('invoices.accept_payments') }}</span>
<span class="btn-inner--text">{{ trans('invoices.accept_payments') }}</span>
</a> </a>
<button :disabled="form.loading" type="button" class="btn btn-icon btn-success button-submit header-button-top" @click="addPayment"> <button :disabled="form.loading" type="button" class="btn btn-success button-submit header-button-top" @click="addPayment">
<div v-if="form.loading" class="aka-loader-frame btn-confirm"><div class="aka-loader"></div></div> <div class="aka-loader"></div><span>{{ trans('general.confirm') }}</span>
<span v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-check"></i></span>
<span v-if="!form.loading" class="btn-inner--text">{{ trans('general.confirm') }}</span>
</button> </button>
</div> </div>
</template> </template>

7
resources/views/settings/invoice/edit.blade.php
View File

@ -81,12 +81,11 @@
<template #card-footer> <template #card-footer>
<div class="float-right"> <div class="float-right">
<button type="button" class="btn btn-outline-secondary" @click="closeTemplate"> <button type="button" class="btn btn-outline-secondary" @click="closeTemplate">
<span>{{ trans('general.cancel') }}</span> {{ trans('general.cancel') }}
</button> </button>
<button type="button" class="btn btn-success button-submit" @click="addTemplate"> <button :disabled="form.loading" type="button" class="btn btn-success button-submit" @click="addTemplate">
<div class="aka-loader d-none"></div> <div class="aka-loader"></div><span>{{ trans('general.confirm') }}</span>
<span>{{ trans('general.confirm') }}</span>
</button> </button>
</div> </div>
</template> </template>