binda 0.0.7 → 0.1.0

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

@@ -1,71 +1,92 @@
-<div class="row">
-<div class="form-body--container col-sm-12">
+<div class="standard-form">
 
-<%= simple_form_for @field_group, url: get_form_field_group_url, defaults: { label: false }, html: { class: 'form-body' } do |f| %>
-
-  <% if @field_group.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize( @field_group.errors.count, "error") %> prohibited this field_group from being saved:</h2>
+<%= 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">
+      <div class="alert alert-error">
+        <%= t('binda.standard_form_error_heading') %> <%= pluralize(f.object.errors.count, t("binda.standard_form_error")) %>.
+      </div>
       <ul>
-      <% @field_group.errors.full_messages.each do |message| %>
-        <li><%= message %></li>
-      <% end %>
+        <% f.object.errors.full_messages.each do |msg| %>
+          <li><%= msg %></li>
+        <% end %>
       </ul>
     </div>
   <% end %>
 
-  <div class="row">
-    <div class="col-sm-8">
-      <div class="form-section--wide-container row">
-        <div class="col-sm-12">
-
-          <h4><%= "#{ t :details }".capitalize %></h4>
-          
-          <h5><%= "#{ t :title }".capitalize %></h5>
-          <%= f.input :name %>
-          
-          <% if @field_group.slug.nil? %>
-            <%= f.input :slug, as: :hidden %>
-          <% else %>
-            <h5><%= "#{ t :slug }".capitalize %></h5>
-            <%= f.input :slug, disabled: true, hint: "#{ t :slug_disable_hint }" %>
-          <% end %>
+  <div class="standard-form--body">
 
-        </div>
+    <div class="standard-form--container">
+
+      <div class="standard-form--header">
+        <p><%= "#{ t :details }" %></p>
       </div>
-      <div class="form-section--wide-container row">
-        <div class="col-sm-12 form-section">
 
-          <%= render "form_section", f: f %>
+      <%= 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">
         
+        <div class="standard-form--header">
+          <p><%= "#{ t 'binda.field_settings' }".pluralize %></p>
         </div>
+        
+        <%= render "form_section", f: f %>
+
       </div>
+
       <% @field_group.field_settings.where( field_type: 'repeater' ).order( :position, :id ).each do |repeater| %>
-        <div class="form-section--wide-container row">
-          <div class="col-sm-12 form-section">
-          
-            <h4><%= repeater.name.capitalize %></h4>
+        <div id="form-section--repeater-<%= repeater.id %>" class="form-section--wide-container">
+          <div class="form-section">
+
+            <div class="standard-form--header field-settings-header">
+              <p><%= "#{ t('binda.repeater_field_settings', arg1: repeater.name ) }" %></p>
+            </div>
 
             <%= render "form_section_repeater", f: f, repeater: repeater %>
 
           </div>
         </div>
       <% end %>
+
     </div>
-    <div class="col-sm-4">
-      <div class="form-section--narrow-container row">
-        <div class="col-sm-12">
-          <div class="form-actions">
-            
-            <h4><%= "#{ t :setting }".pluralize.capitalize %></h4>
-            <%= f.button :submit, 'Save changes', class: 'btn btn-primary' %>
 
-          </div>
-        </div>
+  </div>
+
+  <div class="standard-form--sidebar">
+
+    <div class="standard-form--container">
+
+      <div class="standard-form--header">
+        <p><%= "#{ t :setting }".pluralize %></p>
       </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
+        } %>
+      </div>
+
     </div>
+
+  </div>
+
 <% end %>
 
-</div>
 </div>

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

@@ -6,14 +6,31 @@
 <%# REMOVE BUTTON           %>
 <%# - - - - - - - - - - - - %>
 <% if ff.object.slug.nil? %>
-	<a class="form-item--remove-item-with-js" data-confirm="This operation will delete this setting and all related component content. Are you ok with that?"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
+	<a class="form-item--remove-item-with-js"
+     data-confirm="This operation will delete this setting and all related component content. Are you ok with that?">
+
+    <span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
 <% else %>
-	<a href="<%= structure_field_group_field_setting_path( @structure, @field_group, ff.object ) %>" data-method="delete" data-confirm="This operation will delete this setting and all related component content. Are you ok with that?"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
-	<a class="form-item--close-button"><span class="glyphicon glyphicon-chevron-up" aria-hidden="true"></span></a>
-	<a class="form-item--open-button"><span class="glyphicon glyphicon-chevron-down" aria-hidden="true"></span></a>
-	<div class="form-item--label">
-		<h4><%= ff.object.name %></h4>
-	</div>
+
+  <div class="standard-form--container field-settings-container">
+
+    <div class="standard-form--secondary-header field-settings-header">
+      <p><%= ff.object.name %> (<%= ff.object.field_type.humanize.capitalize %>)</p>
+
+      <a class="form-item--toggle-button form-item--toggle-button-closed">
+
+        <span class="glyphicon glyphicon-chevron-up" aria-hidden="true"></span></a>
+
+
+      <%= link_to "<i class=\"far fa-trash-alt\"></i>".html_safe,
+                  structure_field_group_field_setting_path( @structure, @field_group, ff.object ),
+                  method: :delete,
+                  data: { confirm: 'Are you sure?' },
+                  class: 'text-destroy' %>
+    </div>
+
+  </div>
+
 <% end %>
 
 <div class="form-item--editor">
@@ -22,23 +39,11 @@
 	<%# NAME                    %>
 	<%# - - - - - - - - - - - - %>
 	<div class="form-item--half-size">
-		<h5><%= t(:name).capitalize %></h5>
+
 		<%= ff.input :name, as: :string, input_html: { class: "form-item--input" } %>
 	</div>
 
 
-	<%# - - - - - - - - - - - - %>
-	<%# FIELD TYPE              %>
-	<%# - - - - - - - - - - - - %>
-	<div class="form-item--half-size">
-		<h5><%= t(:field_type).capitalize %></h5>
-		<% 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>
-
 	<% if ff.object.new_record? %>
 
 		<%# - - - - - - - - - - - - %>
@@ -48,21 +53,43 @@
 			<%= ff.input :slug, as: :hidden, 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>
+
 	<% else %>
 
 		<%# - - - - - - - - - - - - %>
 		<%# SLUG                    %>
 		<%# - - - - - - - - - - - - %>
 		<div class="form-item--half-size">
-			<h5><%= t(:slug).capitalize %></h5>
 			<%= 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">
-			<h5><%= t(:description).capitalize %></h5>
 			<%= ff.input :description, input_html: { class: "form-item--input" } %>
 		</div>
 
@@ -70,10 +97,25 @@
 		<%# POSITION                %>
 		<%# - - - - - - - - - - - - %>
 		<div class="form-item--full-size">
-			<h5><%= t(:position).capitalize %></h5>
 			<%= 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 %>
 
@@ -88,3 +130,4 @@
 	<div class="clearfix"></div>
 
 </div>
+

data/app/views/binda/field_groups/_form_item_choice.erb

@@ -1,20 +1,22 @@
 <%# - - - - - - - - - - - - %>
 <%# CHOICES                 %>
 <%# - - - - - - - - - - - - %>
-<h5><%= t(:choices).capitalize %></h5>
+<div class="standard-form--header field-settings-header">
+  <p><%= t(:choices).capitalize %></p>
+</div>
 
 <div class="form-item--choices">
 
 	<%= ff.simple_fields_for :choices, ff.object.choices.order( :label ) do |fff| %>
-	  <div class="form-item--choice">
+	  <div id="form-item--choice-<%= fff.object.id %>" class="form-item--choice">
 			<%= fff.input :id, as: :hidden %>
 			<%= fff.association :field_setting, as: :hidden %>
 	  	<div class="form-item--choice-label">
-				<small class="text-muted"><%= t(:choice_label).capitalize %></small>
+
 				<%= fff.input :label %>
 			</div>
-			<div class="form-item--choice-content">
-				<small class="text-muted"><%= t(:choice_value).capitalize %></small>
+			<div class="form-item--choice-value">
+
 				<%= fff.input :value %>
 			</div>
 			<a href="<%= choice_path( fff.object ) %>" class="form-item--delete-choice">
@@ -32,11 +34,11 @@
 		  <div class="form-item--choice">
 				<%= fff.association :field_setting, as: :hidden %>
 		  	<div class="form-item--choice-label">
-					<small class="text-muted"><%= t(:choice_label).capitalize %></small>
+
 					<%= fff.input :label %>
 				</div>
-				<div class="form-item--choice-content">
-					<small class="text-muted"><%= t(:choice_value).capitalize %></small>
+				<div class="form-item--choice-value">
+
 					<%= fff.input :value %>
 				</div>
 				<a href="#" class="form-item--toggle-choice form-item--js-delete-choice">
@@ -54,11 +56,11 @@
 	  <div class="form-item--choice form-item--new-choice">
 			<%= fff.association :field_setting, as: :hidden %>
 	  	<div class="form-item--choice-label">
-				<small class="text-muted"><%= t(:choice_label).capitalize %></small>
+
 				<%= fff.input :label %>
 			</div>
-			<div class="form-item--choice-content">
-				<small class="text-muted"><%= t(:choice_value).capitalize %></small>
+			<div class="form-item--choice-value">
+
 				<%= fff.input :value %>
 			</div>
 			<a href="#" class="form-item--toggle-choice form-item--js-delete-choice">
@@ -81,9 +83,19 @@
 <%# DEFAULT CHOICE          %>
 <%# - - - - - - - - - - - - %>
 <% if ff.object.choices.find_all{|c| c.persisted? }.any? %>
-	<div class="form-item--half-size">
-		<h5><%= t(:default_choice).capitalize %></h5>
-		<%= 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).capitalize %>
+	<div class="form-item--full-size">
+
+    <div class="standard-form--header field-settings-header">
+		  <p><%= t(:default_choice).capitalize %></p>
+    </div>
+
+		<%= 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).capitalize,
+		    class: 'select2-item' %>
 	</div>
 <% end %>
 
@@ -94,6 +106,13 @@
 	<%# - - - - - - - - - - - - %>
 	<div class="form-item--half-size">
 		<h5><%= t(:allow_null).capitalize %></h5>
-		<%= ff.input :allow_null, as: :boolean, boolean_style: :inline, input_html: { class: "form-item--input" }, checked_value: true, unchecked_value: false, selected: ff.object.allow_null, default: false %>
+		<%= ff.input :allow_null, 
+		    as: :boolean, 
+		    boolean_style: :inline, 
+		    input_html: { class: "form-item--input" }, 
+		    checked_value: true, 
+		    unchecked_value: false, 
+		    selected: ff.object.allow_null, 
+		    default: false %>
 	</div>
 <% end %>

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

@@ -1,13 +1,10 @@
-<h4><%= "#{ t :field_setting }".pluralize.capitalize %></h4>
-
-
 <%# - - - - - - - - - - - - %>
 <%# 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 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 %>
@@ -17,21 +14,20 @@
 <%# NEW FORM ITEM           %>
 <%# - - - - - - - - - - - - %>
 <%= f.simple_fields_for 'new_field_settings[]', @field_group.field_settings.build( field_group: @field_group ) do |ff| %>
-  <div id="new-child-<%= f.object.id %>" 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? %>
-  <h5>
+  <p>
     <%= t( :hint_create_parent_before_child, arg1: "#{ t :field_group }", arg2: "#{ t :field_setting }" ).capitalize %>  
-  </h5>
+  </p>
 <% else %>
-  <a class="form-item--add-new main-header--link btn btn-default" href="<%= new_structure_field_group_field_setting_path( field_group_id: @field_group.slug ) %>" data-new-child-id="new-child-<%= f.object.id %>">
-    <%= "#{ t :new }".capitalize %> <%= 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(:new).capitalize }".html_safe %> <%= t :field_setting %>
   </a>
 <% end %>

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

@@ -2,7 +2,7 @@
 <%# FORM ITEMS              %>
 <%# - - - - - - - - - - - - %>
 <%= f.simple_fields_for :field_settings, repeater.children.order( :position, :name ) do |ff| %>
-	<div 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 %>
@@ -11,7 +11,7 @@
 <%# NEW FORM ITEM           %>
 <%# - - - - - - - - - - - - %>
 <%= f.simple_fields_for 'new_field_settings[]', repeater.children.build( field_group: @field_group ) do |ff| %>
-  <div id="new-child--repeater-<%= repeater.id %>" class="form-item form-item--new">
+  <div id="repeater-<%= repeater.id %>--new-form-item" class="form-item form-item--new">
     <%= render 'form_item', f: f, ff: ff %>
   </div>
 <% end %>
@@ -20,6 +20,6 @@
 <%# - - - - - - - - - - - - - - %>
 <%# ADD NEW FIELD TO REPEATER   %>
 <%# - - - - - - - - - - - - - - %>
-<a class="form-item--add-new main-header--link btn btn-default" data-new-child-id="new-child--repeater-<%= repeater.id %>">
+<a id="form-item--repeater-<%= repeater.id %>--add-new" class="form-item--add-new main-header--link btn btn-default" data-new-form-item-id="repeater-<%= repeater.id %>--new-form-item" href="#">
   <%= t :new_item_in_repeater, arg1: repeater.name.capitalize %>
 </a>

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

@@ -1,5 +1,5 @@
 <% content_for :header do %>
-  <h3>Editing Field Group</h3>
+  <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>
 <% end %>
 

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

@@ -20,19 +20,19 @@
       <div class="form-section--wide-container row">
         <div class="col-sm-12">
 
-          <h4><%= "#{ t :details }".capitalize %></h4>
+          <h4><%= "#{ t :details } %></h4>
           
-          <h5><%= "#{ t :title }".capitalize %></h5>
+          <h5><%= "#{ t :title }" %></h5>
           <%= f.input :name %>
           
           <% if field_setting.slug.nil? %>
             <%= f.input :slug, as: :hidden %>
           <% else %>
-            <h5><%= "#{ t :slug }".capitalize %></h5>
+            <h5><%= "#{ t :slug }" %></h5>
             <%= f.input :slug, disabled: true, hint: "#{ t :slug_disable_hint }" %>
           <% end %>
 
-          <h5><%= "#{ t :field_type }".capitalize %></h5>
+          <h5><%= "#{ t :field_type }" %></h5>
           <% if field_setting.field_type.nil? %>
             <%= f.input :field_type, as: :select, collection: get_field_types, include_blank: false %>
           <% else %>
@@ -48,7 +48,7 @@
       <div class="form-section--narrow-container row">
         <div class="col-sm-12">
           <div class="form-actions">
-            <h4><%= "#{ t :setting }".pluralize.capitalize %></h4>
+            <h4><%= "#{ t :setting }".pluralize %></h4>
             <%= f.button :submit, 'Save changes', class: 'btn btn-primary' %>
           </div>
         </div>