fix #3476 @0.5

diff --git a/src/public/bunchmultiple/bunchmultiple.css b/src/public/bunchmultiple/bunchmultiple.css
index 6cc26c8de9cd61622cb976a88d2c58ea60bdb4df..615d423abeba9d5f1551e96b553d4897cbbc7a40 100644 (file)
--- a/src/public/bunchmultiple/bunchmultiple.css
+++ b/src/public/bunchmultiple/bunchmultiple.css
@@ -1,14 +1,16 @@
 .bunchmultiple {
-  width: 100%;
   margin: 0 15px;
 }
+.bunchmultiple.bunchmultiple_root {
+  width: 100%;
+}
 .bunchmultiple .bunchmultiple__wrapper {
   padding: 15px;
   border: 1px solid #eee;
   background: #fafafa;
   margin-bottom: 15px;
 }
-.bunchmultiple .bunchmultiple__wrapper.noborder {
+.bunchmultiple .bunchmultiple__wrapper.bunchmultiple_root {
   padding: 0;
   border: 0;
   background: none;
@@ -39,17 +41,36 @@
   padding: 8px 18px;
   font-weight: 700;
   position: relative;
+  cursor: pointer;
+}
+.bunchmultiple .bunchmultiple__wrapper .item .legend > span {
+  display: inline-block;
+  overflow: hidden;
+  width: calc(100% - 150px);
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  position: absolute;
+  left: 50px;
+  top: 10px;
 }
 .bunchmultiple .bunchmultiple__wrapper .item .legend a.action {
   color: #333;
   font-size: 1.2em;
+  text-decoration: none;
 }
 .bunchmultiple .bunchmultiple__wrapper .item .legend a.action.sort-handle {
   padding: 0 20px 0 0;
+  cursor: move;
+}
+.bunchmultiple .bunchmultiple__wrapper .item .legend a.action.edit {
+  position: absolute;
+  right: 50px;
+  cursor: pointer;
 }
 .bunchmultiple .bunchmultiple__wrapper .item .legend a.action.remove {
   position: absolute;
   right: 20px;
+  cursor: pointer;
 }
 .bunchmultiple .bunchmultiple__wrapper .item .subform {
   overflow: hidden;

diff --git a/src/public/bunchmultiple/bunchmultiple.css.map b/src/public/bunchmultiple/bunchmultiple.css.map
index 2bba8994e17f3ef166ebb702d5802f06ff092135..8ca29521a441a62a4bdc7d74ee8ddd08f7f1021c 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,WAAA;EACA,cAAA;;AAFJ,cAII;EACI,aAAA;EACA,sBAAA;EACA,mBAAA;EACA,mBAAA;;AAEA,cANJ,wBAMK;EACG,UAAA;EACA,SAAA;EACA,gBAAA;EACA,gBAAA;;AAdZ,cAII,wBAcI;EACI,UAAA;;AAnBZ,cAII,wBAcI,cAGI;EACI,gBAAA;EACA,mBAAA;;AAvBhB,cAII,wBAuBI;EACI,mBAAA;;AAEA,cA1BR,wBAuBI,MAGK;EACG,uBAAA;EACA,sBAAA;;AAFJ,cA1BR,wBAuBI,MAGK,MAIG;EACI,UAAA;;AALR,cA1BR,wBAuBI,MAGK,MAQG;EACI,UAAA;;AAvCpB,cAII,wBAuBI,MAgBI;EACI,yBAAA;EACA,iBAAA;EACA,gBAAA;EACA,kBAAA;;AA/ChB,cAII,wBAuBI,MAgBI,QAMI,EAAC;EACG,WAAA;EACA,gBAAA;;AAEA,cAjDhB,wBAuBI,MAgBI,QAMI,EAAC,OAII;EACG,mBAAA;;AAGJ,cArDhB,wBAuBI,MAgBI,QAMI,EAAC,OAQI;EACG,kBAAA;EACA,WAAA;;AA3DxB,cAII,wBAuBI,MAqCI;EACI,gBAAA;EACA,iEAAA;EACA,yBAAA;EACA,eAAA;;AAGJ,cAnER,wBAuBI,MA4CK;EACG,aAAA;;AAGJ,cAvER,wBAuBI,MAgDK,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;EACG,WAAA;;AAJR,cAOI;EACI,aAAA;EACA,sBAAA;EACA,mBAAA;EACA,mBAAA;;AAEA,cANJ,wBAMK;EACG,UAAA;EACA,SAAA;EACA,gBAAA;EACA,gBAAA;;AAjBZ,cAOI,wBAcI;EACI,UAAA;;AAtBZ,cAOI,wBAcI,cAGI;EACI,gBAAA;EACA,mBAAA;;AA1BhB,cAOI,wBAuBI;EACI,mBAAA;;AAEA,cA1BR,wBAuBI,MAGK;EACG,uBAAA;EACA,sBAAA;;AAFJ,cA1BR,wBAuBI,MAGK,MAIG;EACI,UAAA;;AALR,cA1BR,wBAuBI,MAGK,MAQG;EACI,UAAA;;AA1CpB,cAOI,wBAuBI,MAgBI;EACI,yBAAA;EACA,iBAAA;EACA,gBAAA;EACA,kBAAA;EACA,eAAA;;AAnDhB,cAOI,wBAuBI,MAgBI,QAOI;EACI,qBAAA;EACA,gBAAA;EACA,yBAAA;EACA,mBAAA;EACA,uBAAA;EACA,kBAAA;EACA,UAAA;EACA,SAAA;;AA7DpB,cAOI,wBAuBI,MAgBI,QAkBI,EAAC;EACG,WAAA;EACA,gBAAA;EACA,qBAAA;;AAEA,cA9DhB,wBAuBI,MAgBI,QAkBI,EAAC,OAKI;EACG,mBAAA;EACA,YAAA;;AAGJ,cAnEhB,wBAuBI,MAgBI,QAkBI,EAAC,OAUI;EACG,kBAAA;EACA,WAAA;EACA,eAAA;;AAGJ,cAzEhB,wBAuBI,MAgBI,QAkBI,EAAC,OAgBI;EACG,kBAAA;EACA,WAAA;EACA,eAAA;;AAnFxB,cAOI,wBAuBI,MA0DI;EACI,gBAAA;EACA,iEAAA;EACA,yBAAA;EACA,eAAA;;AAGJ,cAxFR,wBAuBI,MAiEK;EACG,aAAA;;AAGJ,cA5FR,wBAuBI,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 1d7554b1a73f2e95f716a669b2fda944f47bdab5..ce87b9cb44c851c2747a69bdcf25fa8ba14a6ba2 100644 (file)
--- a/src/public/bunchmultiple/bunchmultiple.js
+++ b/src/public/bunchmultiple/bunchmultiple.js
@@ -64,7 +64,8 @@
             });
 
             if ($(this.element).parent().closest('.bunchmultiple').length === 0) {
-                $(this.element).find('.bunchmultiple__wrapper').addClass('noborder');
+                $(this.element).find('.bunchmultiple__wrapper:eq(0)').addClass('bunchmultiple_root');
+                $(this.element).addClass('bunchmultiple_root');
             }
         },
 

diff --git a/src/public/bunchmultiple/bunchmultiple.less b/src/public/bunchmultiple/bunchmultiple.less
index 4fb4a242e2171b221ff99b81705ce920dd9f9af2..ca95f4a09f7859daa4b019199e426c021540f5fb 100644 (file)
--- a/src/public/bunchmultiple/bunchmultiple.less
+++ b/src/public/bunchmultiple/bunchmultiple.less
@@ -1,14 +1,17 @@
 .bunchmultiple {
-    width: 100%;
     margin: 0 15px;
 
+    &.bunchmultiple_root {
+        width: 100%;
+    }
+
     .bunchmultiple__wrapper {
         padding: 15px;
         border: 1px solid #eee;
         background: #fafafa;
         margin-bottom: 15px;
 
-        &.noborder {
+        &.bunchmultiple_root {
             padding: 0;
             border: 0;
             background: none;
@@ -46,18 +49,39 @@
                 padding: 8px 18px;
                 font-weight: 700;
                 position: relative;
+                cursor: pointer;
+
+                > span {
+                    display: inline-block;
+                    overflow: hidden;
+                    width: ~"calc(100% - 150px)";
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                    position: absolute;
+                    left: 50px;
+                    top: 10px;
+                }
 
                 a.action {
                     color: #333;
                     font-size: 1.2em;
+                    text-decoration: none;
 
                     &.sort-handle {
                         padding: 0 20px 0 0;
+                        cursor: move;
+                    }
+
+                    &.edit {
+                        position: absolute;
+                        right: 50px;
+                        cursor: pointer;
                     }
 
                     &.remove {
                         position: absolute;
                         right: 20px;
+                        cursor: pointer;
                     }
                 }
             }

diff --git a/src/resources/views/fields/bunch_multiple.blade.php b/src/resources/views/fields/bunch_multiple.blade.php
index f45caa1e2e52af50bbc5c328629c70d613c5abfb..4c383e04f8b25fd9c7934e772afebe85f4c1a628 100644 (file)
--- a/src/resources/views/fields/bunch_multiple.blade.php
+++ b/src/resources/views/fields/bunch_multiple.blade.php
@@ -12,9 +12,9 @@ if (!is_string($value)) {
 }
 
 ?>
-<div class="bunchmultiple col-xs-12" id="{!! $field['rand'] !!}" data-values="{{ $value }}">
+<div class="bunchmultiple" id="{!! $field['rand'] !!}" data-values="{{ $value }}">
     <input type="hidden" class="hiddenfield" name="{{$field['name']}}" value="{{ $value }}" data-bmid="{!! $field['rand'] !!}"/>
-    <div class="bunchmultiple__wrapper col-xs-12" data-bmid="{!! $field['rand'] !!}">
+    <div class="bunchmultiple__wrapper" data-bmid="{!! $field['rand'] !!}">
         <div @include('crud::inc.field_wrapper_attributes') >
             <label>{!! $field['label'] !!}</label>
             @include('crud::inc.field_translatable_icon')
@@ -27,9 +27,13 @@ if (!is_string($value)) {
                                                                                                      role="presentation"
                                                                                                      aria-hidden="true"></i></a>
                         <span data-legend="{{$field['edit_label']}}" data-bmid="{!! $field['rand'] !!}"></span>
+                        <a href="#" class="action edit" data-bmid="{!! $field['rand'] !!}"><i class="fa fa-pencil"
+                                                                                              role="presentation"
+                                                                                              aria-hidden="true"></i></a>
                         <a href="#" class="action remove" data-bmid="{!! $field['rand'] !!}"><i class="fa fa-trash"
                                                                                                 role="presentation"
                                                                                                 aria-hidden="true"></i></a>
+
                     </div>
                     <div class="subform" data-bmid="{!! $field['rand'] !!}">
                         @include('cubist_back::inc.show_bunch_fields', array('bunchfields'=>$field['bunchfields'],'bmid'=>$field['rand']))