binda 0.1.3 → 0.1.4

data/app/views/binda/field_groups/form_item/form_item_choice/_form_item_allow_null_choice.html.erb

@@ -0,0 +1,11 @@
+<% if ff.object.field_type != 'radio' %>
+	<div class="form-item--full-size standard-form--checkbox field-setting-choices--allow-null">
+		<%= ff.input :allow_null, 
+				as: :radio_buttons,
+				label: t('binda.allow_null'),
+				collection: [[t('binda.allow_null_true'), true], [t('binda.allow_null_false'), false]],
+				label_method: -> (x){ "<span class=\"standard-form--input-box\"></span>#{x[0]}".html_safe },
+		    checked: ff.object.allow_null, 
+		    default: true %>
+	</div>
+<% end %>

data/app/views/binda/field_groups/form_item/form_item_choice/_form_item_choice_header.html.erb

@@ -0,0 +1,11 @@
+<div class="field-setting-choices--header field-settings-header">
+	<a href="#" 
+		class="field-setting-choices--toggle-choice field-setting-choices--add-choice" 
+		data-choices-id="field-setting-choices-<%= ff.object.id %>">
+		<i class="fa fa-plus" aria-hidden="true"></i> 
+		<%= t(:add_choice).capitalize %>
+	</a>
+	<p class="control-label">
+		<%= t(:choices).capitalize %>	
+	</p>
+</div>

data/app/views/binda/field_groups/form_item/form_item_choice/_form_item_default_choice.html.erb

@@ -0,0 +1,11 @@
+<% if ff.object.choices.find_all{|c| c.persisted? }.any? && !ff.object.allow_null? %>
+	<div class="form-item--full-size">
+		<%= ff.input :default_choice_id, 
+		    as: :select, collection: ff.object.choices.find_all{|c| c.persisted? }, 
+		    label_method: :label,
+		    include_blank: false, 
+		    selected: ff.object.default_choice_id, 
+		    hint: t(:default_choice_description),
+		    input_html: {class: 'select2-item'} %>
+	</div>
+<% end %>

data/app/views/binda/field_groups/form_item/form_item_choice/_form_item_new_choice.html.erb

@@ -0,0 +1,16 @@
+<%= f.simple_fields_for "new_choices[]", ff.object.choices.build(), defaults: { label: false }  do |fff| %>
+  <div class="field-setting-choices--choice <%= choice_class %>">
+		<%= fff.association :field_setting, as: :hidden %>
+  	<div class="field-setting-choices--choice-label">
+			<%= fff.input :label, placeholder: t('binda.choice_label') %>
+		</div>
+		<div class="field-setting-choices--choice-value">
+			<%= fff.input :value, placeholder: t('binda.choice_value')  %>
+		</div>
+		<a href="#" class="field-setting-choices--toggle-choice field-setting-choices--js-delete-choice">
+			<i class="far fa-trash-alt"></i>
+		</a>
+		<div class="clearfix"></div>
+  </div>
+
+<% end %>

data/app/views/binda/field_groups/form_item/form_item_choice/_form_item_persisted_choices.html.erb

@@ -0,0 +1,16 @@
+<%= ff.simple_fields_for :choices, ff.object.choices.order( :label ), defaults: {label: false} do |fff| %>
+  <div id="field-setting-choices--choice-<%= fff.object.id %>" class="field-setting-choices--choice">
+		<%= fff.input :id, as: :hidden %>
+		<%= fff.association :field_setting, as: :hidden %>
+  	<div class="field-setting-choices--choice-label">
+			<%= fff.input :label, placeholder: t('binda.choice_label') %>
+		</div>
+		<div class="field-setting-choices--choice-value">
+			<%= fff.input :value, placeholder: t('binda.choice_value')  %>
+		</div>
+		<a href="<%= choice_path( fff.object ) %>" class="field-setting-choices--delete-choice">
+			<i class="far fa-trash-alt"></i>
+		</a>
+		<div class="clearfix"></div>
+  </div>
+<% end %>

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

@@ -1,6 +1,18 @@
+<% content_for :title do %>
+	<%= t('binda.new_field_group') %>
+<% end %>
+
+
 <% content_for :header do %>
-	<h3>New Field Group</h3>
-  <a href="<%= structure_path( @structure.slug ) %>" class="main-header--back"><span class="glyphicon glyphicon-list"></span> <%= "#{ t :back_to }".capitalize %> <%= @structure.name.capitalize %></a>
+	<h3>
+		<%= t('binda.new_field_group') %>
+	</h3>
+  <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_settings/_form_body.html.erb

@@ -20,9 +20,7 @@
       <div class="form-section--wide-container row">
         <div class="col-sm-12">
 
-          <h4><%= "#{ t :details } %></h4>
-          
-          <h5><%= "#{ t :title }" %></h5>
+          <h4><%= "#{ t :details }" %></h4>
           <%= f.input :name %>
           
           <% if field_setting.slug.nil? %>

data/app/views/binda/field_settings/edit.html.erb

@@ -1,6 +1,6 @@
 <% content_for :header do %>
 	<h3><%= "#{ t :edit }" %><%= @field_group.name.humanize.split.map(&:capitalize).join(' ') %></h3>
-  <a href="<%= structure_field_group_path( id: @field_group.slug ) %>" class="main-header--back"><span class="glyphicon glyphicon-list"></span> <%= "#{ t :back_to }".capitalize %> <%= @field_group.name.capitalize %></a>
+  <a href="<%= structure_field_group_path( id: @field_group.slug ) %>" class="main-header--back"><i class="fas fa-list-ul"></i> <%= "#{ t :back_to }".capitalize %> <%= @field_group.name.capitalize %></a>
 <% end %>
 		
 <% content_for :content do %> 

data/app/views/binda/field_settings/new.html.erb

@@ -1,6 +1,6 @@
 <% content_for :header do %>
 	<h3><%= "#{ t :new }".capitalize %><%= @field_group.name.humanize.split.map(&:capitalize).join(' ') %></h3>
-  <a href="<%= structure_field_group_path( id: @field_group.slug ) %>" class="main-header--back"><span class="glyphicon glyphicon-list"></span> <%= "#{ t :back_to }".capitalize %> <%= @field_group.name.capitalize %></a>
+  <a href="<%= structure_field_group_path( id: @field_group.slug ) %>" class="main-header--back"><i class="fas fa-list-ul"></i> <%= "#{ t :back_to }".capitalize %> <%= @field_group.name.capitalize %></a>
 <% end %>
 		
 <% content_for :content do %> 

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

@@ -1,90 +1,42 @@
 <%= render 'layouts/binda/popup_warning' %>
-
 <%= simple_form_for [ @instance.structure, @instance ], html: { class: 'form-body', multipart: true } 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 %>
-
-  <%# - - - - - - - - - - - - %>
-  <%# SET POSITION            %>
-  <%# - - - - - - - - - - - - %>
+  <%= render 'layouts/binda/form_errors', f: f %>
   <% unless f.object.new_record? %>
     <%= f.input :position, as: :hidden %>
   <% end %>
-
   <div class="standard-form--body">
-
-    <%# - - - - - - - - - - - - %>
-    <%# NOTICE / ERRORS         %>
-    <%# - - - - - - - - - - - - %>
     <div class="standard-form--container">
-
-        <div class="standard-form--header">
-          <small><%= "#{ t :details }".capitalize %></small>
-        </div>
-
-        <div class="standard-form--fields">
-
-          <%= f.input :name, label: "#{t('binda.title')}".capitalize %>
-
-          <% if f.object.slug.nil? %>
-            <%= f.input :slug, as: :hidden %>
-          <% else %>
-            <%= f.input :slug, disabled: true, hint: "#{ t :slug_disable_hint }" %>
-          <% end %>
-
-          <%= f.input :structure_id, as: :hidden, input_html: { value: @structure.id } %>
-
-        </div>
-
+      <div class="standard-form--header">
+        <small><%= "#{ t :details }".capitalize %></small>
+      </div>
+      <div class="standard-form--fields">
+        <%= f.input :name, label: "#{t('binda.title')}".capitalize %>
+        <% if f.object.slug.nil? %>
+          <%= f.input :slug, as: :hidden %>
+        <% else %>
+          <%= f.input :slug, disabled: true, hint: "#{ t :slug_disable_hint }" %>
+        <% end %>
+        <%= f.input :structure_id, as: :hidden, input_html: { value: @structure.id } %>
+      </div>
     </div>
-
-    <%# - - - - - - - - - - - - %>
-    <%# FIELD GROUP LOOP        %>
-    <%# - - - - - - - - - - - - %>
     <% @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>
-          </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 %>
-
-            <% 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 %>
-            <% end %>
-
+        <div class="standard-form--header">
+          <small><%= field_group.name.capitalize %></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 %>
+          <% 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 %>
           <% end %>
-
+        <% end %>
       </div>
-
     <% end %>
   </div>
-
-  <%# - - - - - - - - - - - - %>
-  <%# SIDEBAR                 %>
-  <%# - - - - - - - - - - - - %>
   <div class="standard-form--container standard-form--sidebar">
-
     <%= render "binda/fieldable/form_sidebar", f: f %>
-
   </div>
-
-<% end %>
+<% end %>

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

@@ -1,16 +1,13 @@
 <div id="standard-form--date-<%= field_setting.id %>"  class="standard-form--date form-item">	
-
 	<%= ff.input :date, 
 				as: :date, 
 				start_year: Date.today.year - 200, 
 				end_year: Date.today.year + 200, 
 				hint: field_setting.description, 
 				label: field_setting.name.capitalize, 
-				input_html: { class: 'select2-item' } %>
-				
+				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 } %>
 	<%= ff.input :fieldable_id, as: :hidden %>
 	<%= ff.input :fieldable_type, as: :hidden %>
-
 </div>

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

@@ -3,12 +3,11 @@
     class="fileupload form-group"
     data-message="<%= t('binda.upload_loading_message') %>"
     data-error="<%= t('binda.upload_error_message')%>">
-
-    <p class="control-label"><%= field_setting.name.capitalize %></p>
-
+    <p class="control-label">
+        <%= field_setting.name.capitalize %>    
+    </p>
     <% image = ff.object.image.thumb.url if ff.object.image.present? %>
     <div class="fileupload--dashboard">
-
       <%= ff.input :image, 
         label: "<i class=\"fa fa-upload\" aria-hidden=\"true\"></i> #{t('binda.choose_file_button')}".html_safe, 
         hint: field_setting.description, 
@@ -23,15 +22,12 @@
             repeater: { id: "#{field_setting.parent_id}" }]),
           'data-id': ff.object.id
         } %>
-
     </div>
-
     <%= ff.input :image_cache, as: :hidden %>
     <%= ff.input :field_setting_id, as: :hidden, input_html: { value: 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 %>
     <div class="clearfix"></div>
-
   </div>
 </div>

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

@@ -1,13 +1,6 @@
-<%# - - - - - - - - - - - - - - %>
-<%# REPEATER NEW FIELDS         %>
-<%# - - - - - - - - - - - - - - %>
 <%= 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">
-
-		<%# - - - - - - - - - - - - %>
-		<%# 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>
@@ -16,10 +9,6 @@
 			<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>
-
-		<%# - - - - - - - - - - - - - - %>
-		<%# FIRST REPEATER              %>
-		<%# - - - - - - - - - - - - - - %>
 		<div class="form-item--repeater-fields">
 			<%= f.simple_fields_for "repeaters_attributes[]", @repeater do |ff| %>
 				<%= ff.input :fieldable_id, as: :hidden %>
@@ -31,8 +20,6 @@
 			  <% end %>
 			<% end %>
 		</div>
-
 	</li>
-
 <!-- SPLIT -->
 <% end %>

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

@@ -1,121 +1,29 @@
 <div id="standard-form--<%= field_setting.field_type %>-<%= field_setting.id %>" class="standard-form--<%= field_setting.field_type %> form-item">	
-		
 		<% if field_setting.choices.any? %>
-
-			<%# - - - - - - - - - - - - %>
-			<%# RADIO                   %>
-			<%# - - - - - - - - - - - - %>
 			<% if field_setting.field_type === 'radio' %>
-				<% current = f.object.find_or_create_a_field_by( field_setting.id, 'radio' ) %>
-				<%= f.simple_fields_for "radios_attributes[]", current do |ff| %>
-					<% if ff.object.choices.any? %>
-						<%= ff.input :choice_ids, 
-									label: field_setting.name.capitalize, 
-									hint: prepare_description_for_form_hint(field_setting), 
-									as: :radio_buttons, 
-									collection: field_setting.choices.order(:label), 
-									label_method: -> (x){ "<span class=\"standard-form--input-box\"></span>#{x[:label]}".html_safe },
-									value_method: :id, 
-									checked: ff.object.choices.first.id, 
-									include_blank: field_setting.allow_null %>
-					<% else %>
-						<%= ff.input :choice_ids,
-									label: field_setting.name.capitalize,
-									hint: prepare_description_for_form_hint(field_setting),
-									as: :radio_buttons,
-									collection: field_setting.choices.order(:label),
-									label_method: -> (x){ "<span class=\"standard-form--input-box\"></span>#{x[:label]}".html_safe },
-									value_method: :id,
-									checked: ( field_setting.default_choice.id unless field_setting.allow_null ),
-									include_blank: field_setting.allow_null %>
-					<% end %>
-					<%= ff.input :field_setting_id, as: :hidden, input_html: { value: 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 %>
-				<% end %>
-
-
-			<%# - - - - - - - - - - - - %>
-			<%# SELECT                  %>
-			<%# - - - - - - - - - - - - %>
+				<%= render 'binda/fieldable/form_item_selections/form_item_radio', f: f, field_setting: field_setting %>
 			<% elsif field_setting.field_type === 'selection' %>
-				<% current = f.object.find_or_create_a_field_by( field_setting.id, 'selection' ) %>
-				<%= f.simple_fields_for "selections_attributes[]", current do |ff| %>
-					<% if ff.object.choices.any? %>
-						<%= ff.input :choice_ids,
-									label: field_setting.name.capitalize,
-									hint: prepare_description_for_form_hint(field_setting),
-									as: :select,
-									collection: field_setting.choices.order(:label),
-									label_method: :label,
-									value_method: :id,
-									selected: ff.object.choices.first.id,
-									include_blank: field_setting.allow_null,
-									input_html: { class: 'select2-item' } %>
-					<% else %>
-						<%= ff.input :choice_ids,
-									label: field_setting.name.capitalize,
-									hint: prepare_description_for_form_hint(field_setting),
-									as: :select,
-									collection: field_setting.choices.order(:label),
-									label_method: :label,
-									value_method: :id,
-									selected: ( field_setting.default_choice.id unless field_setting.allow_null ),
-									include_blank: field_setting.allow_null,
-									input_html: { class: 'select2-item' } %>
-					<% end %>
-					<%= ff.input :field_setting_id, as: :hidden, input_html: { value: 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 %>
-				<% end %>
-
-
-			<%# - - - - - - - - - - - - %>
-			<%# CHECKBOX                %>
-			<%# - - - - - - - - - - - - %>
+				<%= render 'binda/fieldable/form_item_selections/form_item_selection', f: f, field_setting: field_setting %>
 			<% elsif field_setting.field_type === 'checkbox' %>
-				<% current = f.object.find_or_create_a_field_by( field_setting.id, 'checkbox' ) %>
-				<%= f.simple_fields_for "checkboxes_attributes[]", current do |ff| %>
-					<% if ff.object.choices.any? %>
-						<%= ff.input :choice_ids,
-									label: field_setting.name.capitalize,
-									hint: "#{t('binda.null_is_not_allowed')}. #{field_setting.description}",
-									as: :check_boxes,
-									collection: field_setting.choices.order(:label),
-									label_method: -> (x){ "<span class=\"standard-form--input-box\"></span>#{x[:label]}".html_safe },
-									value_method: :id,
-									checked: ff.object.choice_ids,
-									include_blank: field_setting.allow_null,
-									include_hidden: field_setting.allow_null %>
-					<% else %>
-						<%= ff.input :choice_ids,
-									label: field_setting.name.capitalize,
-									hint: "#{t('binda.null_is_not_allowed')}. #{field_setting.description}",
-									as: :check_boxes,
-									collection: field_setting.choices.order(:label),
-									label_method: -> (x){ "<span class=\"standard-form--input-box\"></span>#{x[:label]}".html_safe },
-									value_method: :id,
-									checked: ( field_setting.default_choice.id unless field_setting.allow_null ),
-									include_blank: field_setting.allow_null,
-									include_hidden: field_setting.allow_null %>
-					<% end %>
-					<%= ff.input :field_setting_id, as: :hidden, input_html: { value: 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 %>
-				<% end %>
+				<%= render 'binda/fieldable/form_item_selections/form_item_checkbox', f: f, field_setting: field_setting %>
 			<% end %>
-
 		<% else %>
-			<p class="form-group">Sorry, no choice is available. 
-				<% if current_user.is_superadmin %> 
-					Please ensure you setup at least two possible choices in the <a href="<%= edit_structure_field_group_path( structure_id: @structure.id, id: field_setting.field_group.id )%>">field group setup</a>.
-				<% else %>
-					Please contact the administrator.
-				<% end %>
-			</p>
+			<div class="form-group">
+		    <p class="control-label">
+	        <%= field_setting.name.capitalize %>    
+		    </p>
+		    <p>
+					<%= t('binda.no_available_choice') %>
+					<% if current_user.is_superadmin %> 
+						<%= t('binda.no_available_choice_superadmin_hint') %>
+						<a href="<%= edit_structure_field_group_path( structure_id: @structure.id, id: field_setting.field_group.id )%>">
+							<%= field_setting.field_group.name %>
+							<%= t('binda.field_group.singular').downcase %>
+						</a>
+					<% else %>
+						<%= t('binda.no_available_choice_user_hint') %>
+					<% end %>
+				</p>
+			</div>
 		<% end %>
-
 </div>