binda 0.1.3 → 0.1.4

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

@@ -1,94 +1,55 @@
 <%= render 'layouts/binda/popup_warning' %>
-
 <div class="standard-form">
-
-<%= simple_form_for @field_group, url: get_form_field_group_url, html: { class: 'form-body' } do |f| %>
-
-  <%= f.error_notification %>
-  
-  <% if f.object.errors.any? %>
-    <div class="standard-form--error-explanation b-alert b-alert--error">
-      <%= t('binda.standard_form_error_heading') %> <%= pluralize(f.object.errors.count, t("binda.standard_form_error")) %>:
-      <ul>
-        <% f.object.errors.full_messages.each do |msg| %>
-          <li><%= msg %></li>
-        <% end %>
-      </ul>
-    </div>
-  <% end %>
-
-  <div class="standard-form--body">
-
-    <div class="standard-form--container">
-
-      <div class="standard-form--header">
-        <small><%= "#{ t :details }" %></small>
-      </div>
-
-      <%= f.input :name, label: "#{ t :title }" %>
-
-      <% if @field_group.slug.nil? %>
-        <%= f.input :slug, as: :hidden %>
-      <% else %>
-        <%= f.input :slug %>
-      <% end %>
-
-    </div>
-
-    <div class="standard-form--container">
-
-      <div id="form-section--field-group-<%= @field_group.id %>" class="form-section--wide-container">
-        
+  <%= simple_form_for @field_group, url: get_form_field_group_url, html: { class: 'form-body' } do |f| %>
+    <%= f.error_notification %>
+    <%= render 'layouts/binda/form_errors', f: f %>
+    <div class="standard-form--body">
+      <div class="standard-form--container">
         <div class="standard-form--header">
-          <small><%= "#{ t 'binda.field_settings' }" %></small>
+          <small><%= "#{ t :details }" %></small>
         </div>
-        
-        <%= render "form_section", f: f %>
-        
+        <%= f.input :name %>
+        <% if @field_group.slug.nil? %>
+          <%= f.input :slug, as: :hidden %>
+        <% else %>
+          <%= f.input :slug %>
+        <% end %>
       </div>
-    </div>
-
-    <% @field_group.field_settings.where( field_type: 'repeater' ).order( :position, :id ).each do |repeater| %>
       <div class="standard-form--container">
-        <div id="form-section--repeater-<%= repeater.id %>" class="form-section--wide-container">
-          <div class="form-section">
-
-            <div class="standard-form--header field-settings-header">
-              <small><%= "#{ t('binda.repeater_field_settings', arg1: repeater.name ) }" %></small>
-            </div>
-
-            <%= render "form_section_repeater", f: f, repeater: repeater %>
-
+        <div id="form-section--field-group-<%= @field_group.id %>" class="form-section--wide-container">
+          <div class="standard-form--header">
+            <small><%= "#{ t 'binda.field_setting.plural' }" %></small>
           </div>
+          <%= render "form_section", f: f %>
         </div>
       </div>
-    <% end %>
-
-
-  </div>
-
-  <div class="standard-form--sidebar">
-
-    <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': "Binda::#{@structure.instance_type.classify}".constantize.where(structure_id:@structure.id).count,
-            'data-instance-type': @structure.instance_type.pluralize
-        } %>
+      <% @field_group.field_settings.where( field_type: 'repeater' ).order( :position, :id ).each do |repeater| %>
+        <div class="standard-form--container">
+          <div id="form-section--repeater-<%= repeater.id %>" class="form-section--wide-container">
+            <div class="form-section">
+              <div class="standard-form--header field-settings-header">
+                <small><%= "#{ t('binda.repeater_field_settings', arg1: repeater.name ) }" %></small>
+              </div>
+              <%= render "form_section_repeater", f: f, repeater: repeater %>
+            </div>
+          </div>
+        </div>
+      <% end %>
+    </div>
+    <div class="standard-form--sidebar">
+      <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>
-
     </div>
-
-  </div>
-
-<% end %>
-
+  <% end %>
 </div>

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

@@ -1,124 +1,7 @@
 <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? %>
-
-	<div class="standard-form--secondary-header form-item--header form-item--repeater-header">
-		<%# - - - - - - - - - - - - %>
-		<%# BUTTONS                 %>
-		<%# - - - - - - - - - - - - %>
-		<% if ff.object.slug.nil? %>
-			<a class="form-item--delete-repeater-item form-item--remove-item-with-js"
-		     data-confirm="This operation will delete this setting and all related component content. Are you ok with that?">
-				<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>
-      <%= link_to "<i class=\"far fa-trash-alt\"></i> #{t('binda.delete').capitalize}".html_safe,
-                  structure_field_group_field_setting_path( @structure, @field_group, ff.object ),
-                  method: :delete,
-                  data: { confirm: t('binda.confirm_delete') },
-                  class: 'form-item--delete-repeater-item' %>
-      <p><%= ff.object.name %> (<%= ff.object.field_type.humanize.capitalize %>)</p>
-		<% end %>
-  </div>
-
-	<div class="form-item--editor">
-
-		<%# - - - - - - - - - - - - %>
-		<%# NAME                    %>
-		<%# - - - - - - - - - - - - %>
-		<div class="form-item--half-size">
-			<%= ff.input :name, as: :string, input_html: { class: "form-item--input" } %>
-		</div>
-
-
-		<% if ff.object.new_record? %>
-
-			<%# - - - - - - - - - - - - %>
-			<%# SLUG                    %>
-			<%# - - - - - - - - - - - - %>
-			<%= ff.input :slug, as: :hidden, input_html: { class: "form-item--input" } %>
-
-	    <%# - - - - - - - - - - - - %>
-	    <%# FIELD TYPE              %>
-	    <%# - - - - - - - - - - - - %>
-	    <div class="form-item--half-size">
-
-	      <% if ff.object.field_type.nil? %>
-	        <%= 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' } %>
-	      <% else %>
-	        <%= ff.input :field_type, as: :string, disabled: true, input_html: { class: "form-item--input" } %>
-	      <% end %>
-	    </div>
-
-		<% else %>
-
-			<%# - - - - - - - - - - - - %>
-			<%# SLUG                    %>
-			<%# - - - - - - - - - - - - %>
-			<div class="form-item--half-size">
-				<%= ff.input :slug, as: :string, input_html: { class: "form-item--input" } %>
-			</div>
-
-	    <%# - - - - - - - - - - - - %>
-	    <%# FIELD TYPE              %>
-	    <%# - - - - - - - - - - - - %>
-	    <div class="form-item--full-size">
-	      <% if ff.object.field_type.nil? %>
-	        <%= 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' } %>
-	      <% else %>
-	        <%= ff.input :field_type, as: :string, disabled: true, input_html: { class: "form-item--input" } %>
-	      <% end %>
-	    </div>
-
-			<%# - - - - - - - - - - - - %>
-			<%# DESCRIPTION             %>
-			<%# - - - - - - - - - - - - %>
-			<div class="form-item--full-size">
-				<%= ff.input :description, input_html: { class: "form-item--input" } %>
-			</div>
-
-			<%# - - - - - - - - - - - - %>
-			<%# POSITION                %>
-			<%# - - - - - - - - - - - - %>
-			<div class="form-item--full-size">
-				<%= ff.input :position, as: :integer, input_html: { class: "form-item--input" } %>
-			</div>
-
-	    <%# - - - - - - - - - - - - %>
-	    <%# ACCEPTED STRUCTURES     %>
-	    <%# - - - - - - - - - - - - %>
-			<% if ff.object.field_type == 'relation' %>
-		    <div class="form-item--full-size">
-		      <%= ff.input :accepted_structure_ids, 
-		      		collection: Binda::Structure.all, 
-		      		as: :select, 
-		      		input_html: { multiple: true, class: 'select2-item' }, 
-		      		checked: ff.object.accepted_structures, 
-		      		include_blank: false, 
-		      		include_hidden: false %>
-		    </div>
-	    <% end %>
-
-
-			<% choiceables = ['radio', 'selection', 'checkbox'] %>
-			<% if choiceables.include? ff.object.field_type %>
-
-				<%# - - - - - - - - - - - - %>
-				<%# CHOICES                 %>
-				<%# - - - - - - - - - - - - %>
-				<%= render 'form_item_choice', f: f, ff: ff  %>
-
-			<% end %>
-
-		<% end %>
-		<div class="clearfix"></div>
-	</div>
-</div>
-
+	<%= 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>

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

@@ -1,35 +1,30 @@
-<%# - - - - - - - - - - - - %>
-<%# FORM ITEM               %>
-<%# - - - - - - - - - - - - %>
 <%# 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? %>">
+  <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 %>
-
-
-<%# - - - - - - - - - - - - %>
-<%# NEW FORM ITEM           %>
-<%# - - - - - - - - - - - - %>
 <%= 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">
+  <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 %>
-
-<%# - - - - - - - - - - - - - - %>
-<%# 'ADD NEW FORM ITEM' BUTTON  %>
-<%# - - - - - - - - - - - - - - %>
 <% 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(:new).capitalize }".html_safe %> <%= t :field_setting %>
+    <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 %>

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

@@ -1,28 +1,20 @@
-<%# - - - - - - - - - - - - %>
-<%# FORM ITEMS              %>
-<%# - - - - - - - - - - - - %>
 <%= 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 %>
-
-<%# - - - - - - - - - - - - %>
-<%# NEW FORM ITEM           %>
-<%# - - - - - - - - - - - - %>
 <%= 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>
 <% end %>
-
-
-<%# - - - - - - - - - - - - - - %>
-<%# ADD NEW FIELD TO REPEATER   %>
-<%# - - - - - - - - - - - - - - %>
 <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) }".html_safe %> <%= t :field_setting %>
-	  <%=  %>
+	<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/edit.html.erb

@@ -1,6 +1,18 @@
+<% content_for :title do %>
+  <%= t('binda.edit_field_group', { arg1: @field_group.name }) %> 
+<% end %>
+
+
 <% content_for :header do %>
-  <p class="main-header--title"><%= t('binda.edit_field_group', { arg1: @field_group.name }) %></p>
-  <a href="<%= structure_path( @structure.slug ) %>" class="main-header--back"><span class="glyphicon glyphicon-list"></span> <%= "#{ t :back_to }".capitalize %> <%= @structure.name.capitalize %></a>
+  <p class="main-header--title">
+  	<%= t('binda.edit_field_group', { arg1: @field_group.name }) %>	
+	</p>
+  <a href="<%= structure_path( @structure.slug ) %>" 
+  	class="main-header--back">
+  	<i class="fas fa-list-ul"></i> 
+  	<%= "#{ t :back_to }".capitalize %> 
+  	<%= @structure.name.capitalize %>
+  </a>
 <% end %>
 
 <% content_for :content do %>

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

@@ -0,0 +1,11 @@
+<%= render 'binda/field_groups/form_item/form_item_choice/form_item_choice_header', ff: ff %>
+<div id="field-setting-choices-<%= ff.object.id %>" class="field-setting-choices">
+	<%= render 'binda/field_groups/form_item/form_item_choice/form_item_new_choice', f: f, ff: ff, choice_class: 'field-setting-choices--new-choice' %>
+	<% if ff.object.choices.select{|c| c.persisted?}.empty? %>
+		<%= render 'binda/field_groups/form_item/form_item_choice/form_item_new_choice', f: f, ff: ff, choice_class: 'field-setting-choices--plain-choice' %>
+	<% end %>
+	<%= render 'binda/field_groups/form_item/form_item_choice/form_item_persisted_choices', f: f, ff: ff %>
+</div>
+<div class="clearfix"></div>
+<%= render 'binda/field_groups/form_item/form_item_choice/form_item_default_choice', ff: ff %>
+<%= render 'binda/field_groups/form_item/form_item_choice/form_item_allow_null_choice', ff: ff %>

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

@@ -0,0 +1,14 @@
+<div class="form-item--editor">
+	<div class="form-item--half-size">
+		<%= ff.input :name, as: :string, input_html: { class: "form-item--input" } %>
+	</div>
+	<% if ff.object.new_record? %>
+		<%= render 'binda/field_groups/form_item/form_item_new_editor', ff: ff %>
+	<% else %>
+		<%= render 'binda/field_groups/form_item/form_item_persisted_editor', 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 %>
+	<div class="clearfix"></div>
+</div>

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

@@ -0,0 +1,25 @@
+<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>

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

@@ -0,0 +1,8 @@
+<%= ff.input :slug, as: :hidden, input_html: { class: "form-item--input" } %>
+<div class="form-item--half-size">
+  <% if ff.object.field_type.nil? %>
+    <%= 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' } %>
+  <% else %>
+    <%= ff.input :field_type, as: :string, disabled: true, input_html: { class: "form-item--input" } %>
+  <% end %>
+</div>

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

@@ -0,0 +1,27 @@
+<div class="form-item--half-size">
+	<%= ff.input :slug, as: :string, input_html: { class: "form-item--input" } %>
+</div>
+<div class="form-item--full-size">
+  <% if ff.object.field_type.nil? %>
+    <%= 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' } %>
+  <% else %>
+    <%= ff.input :field_type, as: :string, disabled: true, input_html: { class: "form-item--input" } %>
+  <% 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" } %>
+</div>
+<% if ff.object.field_type == 'relation' %>
+  <div class="form-item--full-size">
+    <%= ff.input :accepted_structure_ids, 
+    		collection: Binda::Structure.all, 
+    		as: :select, 
+    		input_html: { multiple: true, class: 'select2-item' }, 
+    		checked: ff.object.accepted_structures, 
+    		include_blank: false, 
+    		include_hidden: false %>
+  </div>
+<% end %>