scaffold

resources/assets/dcat/sass/components/_button.scss

@@ -86,6 +86,10 @@
   padding: 0.5rem .7rem;
 }
 
+a.btn:not(.btn-white) {
+  color: $white;
+}
+
 // loading
 .btn:not(.btn-sm) .spinner-grow, a:not(.btn) .spinner-grow {
   margin-bottom: .15rem;

resources/assets/dcat/sass/components/_table.scss

@@ -37,9 +37,9 @@ table.data-list-view.dataTable, table.data-thumb-view.dataTable {
   border-spacing: 0 .9rem;
   padding: 0;
 }
-table.data-list-view.dataTable tbody tr:hover, table.data-thumb-view.dataTable tbody tr:hover {
+table.data-list-view.dataTable tbody tr:hover, table.data-thumb-view.dataTable tbody tr:hover, .table-hover tbody tr:hover {
   transform: none;
-  background: $dark20;
+  background: lighten($dark30, 1%);
 }
 
 .table td {

resources/dist/dcat/css/dcat-app.css

@@ -1864,6 +1864,10 @@ dl {
   padding: 0.5rem 0.7rem;
 }
 
+a.btn:not(.btn-white) {
+  color: #fff;
+}
+
 .btn:not(.btn-sm) .spinner-grow,
 a:not(.btn) .spinner-grow {
   margin-bottom: 0.15rem;
@@ -2084,9 +2088,10 @@ table.data-thumb-view.dataTable {
 }
 
 table.data-list-view.dataTable tbody tr:hover,
-table.data-thumb-view.dataTable tbody tr:hover {
+table.data-thumb-view.dataTable tbody tr:hover,
+.table-hover tbody tr:hover {
   transform: none;
-  background: #f6fbff;
+  background: #f8fafc;
 }
 
 .table td {

resources/views/helpers/scaffold.blade.php

@@ -1,11 +1,11 @@
 @php
-    $timestamps = new \Dcat\Admin\Widgets\Checkbox('timestamps');
+    $timestamps = Dcat\Admin\Widgets\Checkbox::make('timestamps')->inline();
     $timestamps->options([1 => 'Created_at & Updated_at'])->check(1);
 
-    $soft = new \Dcat\Admin\Widgets\Checkbox('soft_deletes');
+    $soft = Dcat\Admin\Widgets\Checkbox::make('soft_deletes')->inline();
     $soft->options([1 => ucfirst(trans('admin.scaffold.soft_delete'))]);
 
-    $actionCreators = new \Dcat\Admin\Widgets\Checkbox('create[]');
+    $actionCreators = Dcat\Admin\Widgets\Checkbox::make('create[]')->inline();
     $actionCreators->options([
         'migration' => ucfirst(trans('admin.scaffold.create_migration')),
         'model' => ucfirst(trans('admin.scaffold.create_model')),
@@ -23,18 +23,11 @@
     .select2-container .select2-selection--single {
         height: 34px !important;
     }
-    #inputTableName {
-        width:300px;
-        border-right:0;
-    }
-    #inputModelName {
-        width:600px;
-    }
-    #inputControllerName {
-        width:600px;
-    }
+    /*#inputTableName {*/
+    /*    width:300px;*/
+    /*}*/
     .choose-exist-table {
-        min-width:300px
+        width: 100%;
     }
 </style>
 <div class="card">
@@ -46,60 +39,63 @@
 
             <div class="form-horizontal">
 
-                <div class="form-group">
+                <div class="form-group row">
+
+{{--                    <label for="inputTableName" class="col-sm-1 control-label">{{ucfirst(trans('admin.scaffold.table'))}}</label>--}}
 
-                    <label for="inputTableName" class="col-sm-1 control-label">{{ucfirst(trans('admin.scaffold.table'))}}</label>
+                    <div for="inputTableName"  class="col-sm-1 control-label">
+                        <span>{{ucfirst(trans('admin.scaffold.table'))}}</span>
+                    </div>
 
-                    <div class="col-sm-11 ">
+                    <div class="col-sm-2 ">
                         <div class="input-group">
                             <input type="text" name="table_name" class="form-control" id="inputTableName" placeholder="{{ucfirst(trans('admin.scaffold.table'))}}" value="{{ old('table_name') }}">
-                            <div class=" pull-left" style="">
-                                <select class="choose-exist-table"  name="exist-table">
-                                    <option value="0" selected>{{trans('admin.scaffold.choose')}}</option>
-                                    @foreach($tables as $db => $tb)
-                                        <optgroup label="{!! $db !!}">
-                                            @foreach($tb as $v)
-                                                <option value="{{$db}}|{{$v}}">{{$v}}</option>
-                                            @endforeach
-                                        </optgroup>
-                                    @endforeach
-                                </select>
-                            </div>
+
                         </div>
                     </div>
 
-                    <span class="help-block hide" id="table-name-help" style="margin-left:100px">
+                    <div class=" col-sm-2" style="margin-left: -15px;">
+                        <select class="choose-exist-table"  name="exist-table">
+                            <option value="0" selected>{{trans('admin.scaffold.choose')}}</option>
+                            @foreach($tables as $db => $tb)
+                                <optgroup label="{!! $db !!}">
+                                    @foreach($tb as $v)
+                                        <option value="{{$db}}|{{$v}}">{{$v}}</option>
+                                    @endforeach
+                                </optgroup>
+                            @endforeach
+                        </select>
+                    </div>
+
+                    <span class="help-block " id="table-name-help" style="margin-left:150px;display: none">
                         <i class="fa fa-info"></i>&nbsp; Table name can't be empty!
                     </span>
 
                 </div>
-                <div class="form-group">
-                    <label for="inputModelName" class="col-sm-1 control-label">{{ucfirst(trans('admin.scaffold.model'))}}</label>
+                <div class="form-group row">
+                    <span for="inputModelName" class="col-sm-1 control-label">{{ucfirst(trans('admin.scaffold.model'))}}</span>
 
                     <div class="col-sm-4">
                         <input type="text" name="model_name" class="form-control" id="inputModelName" placeholder="{{ucfirst(trans('admin.scaffold.model'))}}" value="{{ old('model_name', "App\\Models\\") }}">
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <label for="inputControllerName" class="col-sm-1 control-label">{{ucfirst(trans('admin.scaffold.controller'))}}</label>
+                <div class="form-group row">
+                    <span for="inputControllerName" class="col-sm-1 control-label">{{ucfirst(trans('admin.scaffold.controller'))}}</span>
 
                     <div class="col-sm-4">
                         <input type="text" name="controller_name" class="form-control" id="inputControllerName" placeholder="{{ucfirst(trans('admin.scaffold.controller'))}}" value="{{ old('controller_name', "App\\Admin\\Controllers\\") }}">
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <div class="col-sm-offset-1 col-sm-11">
-                        <div class="d-flex">
-                            {!! $actionCreators->render(); !!}
-                        </div>
+                <div class="form-group row">
+                    <div class="offset-sm-1 col-sm-11 mt-1">
+                        {!! $actionCreators->render(); !!}
                     </div>
                 </div>
 
             </div>
 
-            {{--            <hr />--}}
             <table class="table table-hover responsive table-header-gray " id="table-fields" style="margin-top:25px;">
                 <thead>
                 <tr>
@@ -131,9 +127,13 @@
                                 </select>
                             </td>
                             <td>
-                                <div class="checkbox checkbox-primary checkbox-inline checkbox-circle">
+                                <div class="vs-checkbox-con vs-checkbox-primary" >
                                     <input name="fields[{{$index}}][nullable]" type="checkbox" {{ \Illuminate\Support\Arr::get($field, 'nullable') == 'on' ? 'checked': '' }}>
-                                    <label></label>
+                                    <span class="vs-checkbox vs-checkbox-">
+                                      <span class="vs-checkbox--check">
+                                        <i class="vs-icon feather icon-check"></i>
+                                      </span>
+                                    </span>
                                 </div>
                             </td>
                             <td>
@@ -146,7 +146,7 @@
                             </td>
                             <td><input type="text" class="form-control" placeholder="{{trans('admin.scaffold.default')}}" name="fields[{{$index}}][default]" value="{{$field['default']}}"/></td>
                             <td><input type="text" class="form-control" placeholder="{{trans('admin.scaffold.comment')}}" name="fields[{{$index}}][comment]" value="{{$field['comment']}}" /></td>
-                            <td><a class="btn btn-sm btn-danger table-field-remove"><i class="ti-trash"></i></a></td>
+                            <td><a class="btn btn-sm btn-danger table-field-remove"><i class="feather icon-trash"></i></a></td>
                         </tr>
                     @endforeach
                 @else
@@ -165,9 +165,13 @@
                             </select>
                         </td>
                         <td>
-                            <div class="checkbox checkbox-primary checkbox-inline checkbox-circle">
+                            <div class="vs-checkbox-con vs-checkbox-primary" >
                                 <input name="fields[0][nullable]" type="checkbox"  />
-                                <label></label>
+                                <span class="vs-checkbox vs-checkbox-">
+                                  <span class="vs-checkbox--check">
+                                    <i class="vs-icon feather icon-check"></i>
+                                  </span>
+                                </span>
                             </div>
                         <td>
                             <select style="width: 150px" name="fields[0][key]">
@@ -179,7 +183,7 @@
                         </td>
                         <td><input type="text" class="form-control" placeholder="{{trans('admin.scaffold.default')}}" name="fields[0][default]"></td>
                         <td><input type="text" class="form-control" placeholder="{{trans('admin.scaffold.comment')}}" name="fields[0][comment]"></td>
-                        <td><a class="btn btn-sm btn-danger table-field-remove"><i class="ti-trash"></i></a></td>
+                        <td><a class="btn btn-sm btn-danger table-field-remove"><i class="feather icon-trash"></i></a></td>
                     </tr>
                 @endif
                 </tbody>
@@ -187,35 +191,34 @@
 
             <hr style="margin-top: 0;"/>
 
-            <div class='form-inline margin' style="width: 100%">
-
+            <div class='form-inline d-flex justify-content-between' style="width: 100%; padding: 0 20px 12px;">
 
                 <div class='form-group'>
-                    <button type="button" class="btn btn-sm btn-success" id="add-table-field"><i class="ti-plus"></i>&nbsp;&nbsp;{{ucfirst(trans('admin.scaffold.add_field'))}}</button>
+                    <button type="button" class="btn btn-sm btn-success" id="add-table-field"><i class="feather icon-plus"></i>&nbsp;&nbsp;{{ucfirst(trans('admin.scaffold.add_field'))}}</button>
                 </div>
 
-                <div class='form-group pull-right' style="margin-right: 20px; margin-top: 5px;">
-                    <div class="d-flex">
-                    {!! $timestamps->render() !!}
-                    {!! $soft->render() !!}
+                <div class="row">
+                    <div class="form-group" style="margin-right: 20px;">
+                        <span for="inputPrimaryKey">{{ucfirst(trans('admin.scaffold.pk'))}}&nbsp;&nbsp;</span>
+                        <input type="text" name="primary_key" class="form-control" id="inputPrimaryKey" placeholder="{{ucfirst(trans('admin.scaffold.pk'))}}" value="id" style="width: 100px;">
                     </div>
-                </div>
 
-                <div class="form-group pull-right" style="margin-right: 20px;">
-                    <label for="inputPrimaryKey">{{ucfirst(trans('admin.scaffold.pk'))}}</label>
-                    <input type="text" name="primary_key" class="form-control" id="inputPrimaryKey" placeholder="{{ucfirst(trans('admin.scaffold.pk'))}}" value="id" style="width: 100px;">
-                </div>
+                    <div class='form-group'>
+                        {!! $timestamps->render() !!}
+                        {!! $soft->render() !!}
+                    </div>
 
+                </div>
             </div>
 
             <!-- /.box-body -->
-            <div class="box-footer">
-                <button type="submit" class="btn btn-primary pull-right">{{ucfirst(trans('admin.submit'))}}</button>
+            <div class="box-footer d-flex justify-content-between">
+                <div></div>
+                <button type="submit" class="btn btn-primary"><i class="feather icon-save"></i> {{ucfirst(trans('admin.submit'))}}</button>
             </div>
 
         {{ csrf_field() }}
 
-        <!-- /.box-footer -->
         </form>
 
     </div>
@@ -238,9 +241,13 @@
             </select>
         </td>
         <td>
-            <div class="checkbox checkbox-primary checkbox-inline checkbox-circle">
+            <div class="vs-checkbox-con vs-checkbox-primary" >
                 <input {nullable} name="fields[__index__][nullable]" type="checkbox"  />
-                <label></label>
+                <span class="vs-checkbox vs-checkbox-">
+                  <span class="vs-checkbox--check">
+                    <i class="vs-icon feather icon-check"></i>
+                  </span>
+                </span>
             </div>
         <td>
             <select style="width: 150px" name="fields[__index__][key]">
@@ -251,7 +258,7 @@
         </td>
         <td><input value="{default}" type="text" class="form-control" placeholder="{{trans('admin.scaffold.default')}}" name="fields[__index__][default]"></td>
         <td><input value="{comment}" type="text" class="form-control" placeholder="{{trans('admin.scaffold.comment')}}" name="fields[__index__][comment]"></td>
-        <td><a class="btn btn-sm btn-danger table-field-remove"><i class="ti-trash"></i></a></td>
+        <td><a class="btn btn-sm btn-danger table-field-remove"><i class="feather icon-trash"></i></a></td>
     </tr>
 </template>
 
@@ -283,7 +290,7 @@
 
             if ($table.val() == '') {
                 $table.closest('.form-group').addClass('has-error');
-                $('#table-name-help').removeClass('hide');
+                $('#table-name-help').show();
 
                 return false;
             }

resources/views/widgets/alert.blade.php

@@ -3,7 +3,7 @@
     <button type="button" class="close" data-dismiss="alert">×</button>
     @endif
     @if($title)
-    <h4>@if($icon)<i class="{{ $icon }}"></i>@endif {!! $title !!}</h4>
+    <h4>@if($icon)<i class="{{ $icon }}"></i>&nbsp;@endif {!! $title !!}</h4>
     @endif
     {!! $content !!}
 </div>