From: Vincent Vanwaelscappel Date: Mon, 12 Sep 2022 17:09:18 +0000 (+0200) Subject: wip #5448 @1.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=3fda71158ffe394be69ffc7159392dee8ddd5471;p=cubist_cms-back.git wip #5448 @1.5 --- diff --git a/src/app/Magic/Fields/BunchOfFieldsMultiple.php b/src/app/Magic/Fields/BunchOfFieldsMultiple.php index 910ecac..e9d1e6f 100644 --- 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 c2f3172..2b7ca61 100644 --- 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 b78cf8f..c5f0def 100644 --- 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 36cc955..e7a8a45 100644 --- 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 54689ac..7bebb08 100644 --- 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 96d1545..a4d7815 100644 --- 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 ea196c3..65503a9 100644 --- a/src/resources/views/fields/code.blade.php +++ b/src/resources/views/fields/code.blade.php @@ -11,12 +11,13 @@ $dependencies=$allDependencies[$mode]; } @endphp - + @include('crud::fields.inc.wrapper_start') @include('crud::fields.inc.translatable_icon')