Skip to content

Commit

Permalink
close #1283 Fixed: Not able to install via Firefox
Browse files Browse the repository at this point in the history
  • Loading branch information
@cuneytsenturk
cuneytsenturk committed Feb 24, 2020
1 parent 4ad2ebf commit 46e2be4
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 54 deletions.
23 changes: 15 additions & 8 deletions resources/assets/js/views/install/Database.vue
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div>
<div class="card">
<div class="card-header wizard-header p-3">
<el-steps :active="active" finish-status="success" align-center>
<el-step title="Language"></el-step>
Expand Down Expand Up @@ -75,13 +75,20 @@
</div>

<div class="card-footer">
<div class="float-right">
<button v-on:click="onSubmit" :disabled="form.loading" type="submit" id="next-button" class="btn btn-success header-button-top" data-loading-text="Loading...">
<div class="aka-loader"></div>
<span>Next &nbsp;
<i class="fa fa-arrow-right"></i>
</span>
</button>
<div class="row save-buttons">
<div class="col-md-12">
<button type="submit" @click="onSubmit" :disabled="form.loading" id="next-button" class="btn btn-icon btn-success button-submit header-button-top">
<div v-if="form.loading" class="aka-loader-frame">
<div class="aka-loader"></div>
</div>
<span v-if="!form.loading" class="btn-inner--text">
Next &nbsp;
</span>
<span v-if="!form.loading" class="btn-inner--icon">
<i class="fas fa-arrow-right"></i>
</span>
</button>
</div>
</div>
</div>
</div>
Expand Down
23 changes: 15 additions & 8 deletions resources/assets/js/views/install/Language.vue
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div>
<div class="card">
<div class="card-header wizard-header p-3">
<el-steps :active="active" finish-status="success" align-center>
<el-step title="Language"></el-step>
Expand All @@ -23,13 +23,20 @@
</div>

<div class="card-footer">
<div class="float-right">
<button v-on:click="onSubmit" :disabled="form.loading" type="submit" id="next-button" class="btn btn-success header-button-top" data-loading-text="Loading...">
<div class="aka-loader"></div>
<span>Next &nbsp;
<i class="fa fa-arrow-right"></i>
</span>
</button>
<div class="row save-buttons">
<div class="col-md-12">
<button type="submit" @click="onSubmit" :disabled="form.loading" id="next-button" class="btn btn-icon btn-success button-submit header-button-top">
<div v-if="form.loading" class="aka-loader-frame">
<div class="aka-loader"></div>
</div>
<span v-if="!form.loading" class="btn-inner--text">
Next &nbsp;
</span>
<span v-if="!form.loading" class="btn-inner--icon">
<i class="fas fa-arrow-right"></i>
</span>
</button>
</div>
</div>
</div>
</div>
Expand Down
23 changes: 15 additions & 8 deletions resources/assets/js/views/install/Settings.vue
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div>
<div class="card">
<div class="card-header wizard-header p-3">
<el-steps :active="active" finish-status="success" align-center>
<el-step title="Language"></el-step>
Expand Down Expand Up @@ -73,13 +73,20 @@
</div>

<div class="card-footer">
<div class="float-right">
<button v-on:click="onSubmit" :disabled="form.loading" type="submit" id="next-button" class="btn btn-success" data-loading-text="Loading...">
<div class="aka-loader"></div>
<span>Next &nbsp;
<i class="fa fa-arrow-right"></i>
</span>
</button>
<div class="row save-buttons">
<div class="col-md-12">
<button type="submit" @click="onSubmit" :disabled="form.loading" id="next-button" class="btn btn-icon btn-success button-submit header-button-top">
<div v-if="form.loading" class="aka-loader-frame">
<div class="aka-loader"></div>
</div>
<span v-if="!form.loading" class="btn-inner--text">
Next &nbsp;
</span>
<span v-if="!form.loading" class="btn-inner--icon">
<i class="fas fa-arrow-right"></i>
</span>
</button>
</div>
</div>
</div>
</div>
Expand Down
60 changes: 30 additions & 30 deletions resources/views/layouts/install.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,44 +18,44 @@
<div class="container mt--7 pb-5">
<div class="row justify-content-center">
<div class="col-lg-5 col-md-7">
<div class="card">
<div id="app">
{!! Form::open([
'url' => url()->current(),
'role' => 'form',
'id' => 'form-install'
'id' => 'form-install',
'@submit.prevent' => 'onSubmit',
'@keydown' => 'form.errors.clear($event.target.name)',
]) !!}
<div id="app">
<div class="card-body">
<div class="text-center text-muted mt-2 mb-4">
<small>@yield('header')</small>
</div>
<div class="card-body">
<div class="text-center text-muted mt-2 mb-4">
<small>@yield('header')</small>
</div>

@include('flash::message')
@include('flash::message')

@yield('content')
</div>
@yield('content')
</div>

<div class="card-footer">
<div class="float-right">
@if (Request::is('install/requirements'))
<a href="{{ route('install.requirements') }}" class="btn btn-success"> {{ trans('install.refresh') }} &nbsp;<i class="fa fa-refresh"></i></a>
@else
{!! Form::button(
'<i v-if="loading" :class="(loading) ? \'show \' : \'\'" class="fas fa-spinner fa-spin d-none"></i> ' .
trans('install.next') .
' &nbsp;<i class="fa fa-arrow-right"></i>',
[
':disabled' => 'loading',
'type' => 'submit',
'id' => 'next-button',
'class' => 'btn btn-success',
'data-loading-text' => trans('general.loading')
]
) !!}
@endif
</div>
</div>
<div class="card-footer">
<div class="float-right">
@if (Request::is('install/requirements'))
<a href="{{ route('install.requirements') }}" class="btn btn-success"> {{ trans('install.refresh') }} &nbsp;<i class="fa fa-refresh"></i></a>
@else
{!! Form::button(
'<i v-if="loading" :class="(loading) ? \'show \' : \'\'" class="fas fa-spinner fa-spin d-none"></i> ' .
trans('install.next') .
' &nbsp;<i class="fa fa-arrow-right"></i>',
[
':disabled' => 'loading',
'type' => 'submit',
'id' => 'next-button',
'class' => 'btn btn-success',
'data-loading-text' => trans('general.loading')
]
) !!}
@endif
</div>
</div>
{!! Form::close() !!}
</div>
</div>
Expand Down

0 comments on commit 46e2be4

Please sign in to comment.