#2843

diff --git a/src/app/Magic/Fields/Files.php b/src/app/Magic/Fields/Files.php
index 002e584bbdfd8397898fa4dfa7f48383d70f8d4e..6f32e00c1a7cbfbe409d170e123053ab575fe466 100644 (file)
--- a/src/app/Magic/Fields/Files.php
+++ b/src/app/Magic/Fields/Files.php
@@ -24,7 +24,7 @@ class Files extends Field
             'collection' => $collection,
             'thumb_collection' => $this->_thumbCollection,
             'default' => $collection,
-            'options' => ['thumbnailHeight' => 368, 'thumbnailWidth' => 232, 'maxFilesize' => 1024, 'addRemoveLinks' => true, 'createImageThumbnails' => true, 'maxFiles' => $this->_maxFiles]]);
+            'options' => ['thumbnailHeight' => 120, 'thumbnailWidth' => 120, 'maxFilesize' => 1024, 'addRemoveLinks' => true, 'createImageThumbnails' => true, 'maxFiles' => $this->_maxFiles]]);
     }
 
     protected function _getAttributesAliases()

diff --git a/src/resources/views/fields/dropzone_media.blade.php b/src/resources/views/fields/dropzone_media.blade.php
index 75924a7e4143ca3257e5856ca0fb7d6856638f7b..0d570478207e9fd70cf9c836737b01c3bf74b049 100644 (file)
--- a/src/resources/views/fields/dropzone_media.blade.php
+++ b/src/resources/views/fields/dropzone_media.blade.php
@@ -2,58 +2,6 @@
 $collection = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? [];
 ?>
 
-@section('previewTemplate')
-    <div class="dz-preview dz-file-preview">
-        <div class="dz-image">
-            <img data-dz-thumbnail/>
-        </div>
-        <div class="dz-details">
-            <div class="dz-size">
-                <span data-dz-size></span>
-            </div>
-            <div class="dz-filename">
-                <span data-dz-name></span>
-            </div>
-        </div>
-        <div class="dz-progress">
-            <span class="dz-upload" data-dz-uploadprogress></span>
-        </div>
-        <div class="dz-error-message">
-            <span data-dz-errormessage></span>
-        </div>
-        <div class="dz-success-mark">
-            <svg width="54px" height="54px" viewBox="0 0 54 54" version="1.1" xmlns="http://www.w3.org/2000/svg"
-                 xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-                <title>Check</title>
-                <defs></defs>
-                <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-                    <path
-                        d="M23.5,31.8431458 L17.5852419,25.9283877 C16.0248253,24.3679711 13.4910294,24.366835 11.9289322,25.9289322 C10.3700136,27.4878508 10.3665912,30.0234455 11.9283877,31.5852419 L20.4147581,40.0716123 C20.5133999,40.1702541 20.6159315,40.2626649 20.7218615,40.3488435 C22.2835669,41.8725651 24.794234,41.8626202 26.3461564,40.3106978 L43.3106978,23.3461564 C44.8771021,21.7797521 44.8758057,19.2483887 43.3137085,17.6862915 C41.7547899,16.1273729 39.2176035,16.1255422 37.6538436,17.6893022 L23.5,31.8431458 Z M27,53 C41.3594035,53 53,41.3594035 53,27 C53,12.6405965 41.3594035,1 27,1 C12.6405965,1 1,12.6405965 1,27 C1,41.3594035 12.6405965,53 27,53 Z"
-                        id="Oval-2" stroke-opacity="0.198794158" stroke="#747474" fill-opacity="0.816519475"
-                        fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-                </g>
-            </svg>
-        </div>
-        <div class="dz-error-mark">
-            <svg width="54px" height="54px" viewBox="0 0 54 54" version="1.1" xmlns="http://www.w3.org/2000/svg"
-                 xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-                <title>Error</title>
-                <defs></defs>
-                <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-                    <g id="Check-+-Oval-2" sketch:type="MSLayerGroup" stroke="#747474" stroke-opacity="0.198794158"
-                       fill="#FFFFFF" fill-opacity="0.816519475">
-                        <path
-                            d="M32.6568542,29 L38.3106978,23.3461564 C39.8771021,21.7797521 39.8758057,19.2483887 38.3137085,17.6862915 C36.7547899,16.1273729 34.2176035,16.1255422 32.6538436,17.6893022 L27,23.3431458 L21.3461564,17.6893022 C19.7823965,16.1255422 17.2452101,16.1273729 15.6862915,17.6862915 C14.1241943,19.2483887 14.1228979,21.7797521 15.6893022,23.3461564 L21.3431458,29 L15.6893022,34.6538436 C14.1228979,36.2202479 14.1241943,38.7516113 15.6862915,40.3137085 C17.2452101,41.8726271 19.7823965,41.8744578 21.3461564,40.3106978 L27,34.6568542 L32.6538436,40.3106978 C34.2176035,41.8744578 36.7547899,41.8726271 38.3137085,40.3137085 C39.8758057,38.7516113 39.8771021,36.2202479 38.3106978,34.6538436 L32.6568542,29 Z M27,53 C41.3594035,53 53,41.3594035 53,27 C53,12.6405965 41.3594035,1 27,1 C12.6405965,1 1,12.6405965 1,27 C1,41.3594035 12.6405965,53 27,53 Z"
-                            id="Oval-2" sketch:type="MSShapeGroup"></path>
-                    </g>
-                </g>
-            </svg>
-        </div>
-    </div>
-@endsection
-
-
-
 <div class="form-group col-md-12">
     <strong>{{ $field['label'] }}</strong> <br>
     <input type="hidden" value="{{$collection}}" name="{{$field['name']}}"/>
@@ -70,11 +18,95 @@ $collection = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ??
 {{-- Extra CSS and JS for this particular field --}}
 {{-- If a field type is shown multiple times on a form, the CSS and JS will only be loaded once --}}
 @if ($crud->checkIfFieldIsFirstOfItsType($field))
+
+    <div id="dz-template-container" style="display: none;">
+        <div class="dz-preview dz-file-preview">
+            <div data-dz-remove>+</div>
+            <div class="dz-image">
+                <img data-dz-thumbnail/>
+            </div>
+            <div class="dz-details">
+                <div class="dz-size">
+                    <span data-dz-size></span>
+                </div>
+                <div class="dz-filename">
+                    <span data-dz-name></span>
+                </div>
+            </div>
+            <div class="dz-progress">
+                <span class="dz-upload" data-dz-uploadprogress></span>
+            </div>
+            <div class="dz-error-message">
+                <span data-dz-errormessage></span>
+            </div>
+            <div class="dz-success-mark">
+                <svg width="54px" height="54px" viewBox="0 0 54 54" version="1.1" xmlns="http://www.w3.org/2000/svg"
+                     xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+                    <title>Check</title>
+                    <defs></defs>
+                    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+                        <path
+                            d="M23.5,31.8431458 L17.5852419,25.9283877 C16.0248253,24.3679711 13.4910294,24.366835 11.9289322,25.9289322 C10.3700136,27.4878508 10.3665912,30.0234455 11.9283877,31.5852419 L20.4147581,40.0716123 C20.5133999,40.1702541 20.6159315,40.2626649 20.7218615,40.3488435 C22.2835669,41.8725651 24.794234,41.8626202 26.3461564,40.3106978 L43.3106978,23.3461564 C44.8771021,21.7797521 44.8758057,19.2483887 43.3137085,17.6862915 C41.7547899,16.1273729 39.2176035,16.1255422 37.6538436,17.6893022 L23.5,31.8431458 Z M27,53 C41.3594035,53 53,41.3594035 53,27 C53,12.6405965 41.3594035,1 27,1 C12.6405965,1 1,12.6405965 1,27 C1,41.3594035 12.6405965,53 27,53 Z"
+                            id="Oval-2" stroke-opacity="0.198794158" stroke="#747474" fill-opacity="0.816519475"
+                            fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+                    </g>
+                </svg>
+            </div>
+            <div class="dz-error-mark">
+                <svg width="54px" height="54px" viewBox="0 0 54 54" version="1.1" xmlns="http://www.w3.org/2000/svg"
+                     xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+                    <title>Error</title>
+                    <defs></defs>
+                    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+                        <g id="Check-+-Oval-2" sketch:type="MSLayerGroup" stroke="#747474" stroke-opacity="0.198794158"
+                           fill="#FFFFFF" fill-opacity="0.816519475">
+                            <path
+                                d="M32.6568542,29 L38.3106978,23.3461564 C39.8771021,21.7797521 39.8758057,19.2483887 38.3137085,17.6862915 C36.7547899,16.1273729 34.2176035,16.1255422 32.6538436,17.6893022 L27,23.3431458 L21.3461564,17.6893022 C19.7823965,16.1255422 17.2452101,16.1273729 15.6862915,17.6862915 C14.1241943,19.2483887 14.1228979,21.7797521 15.6893022,23.3461564 L21.3431458,29 L15.6893022,34.6538436 C14.1228979,36.2202479 14.1241943,38.7516113 15.6862915,40.3137085 C17.2452101,41.8726271 19.7823965,41.8744578 21.3461564,40.3106978 L27,34.6568542 L32.6538436,40.3106978 C34.2176035,41.8744578 36.7547899,41.8726271 38.3137085,40.3137085 C39.8758057,38.7516113 39.8771021,36.2202479 38.3106978,34.6538436 L32.6568542,29 Z M27,53 C41.3594035,53 53,41.3594035 53,27 C53,12.6405965 41.3594035,1 27,1 C12.6405965,1 1,12.6405965 1,27 C1,41.3594035 12.6405965,53 27,53 Z"
+                                id="Oval-2" sketch:type="MSShapeGroup"></path>
+                        </g>
+                    </g>
+                </svg>
+            </div>
+        </div>
+    </div>
+
+
     {{-- FIELD CSS - will be loaded in the after_styles section --}}
     @push('crud_fields_styles')
         <!-- include dropzone css-->
         <link rel="stylesheet"
               href="https://cdnjs.cloudflare.com/ajax/libs/dropzone/5.5.1/min/dropzone.min.css"/>
+        <style type="text/css">
+            .dropzone {
+                border: 1px solid #d2d6de;
+            }
+
+            .dropzone.dz-drag-hover {
+                border-style: dashed;
+                background-color: #efefef;
+            }
+
+            .dropzone .dz-preview [data-dz-remove] {
+                position: absolute;
+                top: -15px;
+                right: -15px;
+                width: 30px;
+                height: 30px;
+                border-radius: 50%;
+                background: #b50005;
+                color: #fff;
+                text-align: center;
+                font-weight: 700;
+                font-size: 28px;
+                line-height: 1em;
+                z-index:11;
+                transform: rotate(45deg);
+            }
+
+            .dropzone .dz-preview .dz-image {
+                background-color: #eee;
+            }
+        </style>
     @endpush
 
     {{-- FIELD JS - will be loaded in the after_scripts section --}}
@@ -129,7 +161,7 @@ $collection = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ??
                     var collection = $(el).prev().val();
                     var dOptions = {
                         url: base_url,
-                        previewTemplate: '{!! str_replace(array("\r\n", "\r", "\n"), "", addslashes(View::getSection("previewTemplate"))); !!}',
+                        previewTemplate: $("#dz-template-container").html(),
                         init: function () {
                             var files = f_{{$filesrand}}[collection];
                             if (files === undefined) {