Wizard file updates

akaunting · Oct 23, 2018 · 121f0b8 · 121f0b8
1 parent 97f43a0
commit 121f0b8
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 21 deletions.
diff --git a/public/css/app.css b/public/css/app.css
@@ -775,27 +775,34 @@ input[type="number"] {
 }
 
 .stepwizard-step p {
-    margin-top: 0px;
+    margin-top: 5px;
+    font-size: 16px;
     color:#666;
 }
+
 .stepwizard-row {
     display: table-row;
 }
+
 .stepwizard {
     display: table;
     width: 100%;
     position: relative;
+    margin-top: 20px;
 }
+
 .stepwizard-step button[disabled] {
     /*opacity: 1 !important;
     filter: alpha(opacity=100) !important;*/
 }
+
 .stepwizard .btn.disabled, .stepwizard .btn[disabled], .stepwizard fieldset[disabled] .btn {
     opacity:1 !important;
     color:#bbb;
 }
+
 .stepwizard-row:before {
-    top: 14px;
+    top: 26px;
     bottom: 0;
     position: absolute;
     content:" ";
@@ -804,17 +811,23 @@ input[type="number"] {
     background-color: #ccc;
     z-index: 0;
 }
+
 .stepwizard-step {
     display: table-cell;
     text-align: center;
     position: relative;
 }
+
+.btn-circle.btn-success {
+    color: #fff;
+}
+
 .btn-circle {
-    width: 30px;
-    height: 30px;
+    width: 50px;
+    height: 50px;
     text-align: center;
-    padding: 6px 0;
-    font-size: 12px;
-    line-height: 1.428571429;
-    border-radius: 15px;
+    padding: 0px 0;
+    font-size: 30px;
+    line-height: 1.428571;
+    border-radius: 30px;
 }
diff --git a/resources/views/partials/wizard/content.blade.php b/resources/views/partials/wizard/content.blade.php
@@ -1,7 +1,7 @@
 @stack('content_start')
 
 <!-- Content Wrapper. Contains page content -->
-<div class="content-wrapper no-margin" style="">
+<div class="content-wrapper no-margin">
     @stack('content_wrapper_start')
 
     <!-- Content Header (Page header) -->

diff --git a/resources/views/partials/wizard/footer.blade.php b/resources/views/partials/wizard/footer.blade.php
@@ -1,6 +1,6 @@
 @stack('footer_start')
 
-<footer class="main-footer">
+<footer class="main-footer no-margin">
     <div class="pull-right hidden-xs">
         <b>{{ trans('footer.version') }}</b> {{ version('short') }}
     </div>

diff --git a/resources/views/wizard/companies/edit.blade.php b/resources/views/wizard/companies/edit.blade.php
@@ -4,30 +4,35 @@
 
 @section('content')
 <!-- Default box -->
-<div class="box box-success">
-    {!! Form::model($company, ['method' => 'PATCH', 'files' => true, 'url' => ['wizard/companies', $company->id], 'role' => 'form', 'class' => 'form-loading-button']) !!}
-    <div class="box-header">
+<div class="box box-solid">
+    <div class="box-body">
         <div class="stepwizard">
             <div class="stepwizard-row setup-panel">
                 <div class="stepwizard-step col-xs-3">
                     <a href="#step-1" type="button" class="btn btn-success btn-circle">1</a>
                     <p><small>{{ trans_choice('general.companies', 1) }}</small></p>
                 </div>
                 <div class="stepwizard-step col-xs-3">
-                    <a href="#step-2" type="button" class="btn btn-default btn-circle" disabled="disabled">2</a>
+                    <button type="button" class="btn btn-default btn-circle" disabled="disabled">2</button>
                     <p><small>{{ trans_choice('general.currencies', 2) }}</small></p>
                 </div>
                 <div class="stepwizard-step col-xs-3">
-                    <a href="#step-3" type="button" class="btn btn-default btn-circle" disabled="disabled">3</a>
+                    <button type="button" class="btn btn-default btn-circle" disabled="disabled">3</button>
                     <p><small>{{ trans_choice('general.taxes', 2) }}</small></p>
                 </div>
                 <div class="stepwizard-step col-xs-3">
-                    <a href="#step-4" type="button" class="btn btn-default btn-circle" disabled="disabled">4</a>
-                    <p><small>{{ trans_choice('general.companies', 1) }}</small></p>
+                    <button type="button" class="btn btn-default btn-circle" disabled="disabled">4</button>
+                    <p><small>{{ trans_choice('general.finish', 1) }}</small></p>
                 </div>
             </div>
         </div>
     </div>
+</div>
+<div class="box box-success">
+    {!! Form::model($company, ['method' => 'PATCH', 'files' => true, 'url' => ['wizard/companies', $company->id], 'role' => 'form', 'class' => 'form-loading-button']) !!}
+    <div class="box-header with-border">
+        <h3 class="box-title">{{ trans_choice('general.companies', 1) }}</h3>
+    </div>
 
     <div class="box-body">
         <div class="col-md-12 {!! (!setting('general.api_token', null)) ?: 'hidden' !!}">
@@ -42,6 +47,7 @@
             <p>
                 {!! trans('modules.token_link') !!}
             </p>
+            </br>
         </div>
 
         {{ Form::textGroup('company_tax_number', trans('general.tax_number'), 'percent', []) }}
@@ -55,9 +61,12 @@
     <!-- /.box-body -->
 
     <div class="box-footer">
-        {{ Form::saveButtons('wizard/companies') }}
-
-        {!! Form::button('<span class="fa fa-share"></span> &nbsp;' . trans('general.skip'), ['type' => 'button', 'class' => 'btn btn-default  pull-right', 'data-loading-text' => trans('general.loading')]) !!}
+        <div class="col-md-12">
+            <div class="form-group no-margin">
+                {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'submit', 'class' => 'btn btn-success  button-submit', 'data-loading-text' => trans('general.loading')]) !!}
+                {!! Form::button('<span class="fa fa-share"></span> &nbsp;' . trans('general.skip'), ['type' => 'button', 'class' => 'btn btn-default', 'data-loading-text' => trans('general.loading')]) !!}
+            </div>
+        </div>
     </div>
     <!-- /.box-footer -->
 
@@ -79,7 +88,6 @@
     var text_no = '{{ trans('general.no') }}';
 
     $(document).ready(function () {
-
         var navListItems = $('div.setup-panel div a'),
             allWells = $('.setup-content'),
             allNextBtn = $('.nextBtn');