wip #5448 @1.5

diff --git a/src/app/Magic/Fields/BunchOfFieldsMultiple.php b/src/app/Magic/Fields/BunchOfFieldsMultiple.php
index 910ecac05f4b44ab8bbbbca55f168458674cb34e..e9d1e6fae718639403b46ea68652a12caf8080ce 100644 (file)
--- a/src/app/Magic/Fields/BunchOfFieldsMultiple.php
+++ b/src/app/Magic/Fields/BunchOfFieldsMultiple.php
@@ -31,7 +31,7 @@ class BunchOfFieldsMultiple extends BunchOfFields
             break;
         }
 
-        $this->setAttributeIfNotSet('edit_label', sprintf(__('Edit « %%%s »'), $first));
+        $this->setAttributeIfNotSet('edit_label',__('Edit « %:name »',['name'=>$first]));
     }
 
     protected function _setBunchOfFields()

diff --git a/src/app/Magic/Fields/Code.php b/src/app/Magic/Fields/Code.php
index c2f317205d86138d4bc65638ca6841858eebb5bd..2b7ca61823df73ce005bfa9b5c6729ab548cdede 100644 (file)
--- a/src/app/Magic/Fields/Code.php
+++ b/src/app/Magic/Fields/Code.php
@@ -12,10 +12,11 @@ class Code extends Textarea
     protected $_databaseType = 'text';
     protected $_translatable = true;
     protected $_language = 'html';
+    protected $_wrap = false;
     protected $_viewNamespace = CubistBackpackServiceProvider::NAMESPACE . '::fields';
 
     public function getDefaultAttributes()
     {
-        return array_merge(parent::getDefaultAttributes(), ['language' => $this->_language]);
+        return array_merge(parent::getDefaultAttributes(), ['language' => $this->_language, 'wrap' => $this->_wrap]);
     }
 }

diff --git a/src/public/bunchmultiple/bunchmultiple.css b/src/public/bunchmultiple/bunchmultiple.css
index b78cf8f927ed307d94cd380a601f309b55376a91..c5f0defd49493e9fbd1ed3634205d77cd1673692 100644 (file)
--- a/src/public/bunchmultiple/bunchmultiple.css
+++ b/src/public/bunchmultiple/bunchmultiple.css
@@ -16,6 +16,16 @@
 .bunchmultiple.bunchmultiple_oneline .bunchmultiple__wrapper .legendsize label {
   display: none;
 }
+.bunchmultiple.bunchmultiple_oneline .bunchmultiple__wrapper .legendsize .icon {
+  overflow: visible;
+  display: inline-block;
+  margin: 0 30px 0 10px;
+}
+.bunchmultiple.bunchmultiple_oneline .bunchmultiple__wrapper .legendsize .icon img,
+.bunchmultiple.bunchmultiple_oneline .bunchmultiple__wrapper .legendsize .icon svg {
+  width: auto;
+  height: 15px;
+}
 .bunchmultiple.bunchmultiple_oneline .bunchmultiple__wrapper .legendsize .form-group {
   display: inline-block;
   vertical-align: top;

diff --git a/src/public/bunchmultiple/bunchmultiple.css.map b/src/public/bunchmultiple/bunchmultiple.css.map
index 36cc95571ed0ec625d0913a6b7b8e6746a4a259a..e7a8a457e6c4b0fc162dcd0ec0f7c9e01fe48db6 100644 (file)
--- a/src/public/bunchmultiple/bunchmultiple.css.map
+++ b/src/public/bunchmultiple/bunchmultiple.css.map
@@ -1 +1 @@
-{"version":3,"sources":["bunchmultiple.less"],"names":[],"mappings":"AAAA;EACI,cAAA;;AAEA,cAAC,sBACG,wBACI,MACI,QACI,EAAC;EACG,kBAAA;EACA,SAAA;;AAEA,cARnB,sBACG,wBACI,MACI,QACI,EAAC,OAII;EACG,QAAA;EACA,mBAAA;;AAVxB,cAAC,sBACG,wBAeI;EAKI,qBAAA;EACA,mBAAA;;AAtBZ,cAAC,sBACG,wBAeI,YACI;EACI,aAAA;;AAlBhB,cAAC,sBACG,wBAeI,YAQI;EAEI,qBAAA;EACA,mBAAA;EACA,gBAAA;EACA,eAAA;EACA,kBAAA;EACA,SAAA;;AA/BhB,cAAC,sBACG,wBAeI,YAkBI,MAAK;EACD,YAAA;;AAShB,cAAC,uBACG,wBACI,MACI,QACI,EAAC;EACG,kBAAA;EACA,SAAA;;AAEA,cARnB,uBACG,wBACI,MACI,QACI,EAAC,OAII;EACG,QAAA;EACA,mBAAA;;AAVxB,cAAC,uBACG,wBAeI;EAKI,qBAAA;EACA,mBAAA;;AAtBZ,cAAC,uBACG,wBAeI,YACI;EACI,aAAA;;AAlBhB,cAAC,uBACG,wBAeI,YAQI;EACI,UAAA;EACA,qBAAA;EACA,mBAAA;EACA,gBAAA;EACA,eAAA;EACA,kBAAA;EACA,SAAA;;AA/BhB,cAAC,uBACG,wBAeI,YAkBI,MAAK;EACD,YAAA;;AAQhB,cAAC;EACG,WAAA;;AA3FR,cA8FI;EACI,aAAA;EACA,sBAAA;EACA,mBAAA;EACA,mBAAA;;AAEA,cANJ,wBAMK;EACG,aAAA;;AAGJ,cAVJ,wBAUK;EACG,UAAA;EACA,SAAA;EACA,gBAAA;EACA,gBAAA;;AA5GZ,cA8FI,wBAkBI;EACI,UAAA;;AAjHZ,cA8FI,wBAkBI,cAGI;EACI,gBAAA;EACA,mBAAA;;AArHhB,cA8FI,wBA2BI;EACI,mBAAA;;AAEA,cA9BR,wBA2BI,MAGK;EACG,uBAAA;EACA,sBAAA;;AAFJ,cA9BR,wBA2BI,MAGK,MAIG;EACI,UAAA;;AALR,cA9BR,wBA2BI,MAGK,MAQG;EACI,UAAA;;AArIpB,cA8FI,wBA2BI,MAgBI;EACI,yBAAA;EACA,iBAAA;EACA,gBAAA;EACA,kBAAA;EACA,eAAA;;AA9IhB,cA8FI,wBA2BI,MAgBI,QAOI;EACI,qBAAA;EACA,gBAAA;EACA,yBAAA;EACA,mBAAA;EACA,uBAAA;EACA,kBAAA;EACA,UAAA;EACA,SAAA;;AAxJpB,cA8FI,wBA2BI,MAgBI,QAkBI,EAAC;EACG,WAAA;EACA,gBAAA;EACA,qBAAA;;AAEA,cAlEhB,wBA2BI,MAgBI,QAkBI,EAAC,OAKI;EACG,mBAAA;EACA,YAAA;;AAGJ,cAvEhB,wBA2BI,MAgBI,QAkBI,EAAC,OAUI;EACG,kBAAA;EACA,WAAA;EACA,eAAA;;AAGJ,cA7EhB,wBA2BI,MAgBI,QAkBI,EAAC,OAgBI;EACG,kBAAA;EACA,WAAA;EACA,eAAA;;AA9KxB,cA8FI,wBA2BI,MA0DI;EACI,gBAAA;EACA,iEAAA;EACA,yBAAA;EACA,eAAA;;AAGJ,cA5FR,wBA2BI,MAiEK;EACG,aAAA;;AAGJ,cAhGR,wBA2BI,MAqEK,UACG;EACI,oBAAA;EACA,UAAA","file":"bunchmultiple.css"}
\ No newline at end of file
+{"version":3,"sources":["bunchmultiple.less"],"names":[],"mappings":"AAAA;EACI,cAAA;;AAEA,cAAC,sBACG,wBACI,MACI,QACI,EAAC;EACG,kBAAA;EACA,SAAA;;AAEA,cARnB,sBACG,wBACI,MACI,QACI,EAAC,OAII;EACG,QAAA;EACA,mBAAA;;AAVxB,cAAC,sBACG,wBAeI;EAgBI,qBAAA;EACA,mBAAA;;AAjCZ,cAAC,sBACG,wBAeI,YACI;EACI,aAAA;;AAlBhB,cAAC,sBACG,wBAeI,YAKI;EACI,iBAAA;EACA,qBAAA;EACA,qBAAA;;AAxBhB,cAAC,sBACG,wBAeI,YAKI,MAKI;AA1BhB,cAAC,sBACG,wBAeI,YAKI,MAKS;EACD,WAAA;EACA,YAAA;;AA5BpB,cAAC,sBACG,wBAeI,YAmBI;EAEI,qBAAA;EACA,mBAAA;EACA,gBAAA;EACA,eAAA;EACA,kBAAA;EACA,SAAA;;AA1ChB,cAAC,sBACG,wBAeI,YA6BI,MAAK;EACD,YAAA;;AAShB,cAAC,uBACG,wBACI,MACI,QACI,EAAC;EACG,kBAAA;EACA,SAAA;;AAEA,cARnB,uBACG,wBACI,MACI,QACI,EAAC,OAII;EACG,QAAA;EACA,mBAAA;;AAVxB,cAAC,uBACG,wBAeI;EAKI,qBAAA;EACA,mBAAA;;AAtBZ,cAAC,uBACG,wBAeI,YACI;EACI,aAAA;;AAlBhB,cAAC,uBACG,wBAeI,YAQI;EACI,UAAA;EACA,qBAAA;EACA,mBAAA;EACA,gBAAA;EACA,eAAA;EACA,kBAAA;EACA,SAAA;;AA/BhB,cAAC,uBACG,wBAeI,YAkBI,MAAK;EACD,YAAA;;AAQhB,cAAC;EACG,WAAA;;AAtGR,cAyGI;EACI,aAAA;EACA,sBAAA;EACA,mBAAA;EACA,mBAAA;;AAEA,cANJ,wBAMK;EACG,aAAA;;AAGJ,cAVJ,wBAUK;EACG,UAAA;EACA,SAAA;EACA,gBAAA;EACA,gBAAA;;AAvHZ,cAyGI,wBAkBI;EACI,UAAA;;AA5HZ,cAyGI,wBAkBI,cAGI;EACI,gBAAA;EACA,mBAAA;;AAhIhB,cAyGI,wBA2BI;EACI,mBAAA;;AAEA,cA9BR,wBA2BI,MAGK;EACG,uBAAA;EACA,sBAAA;;AAFJ,cA9BR,wBA2BI,MAGK,MAIG;EACI,UAAA;;AALR,cA9BR,wBA2BI,MAGK,MAQG;EACI,UAAA;;AAhJpB,cAyGI,wBA2BI,MAgBI;EACI,yBAAA;EACA,iBAAA;EACA,gBAAA;EACA,kBAAA;EACA,eAAA;;AAzJhB,cAyGI,wBA2BI,MAgBI,QAOI;EACI,qBAAA;EACA,gBAAA;EACA,yBAAA;EACA,mBAAA;EACA,uBAAA;EACA,kBAAA;EACA,UAAA;EACA,SAAA;;AAnKpB,cAyGI,wBA2BI,MAgBI,QAkBI,EAAC;EACG,WAAA;EACA,gBAAA;EACA,qBAAA;;AAEA,cAlEhB,wBA2BI,MAgBI,QAkBI,EAAC,OAKI;EACG,mBAAA;EACA,YAAA;;AAGJ,cAvEhB,wBA2BI,MAgBI,QAkBI,EAAC,OAUI;EACG,kBAAA;EACA,WAAA;EACA,eAAA;;AAGJ,cA7EhB,wBA2BI,MAgBI,QAkBI,EAAC,OAgBI;EACG,kBAAA;EACA,WAAA;EACA,eAAA;;AAzLxB,cAyGI,wBA2BI,MA0DI;EACI,gBAAA;EACA,iEAAA;EACA,yBAAA;EACA,eAAA;;AAGJ,cA5FR,wBA2BI,MAiEK;EACG,aAAA;;AAGJ,cAhGR,wBA2BI,MAqEK,UACG;EACI,oBAAA;EACA,UAAA","file":"bunchmultiple.css"}
\ No newline at end of file

diff --git a/src/public/bunchmultiple/bunchmultiple.js b/src/public/bunchmultiple/bunchmultiple.js
index 54689ac27bf6d148b4319f178b584fcba04b2022..7bebb0805f7f5fd365f96c4b2450849457e8bb9f 100644 (file)
--- a/src/public/bunchmultiple/bunchmultiple.js
+++ b/src/public/bunchmultiple/bunchmultiple.js
@@ -183,7 +183,7 @@
 
                     return res;
                 });
-                $(this).text(txt);
+                $(this).html(txt);
             });
         },
 

diff --git a/src/public/bunchmultiple/bunchmultiple.less b/src/public/bunchmultiple/bunchmultiple.less
index 96d1545990fd3cfb7ee03b14fee254f95b54ce27..a4d78151e18c709e5e09db97307011f68d5ab1f9 100644 (file)
--- a/src/public/bunchmultiple/bunchmultiple.less
+++ b/src/public/bunchmultiple/bunchmultiple.less
@@ -22,6 +22,17 @@
                     display: none;
                 }
 
+                .icon {
+                    overflow: visible;
+                    display: inline-block;
+                    margin: 0 30px 0 10px;
+
+                    img, svg {
+                        width: auto;
+                        height: 15px;
+                    }
+                }
+
                 display: inline-block;
                 white-space: nowrap;
 
@@ -30,9 +41,9 @@
                     display: inline-block;
                     vertical-align: top;
                     margin-bottom: 0;
-                    padding:0 10px;
+                    padding: 0 10px;
                     position: relative;
-                    top:-1px;
+                    top: -1px;
                 }
 
                 input.form-control {
@@ -74,9 +85,9 @@
                     display: inline-block;
                     vertical-align: top;
                     margin-bottom: 0;
-                    padding:0 10px;
+                    padding: 0 10px;
                     position: relative;
-                    top:-1px;
+                    top: -1px;
                 }
 
                 input.form-control {

diff --git a/src/resources/views/fields/code.blade.php b/src/resources/views/fields/code.blade.php
index ea196c3d293c792a55048e57dbd8611021a037c7..65503a999482e6aa2c9da82a86a2bbe7a6957c58 100644 (file)
--- a/src/resources/views/fields/code.blade.php
+++ b/src/resources/views/fields/code.blade.php
@@ -11,12 +11,13 @@
         $dependencies=$allDependencies[$mode];
     }
 @endphp
-<!-- textarea -->
+    <!-- textarea -->
 @include('crud::fields.inc.wrapper_start')
 <label>{!! $field['label'] !!}</label>
 @include('crud::fields.inc.translatable_icon')
 <textarea
     class="code"
+    data-wrap="{{$field['wrap']}}"
     data-mode="{{$mode}}"
     name="{{ $field['name'] }}"
         @include('crud::fields.inc.attributes')
@@ -35,23 +36,37 @@
 @if ($crud->checkIfFieldIsFirstOfItsType($field))
 
     @push('crud_fields_styles')
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.63.3/codemirror.min.css" integrity="sha512-6sALqOPMrNSc+1p5xOhPwGIzs6kIlST+9oGWlI4Wwcbj1saaX9J3uzO3Vub016dmHV7hM+bMi/rfXLiF5DNIZg==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/6.65.7/codemirror.min.css"
+              integrity="sha512-uf06llspW44/LZpHzHT6qBOIVODjWtv4MxCricRxkzvopAlSWnTf6hpZTFxuuZcuNE9CBQhqE0Seu1CoRk84nQ=="
+              crossorigin="anonymous" referrerpolicy="no-referrer"/>
     @endpush
     @push('crud_fields_scripts')
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.63.3/codemirror.min.js" integrity="sha512-XMlgZzPyVXf1I/wbGnofk1Hfdx+zAWyZjh6c21yGo/k1zNC4Ve6xcQnTDTCHrjFGsOrVicJsBURLYktVEu/8vQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.63.3/addon/runmode/colorize.min.js" integrity="sha512-Qm87NfbGCvAc07Rxm7BUJ2AOmMhHRmAWj9tZWDocpStvKXmQFqAKm6LYycQhJHhJnWZusyuwjpD/lsKVOe39PQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>s
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/6.65.7/codemirror.min.js"
+                integrity="sha512-8RnEqURPUc5aqFEN04aQEiPlSAdE0jlFS/9iGgUyNtwFnSKCXhmB6ZTNl7LnDtDWKabJIASzXrzD0K+LYexU9g=="
+                crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/6.65.7/addon/runmode/colorize.min.js"
+                integrity="sha512-KyiBT1ypnd1OYmXt5tfljpsucuh9iscvA9soQDkKAdbwZfAk+RfPyxNd9E6tiuJmF9ZhPiDDXzdRkp5ccp525w=="
+                crossorigin="anonymous" referrerpolicy="no-referrer"></script>
         <script>
             jQuery(document).ready(function ($) {
                 function initMirrorCode() {
                     $('textarea.code').each(function () {
+                        var textarea = $(this);
+                        if ($(this).closest('.item.sample').length === 1) {
+                            return;
+                        }
                         if ($(this).data('mirrorcodeok') === true) {
                             return;
                         }
                         $(this).data('mirrorcodeok', true);
-                        CodeMirror.fromTextArea($(this).get(0), {
+                        var c = CodeMirror.fromTextArea($(this).get(0), {
                             lineNumbers: true,
+                            lineWrapping: $(this).data('wrap'),
                             mode: $(this).data('mode'),
                         });
+                        c.on('change', function (o) {
+                            o.save();
+                        });
                     });
                 }
 
@@ -68,8 +83,8 @@
 @push('crud_fields_scripts')
     @foreach($dependencies as $dep)
         <script
-            src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.63.3/mode/{{$dep}}/{{$dep}}.min.js"></script>
+            src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/6.65.7/mode/{{$dep}}/{{$dep}}.min.js"></script>
     @endforeach
     <script
-        src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.63.3/mode/{{$mode}}/{{$mode}}.min.js"></script>
+        src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/6.65.7/mode/{{$mode}}/{{$mode}}.min.js"></script>
 @endpush