binda 0.1.5 → 0.1.6

data/app/views/binda/field_groups/_form_item.html.erb

@@ -1,7 +1,5 @@
-<div class="standard-form--container field-settings-container form-item--collapsable form-item--collapsed">
-	<%= ff.input :field_group_id, as: :hidden %>
-	<%= ff.input :id, as: :hidden %>
-	<%= ff.input :ancestry, as: :hidden unless ff.object.is_root? %>
+<li id="form--list-item-<%= ff.object.id %>" 
+  class="form-item form-item--collapsable <%= "form-item--#{ ff.object.field_type }" %> <%= "form-item--new" if is_new %> <%= "form-item--collapsed" unless is_new %>">
 	<%= render 'binda/field_groups/form_item/form_item_header', ff: ff %>
-	<%= render 'binda/field_groups/form_item/form_item_editor', f: f, ff: ff %>
-</div>
+	<%= render 'binda/field_groups/form_item/form_item_editor', f: f, ff: ff, is_new: is_new %>
+</li>

data/app/views/binda/field_groups/_form_new_item.html.erb

@@ -0,0 +1,8 @@
+<%= simple_form_for [@field_group.structure, @field_group], defaults: { label: false }, html: { multipart: true }  do |f| %>
+<!-- SPLIT -->
+	<%# see https://stackoverflow.com/questions/32984498/rails-4-adding-child-index-to-dynamically-added-nested-form-fields-with-cocoo %>
+	<%= f.simple_fields_for :field_settings, @field_setting, child_index: (Time.now.to_i * rand(10000)) do |ff| %>
+		<%= render 'binda/field_groups/form_item', f: f, ff: ff, is_new: true %>
+	<% end %>
+<!-- SPLIT -->
+<% end %>

data/app/views/binda/field_groups/_form_section.html.erb

@@ -1,30 +1,20 @@
 <%# This form is only for settings which are not part of any repeater. %>
 <%# This is done using `where( ancestry: nil )` %>
-<%= f.simple_fields_for :field_settings, f.object.field_settings.where( ancestry: nil ).order( :position, :name ) do |ff| %>
-  <div id="form-item-<%= ff.object.id %>" 
-    class="form-item <%= "form-item--#{ ff.object.field_type }" unless ff.object.field_type.nil? %>">
-    <%= render 'form_item', f: f, ff: ff %>
+
+<div class="standard-form--container">
+  <div id="form-section--field-group-<%= @field_group.id %>" 
+    class="form-section--wide-container standard-form--field-group">
+    <div class="standard-form--header">
+      <small><%= t('binda.field_setting.plural') %></small>
+    </div>
+    <div class="form-group">
+      <%= render 'binda/field_groups/form_section/form_section_header', f: f %>
+      <%= render 'binda/field_groups/form_section/form_section_list', f: f %>
+    </div>
+    <% if @field_group.slug.nil? %>
+      <p>
+        <%= t( :hint_create_parent_before_child, arg1: "#{ t :field_group }", arg2: "#{ t :field_setting }" ) %>
+      </p>
+    <% end %>
   </div>
-<% end %>
-<%= f.simple_fields_for 'new_field_settings[]', @field_group.field_settings.build( field_group: @field_group ) do |ff| %>
-  <div id="field-group-<%= f.object.id %>--new-form-item" 
-    class="form-item form-item--new">
-    <%= render 'form_item', f: f, ff: ff %>
-  </div>
-<% end %>
-<% if @field_group.slug.nil? %>
-  <p>
-    <%= t( :hint_create_parent_before_child, arg1: "#{ t :field_group }", arg2: "#{ t :field_setting }" ).capitalize %>  
-  </p>
-<% else %>
-  <div class="standard-form--main-actions">    
-    <a id="form-item--field-group-<%= f.object.id %>--add-new" 
-      class="form-item--add-new main-header--link b-btn b-btn-primary b-btn-settings" 
-      href="<%= new_structure_field_group_field_setting_path( field_group_id: @field_group.slug ) %>" 
-      data-new-form-item-id="field-group-<%= f.object.id %>--new-form-item">
-      <i class="fa fa-plus" aria-hidden="true"></i>
-      <%= t('binda.new').capitalize %> 
-      <%= t('binda.field_setting.singular') %>
-    </a>
-  </div>
-<% end %>
+</div>

data/app/views/binda/field_groups/_form_section_repeater.html.erb

@@ -1,20 +1,19 @@
-<%= f.simple_fields_for :field_settings, repeater.children.order( :position, :name ) do |ff| %>
-	<div id="form-item-<%= ff.object.id %>" class="form-item <%= "form-item--#{ ff.object.field_type }" unless ff.object.field_type.nil? %>">
-	  <%= render 'form_item', f: f, ff: ff %>
-	</div>
-<% end %>
-<%= f.simple_fields_for 'new_field_settings[]', repeater.children.build( field_group: @field_group ) do |ff| %>
-  <div id="repeater-<%= repeater.id %>--new-form-item" class="form-item form-item--new">
-    <%= render 'form_item', f: f, ff: ff %>
+<div class="standard-form--container">
+  <div id="form-section--field-group-<%= repeater.id %>"
+    class="form-section--wide-container standard-form--field-group">
+    <div class="form-section">
+      <div class="standard-form--header">
+        <small><%= t('binda.repeater_field_settings', arg1: repeater.name ) %></small>
+      </div>
+      <div class="form-group">
+        <%= render 'binda/field_groups/form_section/form_section_header', f: f, repeater: repeater %>
+        <%= render 'binda/field_groups/form_section/form_section_list', f: f, repeater: repeater %>
+      </div>
+      <% if @field_group.slug.nil? %>
+        <p>
+          <%= t( :hint_create_parent_before_child, arg1: "#{ t :field_group }", arg2: "#{ t :field_setting }" ) %>
+        </p>
+      <% end %>
+    </div>
   </div>
-<% end %>
-<div class="standard-form--main-actions">		
-	<a id="form-item--repeater-<%= repeater.id %>--add-new" 
-    class="form-item--add-new main-header--link b-btn b-btn-primary b-btn-settings" 
-    data-new-form-item-id="repeater-<%= repeater.id %>--new-form-item" 
-    href="#">
-    <i class="fa fa-plus" aria-hidden="true"></i>
-    <%= t(:new_item_in_repeater, arg1: repeater.name.capitalize) %> 
-    <%= t('binda.field_setting.singular') %>
-	</a>
 </div>

data/app/views/binda/field_groups/_form_sidebar.html.erb

@@ -0,0 +1,13 @@
+<div class="standard-form--container">
+  <div class="standard-form--header">
+    <small><%= "#{ t :setting }".pluralize %></small>
+  </div>
+  <div class="standard-form--main-actions">
+    <%= button_tag '<i class="fas fa-check"></i>Save changes'.html_safe, {
+        class: 'b-btn b-btn-primary b-btn-settings',
+        id: 'save',
+        'data-entries-number': get_entries_number,
+        'data-instance-type': @structure.instance_type.pluralize
+    } %>
+  </div>
+</div>

data/app/views/binda/field_groups/form_item/_form_item_editor.html.erb

@@ -1,14 +1,18 @@
-<div class="form-item--editor">
+<div class="form-item--editor form-item--collapsable-stack">
 	<div class="form-item--half-size">
-		<%= ff.input :name, as: :string, input_html: { class: "form-item--input" } %>
+		<%= ff.input :name, as: :string, input_html: { class: "form-item--default-input", "test-hook": "field_group_field_settings_name" } %>
 	</div>
-	<% if ff.object.new_record? %>
-		<%= render 'binda/field_groups/form_item/form_item_new_editor', ff: ff %>
+	<% if is_new %>
+		<%= render 'binda/field_groups/form_item/form_item_editor_new_item', ff: ff %>
 	<% else %>
-		<%= render 'binda/field_groups/form_item/form_item_persisted_editor', ff: ff %>
+		<%= render 'binda/field_groups/form_item/form_item_editor_existing_item', ff: ff %>
 		<% if %w(radio selection checkbox).include?(ff.object.field_type) %>
 			<%= render 'binda/field_groups/form_item/form_item_choice_editor', f: f, ff: ff  %>
 		<% end %>
 	<% end %>
+	<%= ff.input :field_group_id, as: :hidden %>
+	<%= ff.input :id, as: :hidden %>
+	<%= ff.input :ancestry, as: :hidden unless ff.object.is_root? %>
+	<%# DON'T USE ff.input :position otherwise it will override the order set by Binda via ajax when adding a new item %>
 	<div class="clearfix"></div>
 </div>

data/app/views/binda/field_groups/form_item/{_form_item_persisted_editor.html.erb → _form_item_editor_existing_item.html.erb}

@@ -9,10 +9,7 @@
   <% end %>
 </div>
 <div class="form-item--full-size">
-	<%= ff.input :description, input_html: { class: "form-item--input" } %>
-</div>
-<div class="form-item--full-size">
-	<%= ff.input :position, as: :integer, input_html: { class: "form-item--input" } %>
+	<%= ff.input :description, input_html: { class: "form-item--input tinymce" } %>
 </div>
 <% if ff.object.field_type == 'relation' %>
   <div class="form-item--full-size">

data/app/views/binda/field_groups/form_item/_form_item_editor_new_item.html.erb

@@ -0,0 +1,3 @@
+<div class="form-item--half-size">
+  <%= ff.input :field_type, as: :select, collection: get_field_types, include_blank: false, prompt: t(:select_field_type), input_html: { class: 'form-item--select-input' } %>
+</div>

data/app/views/binda/field_groups/form_item/_form_item_header.html.erb

@@ -1,25 +1,24 @@
-<div class="standard-form--secondary-header form-item--header form-item--repeater-header">
-	<% if ff.object.slug.nil? %>
-		<a class="form-item--delete-repeater-item form-item--remove-item-with-js"
-	     data-confirm="<%= t('binda.field_setting.confirm_delete') %>">
-			<i class="far fa-trash-alt"></i> 
-			<%= t('binda.delete').capitalize %>
-	  </a>
-	  <p><%= t('binda.new_item_in_repeater', { arg1: '' })%></p>
-	<% else %>
-		<a class="form-item--collapse-btn" href="#">
-			<span><i class="fas fa-angle-up"></i> <%= t('binda.collapse') %></span>
-			<span><i class="fas fa-angle-down"></i> <%= t('binda.expand') %></span>
-		</a>
-		<a href="<%= structure_field_group_field_setting_path( @structure, @field_group, ff.object ) %>"
-			class="form-item--delete-repeater-item"
-			data-method="delete"
-			data-confirm="<%= t('binda.confirm_delete') %>">
-			<i class="far fa-trash-alt"></i> 
-			<%= t('binda.delete').capitalize %>
-		</a>
-    <p>
-    	<%= ff.object.name %> (<%= ff.object.field_type.humanize.capitalize %>)
-    </p>
-	<% end %>
+<div class="standard-form--secondary-header form-item--header">
+	<a class="form-item--collapse-btn" 
+		href="#"
+		data-sortable-target-id="form--list-<%= ff.object.id %>">
+		<span>
+			<i class="fas fa-angle-up"></i> 
+			<%= t('binda.collapse') %>
+		</span>
+		<span>
+			<i class="fas fa-angle-down"></i> 
+			<%= t('binda.expand') %>
+		</span>
+	</a>
+	<a href="<%= structure_field_group_field_setting_path( @structure, @field_group, ff.object ) %>"
+		class="form--delete-list-item"
+		data-id="<%= ff.object.id %>"
+		data-confirm="<%= t('binda.confirm_delete') %>">
+		<i class="far fa-trash-alt"></i> 
+		<%= t('binda.delete').capitalize %>
+	</a>
+  <p>
+  	<%= ff.object.name %> (<%= ff.object.field_type.humanize.capitalize %>)
+  </p>
 </div>

data/app/views/binda/field_groups/form_section/_form_section_header.html.erb

@@ -0,0 +1,45 @@
+<div>
+	<a class="b-btn b-btn-primary sortable--toggle" 
+		href="#" 
+		data-sortable-target-id="form--list-<%= defined?(repeater) ? repeater.id : f.object.id %>"
+		test-hook="sortable--toggle-<%= defined?(repeater) ? repeater.id : f.object.id %>">
+		<span class="sortable--toggle-text">
+			<i class="fa fa-check" aria-hidden="true"></i> 
+			<%= t'binda.done' %>
+		</span>
+		<span class="sortable--toggle-text">
+			<i class="fa fa-random" aria-hidden="true"></i> 
+			<%= t'binda.sort_items' %>
+		</span>
+	</a>
+	<% if defined? repeater %>
+  	<a id="form--list-<%= repeater.id %>--add-list-item" 
+      class="form--add-list-item main-header--link b-btn b-btn-primary b-btn-settings" 
+      href="#"
+	    data-url="<%= structure_field_group_add_field_setting_path(field_group_id: @field_group.id) %>"
+	    data-id="<%= repeater.id %>"
+	    data-params="id=<%= f.object.id %>&ancestry=<%= repeater.id %>">
+      <i class="fa fa-plus" aria-hidden="true"></i>	
+      <%= t(:new_item_in_repeater, arg1: repeater.name.capitalize) %> 
+      <%= t('binda.field_setting.singular') %>
+    </a>
+	<% else %>
+	  <a id="form--list-<%= f.object.id %>--add-list-item" 
+	    class="form--add-list-item main-header--link b-btn b-btn-primary b-btn-settings" 
+	    href="#" 
+	    data-url="<%= structure_field_group_add_field_setting_path(field_group_id: @field_group.id) %>"
+	    data-id="<%= f.object.id %>"
+	    data-params="id=<%= f.object.id %>">
+	    <i class="fa fa-plus" aria-hidden="true"></i>
+	    <%= t('binda.field_setting.new') %>
+	  </a>
+  <% end %>
+	<p class="control-label clearfix">
+		<%= defined?(repeater) ? repeater.name : f.object.name %> <%= t('binda.settings').downcase %>
+	</p>
+	<% if !f.object.description.blank? && !defined?(repeater) %>
+		<p class="help-block">
+			<%= f.object.description %>
+		</p>
+	<% end %>
+</div>

data/app/views/binda/field_groups/form_section/_form_section_list.html.erb

@@ -0,0 +1,9 @@
+<ul id="form--list-<%= defined?(repeater) ? repeater.id : f.object.id %>"
+	class="sortable sortable--disabled form--list"
+  data-update-url="<%= url_for([@structure, @field_group, :sort_field_settings]) %>" 
+  data-message="<%= t 'binda.sort_items_loader', { arg1: t('binda.field_setting.plural').downcase } %>">
+  <% ancestry = defined?(repeater) ? repeater.id.to_s : nil %>
+  <%= f.simple_fields_for :field_settings, f.object.field_settings.where( ancestry: ancestry ).order( :position, :name ) do |ff| %>
+    <%= render 'binda/field_groups/form_item', f: f, ff: ff, is_new: false %>
+  <% end %>
+</ul>

data/app/views/binda/fieldable/_form_body.html.erb

@@ -23,11 +23,16 @@
     <% @structure.field_groups.order( :position, :name ).each_with_index do |field_group, index| %>
       <div class="standard-form--container">
         <div class="standard-form--header">
-          <small><%= field_group.name.capitalize %></small>
+          <small><%= field_group.name %></small>
         </div>
         <% if f.object.new_record? %>
           <p class="standard-form--hint-on-new-record"><%= t( :hint_create_parent_before_child, arg1: "#{@structure.name} #{@structure.instance_type}", arg2: "#{ t :detail }" ).capitalize %></p>
         <% else %>
+          <% unless field_group.description.blank? %>
+            <div class="standard-form--field-group-description">
+              <%== field_group.description %>
+            </div>
+          <% end %>
           <% field_group.field_settings.order( :position, :name ).each do |field_setting| %>
             <% next unless field_setting.is_root? %>
             <%= render "binda/fieldable/form_section", f: f, field_setting: field_setting %>

data/app/views/binda/fieldable/_form_item_date.html.erb

@@ -4,7 +4,7 @@
 				start_year: Date.today.year - 200, 
 				end_year: Date.today.year + 200, 
 				hint: field_setting.description, 
-				label: field_setting.name.capitalize, 
+				label: field_setting.name, 
 				input_html: { class: 'select2-item' } %>		
 	<%= ff.input :field_setting_id, as: :hidden, input_html: { value: field_setting.id } %>
 	<%= ff.input :id, as: :hidden, input_html: { value: ff.object.id } %>

data/app/views/binda/fieldable/_form_item_image.html.erb

@@ -4,7 +4,7 @@
     data-message="<%= t('binda.upload_loading_message') %>"
     data-error="<%= t('binda.upload_error_message')%>">
     <p class="control-label">
-        <%= field_setting.name.capitalize %>    
+        <%= field_setting.name %>    
     </p>
     <% image = ff.object.image.thumb.url if ff.object.image.present? %>
     <div class="fileupload--dashboard">

data/app/views/binda/fieldable/_form_item_new_repeater.html.erb

@@ -1,25 +1,11 @@
 <%= simple_form_for [@instance.structure, @instance], defaults: { label: false }, html: { multipart: true }  do |f| %>
 <!-- SPLIT -->
-	<li id="repeater_<%= @repeater.id %>" class="form-item--repeater form-item--collapsable">
-		<div class="form-item--header">
-			<a class="form-item--collapse-btn" href="#">
-				<span><i class="fas fa-angle-up"></i> <%= t('binda.collapse') %></span>
-				<span><i class="fas fa-angle-down"></i> <%= t('binda.expand') %></span>
-			</a>
-			<a class="form-item--delete-repeater-item" href="<%= repeater_path( id: @repeater.id ) %>" data-id="<%= @repeater.id %>" data-confirm="<%= t 'binda.confirm_delete' %>"><i class="far fa-trash-alt"></i> <%= t('binda.delete') %></a>
-			<p><%= @repeater.field_setting.name %> <%= t('binda.item') %> #<%= @repeater.id %></p>
-		</div>
-		<div class="form-item--repeater-fields">
-			<%= f.simple_fields_for "repeaters_attributes[]", @repeater do |ff| %>
-				<%= ff.input :fieldable_id, as: :hidden %>
-				<%= ff.input :fieldable_type, as: :hidden %>
-		  	<%= ff.input :field_setting_id, as: :hidden %>
-				<%= ff.input :id, as: :hidden, input_html: { value: ff.object.id } %>
-				<% ff.object.field_setting.children.order( :position, :id ).each do |repeater_setting_child| %>
-				  <%= render "binda/fieldable/form_section_repeater", f: ff, repeater_setting_child: repeater_setting_child %>
-			  <% end %>
-			<% end %>
-		</div>
-	</li>
+	<%# see https://stackoverflow.com/questions/32984498/rails-4-adding-child-index-to-dynamically-added-nested-form-fields-with-cocoo %>
+  <%= f.simple_fields_for "relations_attributes[]", @repeater, child_index: (Time.now.to_i * rand(10000)) do |ff| %>
+		<%= render 'binda/fieldable/form_item_repeater/form_item_repeater_list_item', 
+			repeater: ff.object,
+			repeater_setting: ff.object.field_setting, 
+			f: f %>
+  <% end %>
 <!-- SPLIT -->
 <% end %>

data/app/views/binda/fieldable/_form_item_relation.html.erb

@@ -6,12 +6,12 @@
 		<%= ff.input :dependent_component_ids, collection: get_relationable_components(field_setting), 
 			as: :select,
 			input_html: { multiple: true, class: 'select2-item' },
-			label: field_setting.name.capitalize,
+			label: field_setting.name,
 			hint: field_setting.description,
 			value_method: :id,
 			checked: ff.object.dependent_component_ids, 
-			include_blank: false, 
-			include_hidden: false,
+			include_blank: true, 
+			include_hidden: true,
 			placeholder: t('binda.select_placeholder') %>
 	<% end %>
 
@@ -19,19 +19,19 @@
 		<%= ff.input :dependent_board_ids, collection: get_relationable_boards(field_setting), 
 			as: :select, 
 			input_html: { multiple: true, class: 'select2-item' }, 
-			label: field_setting.name.capitalize,
+			label: field_setting.name,
 			hint: field_setting.description,
 			value_method: :id, 
 			checked: ff.object.dependent_board_ids, 
-			include_blank: false, 
-			include_hidden: false,
+			include_blank: true, 
+			include_hidden: true,
 			placeholder: t('binda.select_placeholder') %>
 	<% end %>
 
 	<% unless field_setting.accepted_structures.any? %>
 		<div class="form-group">
 			<div class="control-label-wrap">
-				<label class="control-label"><%= field_setting.name.capitalize %></label>
+				<label class="control-label"><%= field_setting.name %></label>
 			</div>
 			<p><%= t('binda.relation_warning') %></p>
 		</div>

data/app/views/binda/fieldable/_form_item_repeater.html.erb

@@ -1,102 +1,12 @@
-<div id="standard-form--repeater-<%= repeater_setting.id %>" class="form-item--label-on-left form-item--repeater-section standard-form--repeater form-item">
-	<div class="form-group">		
-	  
-		<div class="form-item--repeater-title">
-
-			<%# SORT REPEATER FIELDS %>
-			<a class="b-btn b-btn-primary sortable--toggle" href="#" data-repeater-id="form-item--repeater-setting-<%= repeater_setting.id %>">
-				<span class="sortable--toggle-text">
-					<i class="fa fa-check" aria-hidden="true"></i> <%= t'binda.done' %>
-				</span>
-				<span class="sortable--toggle-text">
-					<i class="fa fa-random" aria-hidden="true"></i> <%= t'binda.sort_items' %>
-				</span>
-			</a>
-			
-			<%# ADD NEW REPEATER FIELDS %>
-			<a id="form-item--repeater-<%= repeater_setting.id %>--add-new-button" class="form-item--repeater-section--add-new main-header--link b-btn b-btn-primary" href="#" data-url="<%= url_for([@structure, @instance, :new_repeater]) %>" data-id="<%= repeater_setting.id %>">
-			  <i class="fas fa-plus"></i> <%= t('binda.new_item_in_repeater', arg1: repeater_setting.name.capitalize ) %>
-			</a>
-			
-			<%# REPEATER NAME %>
-			<p class="control-label clearfix"><%= repeater_setting.name.capitalize %></p>
-		
-		</div>
-
-		<ul id="form-item--repeater-setting-<%= repeater_setting.id %>" class="sortable sortable--disabled" data-update-url="<%= url_for([@structure, @instance, :sort_repeaters]) %>" data-message="<%= t 'binda.sort_items_loader', { arg1: t('binda.components').downcase } %>">
-
-			<% if repeaters.size == 0 %>
-
-				<% repeater = @instance.find_or_create_a_field_by( repeater_setting.id, 'repeater' ) %>
-				
-				<li id="repeater_<%= repeater.id %>" class="form-item--repeater form-item--collapsable">
-
-					<%# - - - - - - - - - - - - %>
-					<%# REPEATER HEADER         %>
-					<%# - - - - - - - - - - - - %>
-					<div class="form-item--header">
-						<a class="form-item--collapse-btn" href="#">
-							<span><i class="fas fa-angle-up"></i> <%= t('binda.collapse') %></span>
-							<span><i class="fas fa-angle-down"></i> <%= t('binda.expand') %></span>
-						</a>
-						<a class="form-item--delete-repeater-item" href="<%= repeater_path( id: repeater.id ) %>" data-confirm="<%= t 'binda.confirm_delete' %>"><i class="far fa-trash-alt"></i> <%= t('binda.delete').capitalize %></a>
-						<p><%= repeater.field_setting.name %> <%= t('binda.item') %> #<%= repeater.id %></p>
-					</div>
-
-					<%# - - - - - - - - - - - - - - %>
-					<%# FIRST REPEATER              %>
-					<%# - - - - - - - - - - - - - - %>
-					<div class="form-item--repeater-fields">
-				    <%= f.simple_fields_for "repeaters_attributes[]", repeater do |ff| %>
-							<%= ff.input :fieldable_id, as: :hidden %>
-							<%= ff.input :fieldable_type, as: :hidden %>
-				    	<%= ff.input :field_setting_id, as: :hidden, input_html: { value: repeater_setting.id } %>
-							<%= ff.input :id, as: :hidden, input_html: { value: ff.object.id } %>
-							<% repeater_setting.children.order( :position, :id ).each do |repeater_setting_child| %>
-							  <%= render "binda/fieldable/form_section_repeater", f: ff, repeater_setting_child: repeater_setting_child %>
-						  <% end %>
-						<% end %>
-					</div>
-				</li>
-
-			<% else %>
-
-			  <% repeaters.each do |repeater| %>
-					<li id="repeater_<%= repeater.id %>" class="form-item--repeater form-item--collapsable">
-
-						<%# - - - - - - - - - - - - %>
-						<%# REPEATER HEADER         %>
-						<%# - - - - - - - - - - - - %>
-						<div class="form-item--header">
-							<a class="form-item--collapse-btn" href="#">
-								<span><i class="fas fa-angle-up"></i> <%= t('binda.collapse') %></span>
-								<span><i class="fas fa-angle-down"></i> <%= t('binda.expand') %></span>
-							</a>
-							<a class="form-item--delete-repeater-item" href="<%= repeater_path( id: repeater.id ) %>" data-id="<%= repeater.id %>" data-confirm="<%= t 'binda.confirm_delete' %>"><i class="far fa-trash-alt"></i> <%= t('binda.delete').capitalize %></a>
-							<p><%= repeater.field_setting.name %> <%= t('binda.item') %>  #<%= repeater.id %></p>
-						</div>
-						<%# - - - - - - - - - - - - - - %>
-						<%# EACH REPEATER               %>
-						<%# - - - - - - - - - - - - - - %>
-						<div class="form-item--repeater-fields">
-					    <%= f.simple_fields_for "repeaters_attributes[]", repeater do |ff| %>
-					    	<%= ff.input :field_setting_id, as: :hidden, input_html: { value: ff.object.field_setting.id } %>
-								<%= ff.input :id, as: :hidden, input_html: { value: ff.object.id } %>
-								<%= ff.input :fieldable_id, as: :hidden %>
-								<%= ff.input :fieldable_type, as: :hidden %>
-								<% ff.object.field_setting.children.order( :position, :id ).each do |repeater_setting_child| %>
-								  <%= render "binda/fieldable/form_section_repeater", f: ff, repeater_setting_child: repeater_setting_child, repeater: repeater %>
-							  <% end %>
-						  <% end %>
-						</div>
-
-					</li>
-			  <% end %>
-
-			<% end %>
-		</ul>
-
+<div id="standard-form--repeater-<%= repeater_setting.id %>" 
+	class="form-item--label-on-left form-item--repeater-section standard-form--repeater form-item">
+	<div class="form-group">
+		<%= render 'binda/fieldable/form_item_repeater/form_item_repeater_header', 
+			repeater_setting: repeater_setting %>
+		<%= render 'binda/fieldable/form_item_repeater/form_item_repeater_list', 
+			repeater_setting: repeater_setting, 
+			repeaters: repeaters, 
+			f: f %>
 		<div class="clearfix"></div>
-
 	</div>
 </div>