show relation

resources/assets/dcat/js/bootstrappers/DataActions.js

@@ -73,7 +73,7 @@ let defaultActions = {
     // 图片预览
     'preview-img': function ($action, Dcat) {
         return function () {
-            return Dcat.previewImage($(this).attr('src'));
+            return Dcat.helpers.previewImage($(this).attr('src'));
         };
     },
 

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

@@ -84,5 +84,10 @@
 
 .box.box-solid.box-default {
   border: 1px solid $input-border-color;
+  box-shadow: 0 1px 1px rgba(0,0,0,.1);
+}
+
+.form-group .box {
+  margin-bottom: 0;
 }
 

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

@@ -28,6 +28,9 @@
   height: 30px;
 }
 
+a.btn-sm, .btn-group-sm > a.btn {
+  padding: 0.6rem 1rem !important;
+}
 
 .btn-custom {
   background: $custom;
@@ -86,10 +89,6 @@
   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/_form.scss

@@ -1,13 +1,6 @@
-.form-control {
-  //padding: 0.55rem 0.7rem;
-}
 
 .form-control-sm {
-  //height: calc(1em + 1rem + 2px);
   padding: 0.5rem 1.5rem;
-  //font-size: 0.7rem;
-  //line-height: 1;
-  //border-radius: 4px;
 }
 
 select.form-control:not([multiple=multiple]) {

resources/assets/dcat/sass/dcat-app.scss

@@ -143,3 +143,7 @@ a.disabled {
   background-color: #d2d6de;
 }
 
+.img {
+  cursor: pointer;
+}
+

resources/dist/css/plugins/loaders/animations/ball-grid-beat.css

@@ -27,66 +27,66 @@
 }
 
 .ball-grid-beat > div:nth-child(1) {
-  -webkit-animation-delay: -0.03s;
-          animation-delay: -0.03s;
-  -webkit-animation-duration: 1.39s;
-          animation-duration: 1.39s;
+  -webkit-animation-delay: 0.19s;
+          animation-delay: 0.19s;
+  -webkit-animation-duration: 0.87s;
+          animation-duration: 0.87s;
 }
 
 .ball-grid-beat > div:nth-child(2) {
-  -webkit-animation-delay: 0.24s;
-          animation-delay: 0.24s;
-  -webkit-animation-duration: 1.03s;
-          animation-duration: 1.03s;
+  -webkit-animation-delay: 0.8s;
+          animation-delay: 0.8s;
+  -webkit-animation-duration: 0.95s;
+          animation-duration: 0.95s;
 }
 
 .ball-grid-beat > div:nth-child(3) {
-  -webkit-animation-delay: 0.73s;
-          animation-delay: 0.73s;
-  -webkit-animation-duration: 1.39s;
-          animation-duration: 1.39s;
+  -webkit-animation-delay: 0.61s;
+          animation-delay: 0.61s;
+  -webkit-animation-duration: 0.74s;
+          animation-duration: 0.74s;
 }
 
 .ball-grid-beat > div:nth-child(4) {
-  -webkit-animation-delay: 0.71s;
-          animation-delay: 0.71s;
-  -webkit-animation-duration: 1.13s;
-          animation-duration: 1.13s;
+  -webkit-animation-delay: 0.11s;
+          animation-delay: 0.11s;
+  -webkit-animation-duration: 1.57s;
+          animation-duration: 1.57s;
 }
 
 .ball-grid-beat > div:nth-child(5) {
-  -webkit-animation-delay: -0.05s;
-          animation-delay: -0.05s;
-  -webkit-animation-duration: 1.4s;
-          animation-duration: 1.4s;
+  -webkit-animation-delay: 0.52s;
+          animation-delay: 0.52s;
+  -webkit-animation-duration: 1.33s;
+          animation-duration: 1.33s;
 }
 
 .ball-grid-beat > div:nth-child(6) {
-  -webkit-animation-delay: -0.04s;
-          animation-delay: -0.04s;
-  -webkit-animation-duration: 1.52s;
-          animation-duration: 1.52s;
+  -webkit-animation-delay: 0.62s;
+          animation-delay: 0.62s;
+  -webkit-animation-duration: 1.26s;
+          animation-duration: 1.26s;
 }
 
 .ball-grid-beat > div:nth-child(7) {
-  -webkit-animation-delay: 0.01s;
-          animation-delay: 0.01s;
-  -webkit-animation-duration: 1.26s;
-          animation-duration: 1.26s;
+  -webkit-animation-delay: 0.55s;
+          animation-delay: 0.55s;
+  -webkit-animation-duration: 0.78s;
+          animation-duration: 0.78s;
 }
 
 .ball-grid-beat > div:nth-child(8) {
-  -webkit-animation-delay: 0.15s;
-          animation-delay: 0.15s;
-  -webkit-animation-duration: 1.23s;
-          animation-duration: 1.23s;
+  -webkit-animation-delay: 0.57s;
+          animation-delay: 0.57s;
+  -webkit-animation-duration: 0.97s;
+          animation-duration: 0.97s;
 }
 
 .ball-grid-beat > div:nth-child(9) {
-  -webkit-animation-delay: 0.68s;
-          animation-delay: 0.68s;
-  -webkit-animation-duration: 1.03s;
-          animation-duration: 1.03s;
+  -webkit-animation-delay: -0.16s;
+          animation-delay: -0.16s;
+  -webkit-animation-duration: 0.7s;
+          animation-duration: 0.7s;
 }
 
 .ball-grid-beat > div {

resources/dist/css/plugins/loaders/animations/ball-grid-pulse.css

@@ -39,66 +39,66 @@
 }
 
 .ball-grid-pulse > div:nth-child(1) {
-  -webkit-animation-delay: 0.74s;
-          animation-delay: 0.74s;
-  -webkit-animation-duration: 0.82s;
-          animation-duration: 0.82s;
+  -webkit-animation-delay: 0.46s;
+          animation-delay: 0.46s;
+  -webkit-animation-duration: 1.49s;
+          animation-duration: 1.49s;
 }
 
 .ball-grid-pulse > div:nth-child(2) {
-  -webkit-animation-delay: 0.4s;
-          animation-delay: 0.4s;
-  -webkit-animation-duration: 1.2s;
-          animation-duration: 1.2s;
+  -webkit-animation-delay: 0.27s;
+          animation-delay: 0.27s;
+  -webkit-animation-duration: 1.38s;
+          animation-duration: 1.38s;
 }
 
 .ball-grid-pulse > div:nth-child(3) {
-  -webkit-animation-delay: 0.12s;
-          animation-delay: 0.12s;
-  -webkit-animation-duration: 1.33s;
-          animation-duration: 1.33s;
+  -webkit-animation-delay: 0.68s;
+          animation-delay: 0.68s;
+  -webkit-animation-duration: 0.76s;
+          animation-duration: 0.76s;
 }
 
 .ball-grid-pulse > div:nth-child(4) {
-  -webkit-animation-delay: 0.35s;
-          animation-delay: 0.35s;
-  -webkit-animation-duration: 1.59s;
-          animation-duration: 1.59s;
+  -webkit-animation-delay: -0.17s;
+          animation-delay: -0.17s;
+  -webkit-animation-duration: 1.51s;
+          animation-duration: 1.51s;
 }
 
 .ball-grid-pulse > div:nth-child(5) {
-  -webkit-animation-delay: 0.66s;
-          animation-delay: 0.66s;
-  -webkit-animation-duration: 1.09s;
-          animation-duration: 1.09s;
+  -webkit-animation-delay: 0.03s;
+          animation-delay: 0.03s;
+  -webkit-animation-duration: 0.98s;
+          animation-duration: 0.98s;
 }
 
 .ball-grid-pulse > div:nth-child(6) {
-  -webkit-animation-delay: -0.17s;
-          animation-delay: -0.17s;
-  -webkit-animation-duration: 1.4s;
-          animation-duration: 1.4s;
+  -webkit-animation-delay: -0.16s;
+          animation-delay: -0.16s;
+  -webkit-animation-duration: 0.93s;
+          animation-duration: 0.93s;
 }
 
 .ball-grid-pulse > div:nth-child(7) {
-  -webkit-animation-delay: 0.75s;
-          animation-delay: 0.75s;
-  -webkit-animation-duration: 1.6s;
-          animation-duration: 1.6s;
+  -webkit-animation-delay: -0.1s;
+          animation-delay: -0.1s;
+  -webkit-animation-duration: 0.65s;
+          animation-duration: 0.65s;
 }
 
 .ball-grid-pulse > div:nth-child(8) {
-  -webkit-animation-delay: -0.18s;
-          animation-delay: -0.18s;
-  -webkit-animation-duration: 0.71s;
-          animation-duration: 0.71s;
+  -webkit-animation-delay: 0.53s;
+          animation-delay: 0.53s;
+  -webkit-animation-duration: 1.12s;
+          animation-duration: 1.12s;
 }
 
 .ball-grid-pulse > div:nth-child(9) {
-  -webkit-animation-delay: -0.16s;
-          animation-delay: -0.16s;
-  -webkit-animation-duration: 1.17s;
-          animation-duration: 1.17s;
+  -webkit-animation-delay: -0.08s;
+          animation-delay: -0.08s;
+  -webkit-animation-duration: 1.33s;
+          animation-duration: 1.33s;
 }
 
 .ball-grid-pulse > div {

resources/dist/css/plugins/loaders/animations/line-scale-random.css

@@ -31,31 +31,31 @@
 }
 
 .line-scale-party > div:nth-child(1) {
-  -webkit-animation-delay: -0.19s;
-          animation-delay: -0.19s;
-  -webkit-animation-duration: 0.53s;
-          animation-duration: 0.53s;
+  -webkit-animation-delay: 0.31s;
+          animation-delay: 0.31s;
+  -webkit-animation-duration: 0.57s;
+          animation-duration: 0.57s;
 }
 
 .line-scale-party > div:nth-child(2) {
-  -webkit-animation-delay: -0.03s;
-          animation-delay: -0.03s;
-  -webkit-animation-duration: 0.6s;
-          animation-duration: 0.6s;
+  -webkit-animation-delay: 0.5s;
+          animation-delay: 0.5s;
+  -webkit-animation-duration: 0.61s;
+          animation-duration: 0.61s;
 }
 
 .line-scale-party > div:nth-child(3) {
-  -webkit-animation-delay: 0.74s;
-          animation-delay: 0.74s;
-  -webkit-animation-duration: 0.43s;
-          animation-duration: 0.43s;
+  -webkit-animation-delay: 0.09s;
+          animation-delay: 0.09s;
+  -webkit-animation-duration: 0.45s;
+          animation-duration: 0.45s;
 }
 
 .line-scale-party > div:nth-child(4) {
-  -webkit-animation-delay: 0s;
-          animation-delay: 0s;
-  -webkit-animation-duration: 0.56s;
-          animation-duration: 0.56s;
+  -webkit-animation-delay: 0.52s;
+          animation-delay: 0.52s;
+  -webkit-animation-duration: 0.82s;
+          animation-duration: 0.82s;
 }
 
 .line-scale-party > div {

resources/dist/css/plugins/loaders/loaders.css

@@ -1454,66 +1454,66 @@
 }
 
 .ball-grid-beat > div:nth-child(1) {
-  -webkit-animation-delay: 0.65s;
-          animation-delay: 0.65s;
-  -webkit-animation-duration: 0.64s;
-          animation-duration: 0.64s;
+  -webkit-animation-delay: 0.57s;
+          animation-delay: 0.57s;
+  -webkit-animation-duration: 1.14s;
+          animation-duration: 1.14s;
 }
 
 .ball-grid-beat > div:nth-child(2) {
-  -webkit-animation-delay: -0.05s;
-          animation-delay: -0.05s;
-  -webkit-animation-duration: 1.03s;
-          animation-duration: 1.03s;
+  -webkit-animation-delay: 0.57s;
+          animation-delay: 0.57s;
+  -webkit-animation-duration: 0.76s;
+          animation-duration: 0.76s;
 }
 
 .ball-grid-beat > div:nth-child(3) {
-  -webkit-animation-delay: 0.78s;
-          animation-delay: 0.78s;
-  -webkit-animation-duration: 1.45s;
-          animation-duration: 1.45s;
+  -webkit-animation-delay: 0.23s;
+          animation-delay: 0.23s;
+  -webkit-animation-duration: 1.4s;
+          animation-duration: 1.4s;
 }
 
 .ball-grid-beat > div:nth-child(4) {
-  -webkit-animation-delay: 0.07s;
-          animation-delay: 0.07s;
-  -webkit-animation-duration: 0.73s;
-          animation-duration: 0.73s;
+  -webkit-animation-delay: 0.57s;
+          animation-delay: 0.57s;
+  -webkit-animation-duration: 0.86s;
+          animation-duration: 0.86s;
 }
 
 .ball-grid-beat > div:nth-child(5) {
-  -webkit-animation-delay: 0.56s;
-          animation-delay: 0.56s;
-  -webkit-animation-duration: 0.94s;
-          animation-duration: 0.94s;
+  -webkit-animation-delay: 0s;
+          animation-delay: 0s;
+  -webkit-animation-duration: 0.67s;
+          animation-duration: 0.67s;
 }
 
 .ball-grid-beat > div:nth-child(6) {
-  -webkit-animation-delay: 0.8s;
-          animation-delay: 0.8s;
-  -webkit-animation-duration: 1.26s;
-          animation-duration: 1.26s;
+  -webkit-animation-delay: 0.21s;
+          animation-delay: 0.21s;
+  -webkit-animation-duration: 1.53s;
+          animation-duration: 1.53s;
 }
 
 .ball-grid-beat > div:nth-child(7) {
-  -webkit-animation-delay: 0.66s;
-          animation-delay: 0.66s;
-  -webkit-animation-duration: 0.93s;
-          animation-duration: 0.93s;
+  -webkit-animation-delay: -0.03s;
+          animation-delay: -0.03s;
+  -webkit-animation-duration: 0.73s;
+          animation-duration: 0.73s;
 }
 
 .ball-grid-beat > div:nth-child(8) {
-  -webkit-animation-delay: 0.69s;
-          animation-delay: 0.69s;
-  -webkit-animation-duration: 1.26s;
-          animation-duration: 1.26s;
+  -webkit-animation-delay: 0.75s;
+          animation-delay: 0.75s;
+  -webkit-animation-duration: 1.33s;
+          animation-duration: 1.33s;
 }
 
 .ball-grid-beat > div:nth-child(9) {
-  -webkit-animation-delay: 0.74s;
-          animation-delay: 0.74s;
-  -webkit-animation-duration: 1.08s;
-          animation-duration: 1.08s;
+  -webkit-animation-delay: 0.34s;
+          animation-delay: 0.34s;
+  -webkit-animation-duration: 0.99s;
+          animation-duration: 0.99s;
 }
 
 .ball-grid-beat > div {
@@ -1575,66 +1575,66 @@
 }
 
 .ball-grid-pulse > div:nth-child(1) {
-  -webkit-animation-delay: 0.25s;
-          animation-delay: 0.25s;
-  -webkit-animation-duration: 1.37s;
-          animation-duration: 1.37s;
+  -webkit-animation-delay: 0.68s;
+          animation-delay: 0.68s;
+  -webkit-animation-duration: 0.74s;
+          animation-duration: 0.74s;
 }
 
 .ball-grid-pulse > div:nth-child(2) {
-  -webkit-animation-delay: 0.59s;
-          animation-delay: 0.59s;
-  -webkit-animation-duration: 1.37s;
-          animation-duration: 1.37s;
+  -webkit-animation-delay: 0.51s;
+          animation-delay: 0.51s;
+  -webkit-animation-duration: 1.36s;
+          animation-duration: 1.36s;
 }
 
 .ball-grid-pulse > div:nth-child(3) {
-  -webkit-animation-delay: 0.32s;
-          animation-delay: 0.32s;
-  -webkit-animation-duration: 0.63s;
-          animation-duration: 0.63s;
+  -webkit-animation-delay: 0.72s;
+          animation-delay: 0.72s;
+  -webkit-animation-duration: 1.31s;
+          animation-duration: 1.31s;
 }
 
 .ball-grid-pulse > div:nth-child(4) {
-  -webkit-animation-delay: 0.3s;
-          animation-delay: 0.3s;
-  -webkit-animation-duration: 1.43s;
-          animation-duration: 1.43s;
+  -webkit-animation-delay: 0.06s;
+          animation-delay: 0.06s;
+  -webkit-animation-duration: 1.46s;
+          animation-duration: 1.46s;
 }
 
 .ball-grid-pulse > div:nth-child(5) {
-  -webkit-animation-delay: 0.79s;
-          animation-delay: 0.79s;
-  -webkit-animation-duration: 1.42s;
-          animation-duration: 1.42s;
+  -webkit-animation-delay: 0.01s;
+          animation-delay: 0.01s;
+  -webkit-animation-duration: 0.79s;
+          animation-duration: 0.79s;
 }
 
 .ball-grid-pulse > div:nth-child(6) {
-  -webkit-animation-delay: 0.52s;
-          animation-delay: 0.52s;
-  -webkit-animation-duration: 0.95s;
-          animation-duration: 0.95s;
+  -webkit-animation-delay: -0.13s;
+          animation-delay: -0.13s;
+  -webkit-animation-duration: 1.34s;
+          animation-duration: 1.34s;
 }
 
 .ball-grid-pulse > div:nth-child(7) {
-  -webkit-animation-delay: 0.17s;
-          animation-delay: 0.17s;
-  -webkit-animation-duration: 1.24s;
-          animation-duration: 1.24s;
+  -webkit-animation-delay: 0.63s;
+          animation-delay: 0.63s;
+  -webkit-animation-duration: 0.66s;
+          animation-duration: 0.66s;
 }
 
 .ball-grid-pulse > div:nth-child(8) {
-  -webkit-animation-delay: 0.06s;
-          animation-delay: 0.06s;
-  -webkit-animation-duration: 1.08s;
-          animation-duration: 1.08s;
+  -webkit-animation-delay: 0.5s;
+          animation-delay: 0.5s;
+  -webkit-animation-duration: 0.78s;
+          animation-duration: 0.78s;
 }
 
 .ball-grid-pulse > div:nth-child(9) {
-  -webkit-animation-delay: 0.01s;
-          animation-delay: 0.01s;
-  -webkit-animation-duration: 1.43s;
-          animation-duration: 1.43s;
+  -webkit-animation-delay: -0.02s;
+          animation-delay: -0.02s;
+  -webkit-animation-duration: 0.94s;
+          animation-duration: 0.94s;
 }
 
 .ball-grid-pulse > div {
@@ -2181,31 +2181,31 @@
 }
 
 .line-scale-party > div:nth-child(1) {
-  -webkit-animation-delay: 0.38s;
-          animation-delay: 0.38s;
-  -webkit-animation-duration: 0.88s;
-          animation-duration: 0.88s;
+  -webkit-animation-delay: 0.26s;
+          animation-delay: 0.26s;
+  -webkit-animation-duration: 1.01s;
+          animation-duration: 1.01s;
 }
 
 .line-scale-party > div:nth-child(2) {
-  -webkit-animation-delay: 0.53s;
-          animation-delay: 0.53s;
-  -webkit-animation-duration: 1.23s;
-          animation-duration: 1.23s;
+  -webkit-animation-delay: -0.12s;
+          animation-delay: -0.12s;
+  -webkit-animation-duration: 1s;
+          animation-duration: 1s;
 }
 
 .line-scale-party > div:nth-child(3) {
-  -webkit-animation-delay: 0.66s;
-          animation-delay: 0.66s;
-  -webkit-animation-duration: 0.98s;
-          animation-duration: 0.98s;
+  -webkit-animation-delay: -0.19s;
+          animation-delay: -0.19s;
+  -webkit-animation-duration: 1.07s;
+          animation-duration: 1.07s;
 }
 
 .line-scale-party > div:nth-child(4) {
-  -webkit-animation-delay: 0.2s;
-          animation-delay: 0.2s;
-  -webkit-animation-duration: 0.92s;
-          animation-duration: 0.92s;
+  -webkit-animation-delay: 0.7s;
+          animation-delay: 0.7s;
+  -webkit-animation-duration: 1.07s;
+          animation-duration: 1.07s;
 }
 
 .line-scale-party > div {

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

@@ -1788,6 +1788,11 @@ dl {
   height: 30px;
 }
 
+a.btn-sm,
+.btn-group-sm > a.btn {
+  padding: 0.6rem 1rem !important;
+}
+
 .btn-custom {
   background: #59a9f8;
   border-color: #59a9f8;
@@ -1864,10 +1869,6 @@ 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;
@@ -2633,6 +2634,11 @@ table.dataTable.complex-headers tfoot td {
 
 .box.box-solid.box-default {
   border: 1px solid #d9d9d9;
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+}
+
+.form-group .box {
+  margin-bottom: 0;
 }
 
 .label {
@@ -2882,3 +2888,7 @@ a.disabled {
   background-color: #d2d6de;
 }
 
+.img {
+  cursor: pointer;
+}
+

resources/dist/dcat/js/dcat-app.js

@@ -451,7 +451,7 @@ var defaultActions = {
   // 图片预览
   'preview-img': function previewImg($action, Dcat) {
     return function () {
-      return Dcat.previewImage($(this).attr('src'));
+      return Dcat.helpers.previewImage($(this).attr('src'));
     };
   },
   'popover': function popover($action) {

resources/views/grid/table.blade.php

@@ -13,11 +13,11 @@
                             @endif
                         </h4>
                         <div data-responsive-table-toolbar="{{$tableId}}">
-                            {!! $grid->renderTools() !!} {!! $grid->renderCreateButton() !!} {!! $grid->renderExportButton() !!}
+                            {!! $grid->renderTools() !!} {!! $grid->renderCreateButton() !!} {!! $grid->renderExportButton() !!} {!! $grid->renderQuickSearch() !!}
                         </div>
                     @else
                         <div>
-                            {!! $grid->renderTools() !!}
+                            {!! $grid->renderTools() !!}  {!! $grid->renderQuickSearch() !!}
                         </div>
 
                         <div data-responsive-table-toolbar="{{$tableId}}">

resources/views/grid/table2.blade.php

@@ -13,11 +13,11 @@
                         @endif
                     </h4>
                     <div data-responsive-table-toolbar="{{$tableId}}">
-                        {!! $grid->renderTools() !!} {!! $grid->renderCreateButton() !!} {!! $grid->renderExportButton() !!}
+                        {!! $grid->renderTools() !!} {!! $grid->renderCreateButton() !!} {!! $grid->renderExportButton() !!}  {!! $grid->renderQuickSearch() !!}
                     </div>
                 @else
                     <div>
-                        {!! $grid->renderTools() !!}
+                        {!! $grid->renderTools() !!}  {!! $grid->renderQuickSearch() !!}
                     </div>
 
                     <div data-responsive-table-toolbar="{{$tableId}}">

resources/views/show/field.blade.php

@@ -1,20 +1,26 @@
-<div class="line col-sm-{{ $width }} show-field">
-    <div class="text">{{ $label }}</div>
-    @if($wrapped)
-        <div class="box box-solid box-default no-margin box-show">
-            <div class="box-body">
-                @if($escape)
-                    {{ $content }}
-                @else
-                    {!! $content !!}
-                @endif
+<div class="show-field form-group row">
+    <div class="col-sm-2 control-label">
+        <span>{{ $label }}</span>
+    </div>
+
+    <div class="col-sm-{{ $width }}">
+        @if($wrapped)
+            <div class="box box-solid box-default no-margin box-show">
+                <div class="box-body">
+                    @if($escape)
+                        {{ $content }}
+                    @else
+                        {!! $content !!}
+                    @endif
+                    &nbsp;
+                </div>
             </div>
-        </div>
-    @else
-        @if($escape)
-            {{ $content }}
         @else
-            {!! $content !!}
+            @if($escape)
+                {{ $content }}
+            @else
+                {!! $content !!}
+            @endif
         @endif
-    @endif
+    </div>
 </div>

resources/views/show/panel.blade.php

@@ -6,11 +6,9 @@
 @endif
 <div class="box-body">
     <div class="form-horizontal">
-        <div class="fields-group">
-            @foreach($fields as $field)
-                {!! $field->render() !!}
-            @endforeach
-            <div class="clearfix"></div>
-        </div>
+        @foreach($fields as $field)
+            {!! $field->render() !!}
+        @endforeach
+        <div class="clearfix"></div>
     </div>
 </div>

src/Controllers/RoleController.php

@@ -76,12 +76,10 @@ class RoleController extends AdminController
             $show->slug;
             $show->name;
 
-            $show->permissions->width(12)->as(function ($permission) {
+            $show->permissions->as(function ($permission) {
                 return collect($permission)->pluck('name');
             })->label('primary');
 
-            $show->divider();
-
             $show->created_at;
             $show->updated_at;
 

src/Controllers/UserController.php

@@ -104,16 +104,9 @@ class UserController extends AdminController
             $show->username;
             $show->name;
 
-            $show->avatar->image();
+            $show->avatar(__('admin.avatar'))->image();
 
-            $show->newline();
-
-            $show->created_at;
-            $show->updated_at;
-
-            $show->divider();
-
-            $show->roles->width(6)->as(function ($roles) {
+            $show->roles->as(function ($roles) {
                 if (! $roles) {
                     return;
                 }
@@ -121,7 +114,7 @@ class UserController extends AdminController
                 return collect($roles)->pluck('name');
             })->label('primary');
 
-            $show->permissions->width(6)->unescape()->as(function () {
+            $show->permissions->unescape()->as(function () {
                 $roles = (array) $this->roles;
 
                 $permissionModel = config('admin.database.permissions_model');
@@ -149,9 +142,8 @@ class UserController extends AdminController
                 return $tree->render();
             });
 
-            if ($show->getKey() == AdministratorModel::DEFAULT_ID) {
-                $show->disableDeleteButton();
-            }
+            $show->created_at;
+            $show->updated_at;
         });
     }
 

src/Grid/Concerns/HasQuickSearch.php

@@ -47,8 +47,6 @@ trait HasQuickSearch
             $search->setGrid($this);
 
             $this->quickSearch = $search;
-
-            $this->tools($search);
         });
     }
 

src/Grid/Tools/CreateButton.php

@@ -51,7 +51,7 @@ class CreateButton implements Renderable
         $new = trans('admin.new');
         $url = $this->grid->getCreateUrl();
 
-        return "<a href='{$url}' class='btn btn-outline-success btn-mini'>
+        return "<a href='{$url}' class='btn btn-outline-primary'>
     <i class='feather icon-plus'></i><span class='d-none d-sm-inline'>&nbsp;&nbsp;{$new}</span>
 </a>";
     }

src/Scaffold/ShowCreator.php

@@ -29,9 +29,9 @@ trait ShowCreator
 
             $rows[] = "            \$show->{$field['name']};";
 
-            if ($k === 1 && (count($fields) > 2 || $timestamps)) {
-                $rows[] = '            $show->divider();';
-            }
+//            if ($k === 1 && (count($fields) > 2 || $timestamps)) {
+//                $rows[] = '            $show->divider();';
+//            }
         }
 
         if ($timestamps) {

src/Show.php

@@ -41,7 +41,7 @@ class Show implements Renderable
     /**
      * @var mixed
      */
-    protected $__id;
+    protected $_id;
 
     /**
      * @var string
@@ -185,7 +185,7 @@ class Show implements Renderable
      */
     public function setKey($id)
     {
-        $this->__id = $id;
+        $this->_id = $id;
 
         return $this;
     }
@@ -195,7 +195,7 @@ class Show implements Renderable
      */
     public function getKey()
     {
-        return $this->__id;
+        return $this->_id;
     }
 
     /**

src/Show/Field.php

@@ -86,12 +86,12 @@ class Field implements Renderable
      *
      * @var bool
      */
-    protected $border = false;
+    protected $border = true;
 
     /**
      * @var int
      */
-    protected $width = 3;
+    protected $width = 8;
 
     /**
      * @var array
@@ -251,7 +251,7 @@ class Field implements Renderable
                 }
             }
 
-            return "<img data-init='preview' src='$src' style='max-width:{$width}px;max-height:{$height}px' class='img' />";
+            return "<img data-action='preview-img' src='$src' style='max-width:{$width}px;max-height:{$height}px' class='img' />";
         });
     }
 
@@ -341,7 +341,7 @@ HTML;
             }
 
             return collect((array) $value)->map(function ($name) use ($style) {
-                return "<span class='label label-{$style}'>$name</span>";
+                return "<span class='label bg-{$style}'>$name</span>";
             })->implode('&nbsp;');
         });
     }

src/Show/Relation.php

@@ -78,41 +78,24 @@ class Relation extends Field
         $view = call_user_func($this->builder, $this->model);
 
         if ($view instanceof Show) {
-            return $this->renderTitle().$view->render();
+            $view->panel()->title($this->title);
+
+            return $view->render();
         }
 
         if (! $view instanceof Grid) {
-            return $this->renderTitle().$view;
+            return $view;
         }
 
         $view->setName($this->name)
-            ->disableFilterButton()
+            ->title($this->title)
             ->disableBatchDelete()
             ->disableFilter();
 
-        $filter = $view->filter()
-            ->expand()
-            ->withoutInputBorder()
-            ->hiddenResetButtonText()
-            ->expand()
-            ->style('padding:0 0 5px;left:-5px;');
-
-        $filter = "<div class='row'><div class='col-md-12'>{$filter->render()}</div></div>";
-
-        return $this->renderTitle().$filter.$view->render();
-    }
-
-    /**
-     * @return string
-     */
-    protected function renderTitle()
-    {
-        return <<<EOF
-<div class="row">
-     <div class="col-md-12" style="margin-bottom:.75rem;font-size:18px;text-transform:uppercase">
-        <span class="show-relation-grid-title">{$this->title}</span>
-     </div>
+        return <<<HTML
+<div class="mb-2">
+    {$view->render()}
 </div>
-EOF;
+HTML;
     }
 }