binda 0.1.3 → 0.1.4

data/app/views/binda/fieldable/form_item_selections/_form_item_checkbox.html.erb

@@ -0,0 +1,34 @@
+<% 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: prepare_description_for_selections_form_hint(field_setting),
+					as: :check_boxes,
+					collection: field_setting.choices.order(:label),
+					label_method: -> (field_setting) { 
+						"<span class=\"standard-form--input-box\"></span>#{field_setting[: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: prepare_description_for_selections_form_hint(field_setting),
+					as: :check_boxes,
+					collection: field_setting.choices.order(:label),
+					label_method: -> (field_setting){ 
+						"<span class=\"standard-form--input-box\"></span>#{field_setting[:label]}".html_safe 
+					},
+					value_method: :id,
+					checked: ( field_setting.default_choice.id if !field_setting.allow_null && !field_setting.default_choice_id.nil?),
+					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 %>

data/app/views/binda/fieldable/form_item_selections/_form_item_radio.html.erb

@@ -0,0 +1,28 @@
+<% 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_selections_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_selections_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.default_choice_id.nil? ),
+					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 %>

data/app/views/binda/fieldable/form_item_selections/_form_item_selection.html.erb

@@ -0,0 +1,30 @@
+<% 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_selections_form_hint(field_setting),
+					as: :select,
+					collection: field_setting.choices.order(:label),
+					label_method: :label,
+					value_method: :id,
+					selected: ff.object.choices.ids,
+					include_blank: field_setting.allow_null ? '.' : false,
+					input_html: { class: "select2-item #{ "select2-item-include-blank" if field_setting.allow_null }"  } %>
+	<% else %>
+		<%= ff.input :choice_ids,
+					label: field_setting.name.capitalize,
+					hint: prepare_description_for_selections_form_hint(field_setting),
+					as: :select,
+					collection: field_setting.choices.order(:label),
+					label_method: :label,
+					value_method: :id,
+					selected: ( field_setting.default_choice.id if !field_setting.allow_null && !field_setting.default_choice_id.nil?),
+					include_blank: field_setting.allow_null ? '.' : false,
+					input_html: { class: "select2-item #{ "select2-item-include-blank" if 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 %>

data/app/views/binda/manage/users/_form_body.html.erb

@@ -1,61 +1,31 @@
 <div class="standard-form">
-
 <%= simple_form_for manage_user, url: get_form_manage_user_url 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 %>
-
+  <%= render 'layouts/binda/form_errors', f: f %>
   <div class="standard-form--body">
-
     <div class="standard-form--container">
-
       <div class="standard-form--header">
         <small>Edit User Details</small>
       </div>
-
       <%= f.input :email, label: "Email" %>
-
       <%= f.input :password, label: "Password" %>
-
       <%= f.input :password_confirmation, label: "Password confirmation" %>
-
-
       <% if !current_user.is_superadmin %>
         <h5>Administrator priviledges</h5>
         <%= f.input :is_superadmin, label: false, as: :radio_buttons %>
       <% end %>
-
     </div>
-
   </div>
-
   <div class="standard-form--sidebar">
-
     <div class="standard-form--header">
       <small><%= "#{ t :setting }".pluralize.capitalize %></small>
     </div>
-
     <div class="standard-form--container">
-
       <div class="standard-form--main-actions">
         <%= button_tag "<i class=\"fas fa-check\"></i>Save changes".html_safe, { class: 'b-btn b-btn-primary', id: 'save' } %>
       </div>
-
     </div>
-
   </div>
-
 <% end %>
-
 </div>
 

data/app/views/binda/manage/users/edit.html.erb

@@ -1,8 +1,18 @@
+<% content_for :title do %>
+	<%= t('binda.edit_user') %>
+<% end %>
+
 <% content_for :header do %>
-	<p class="main-header--title"><%= t('binda.edit_user') %></p>
-  <a href="<%= manage_users_path %>" class="main-header--back"><span class="glyphicon glyphicon-list"></span> Back to list</a>
+	<p class="main-header--title">
+		<%= t('binda.edit_user') %>
+	</p>
+  <a href="<%= manage_users_path %>" class="main-header--back">
+  	<i class="fas fa-list-ul"></i> 
+  	<%= "#{ t :back_to_index }".capitalize %>
+  </a>
 <% end %>
 
+
 <% content_for :content do %>
 	<%= render 'form_body', manage_user: @user %>
 <% end %>

data/app/views/binda/manage/users/index.html.erb

@@ -1,38 +1,55 @@
+<% content_for :title do %>
+  <%= t('binda.manage_users') %>
+<% end %>
+
+
 <% content_for :header do %>
-  <div class="main-header--buttons">
-    <%= link_to "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> New User".html_safe, new_manage_user_path, class: 'main-header--link b-btn b-btn-primary' %>
+  <div class="main-header--buttons" class="main-header--link b-btn b-btn-primary">
+    <a href="<%= new_manage_user_path %>"
+      class="main-header--link b-btn b-btn-primary">
+      <i class="fa fa-plus" aria-hidden="true"></i>
+      <%= t('binda.new') %> <%= t('binda.user') %>
+    </a>
   </div>
-  <h3>Manage Users</h3>
+  <h3>
+    <%= t('binda.manage_users') %>
+  </h3>
 <% end %>
 
+
 <% content_for :content do %>
   <div class="main-table--container">
-
     <table class="standard-form--container">
       <thead class="standard-form--header">
         <tr>
-          <th style="width: 70%;">Email</th>
-          <th style="width: 30%;"></th>
+          <th colspan="7">Email</th>
+          <th colspan="3"></th>
         </tr>
       </thead>
       <tbody>
-
         <% @users.order( :email ).each.with_index(1) do |manage_user, index| %>
-
           <tr>
-            <td><%= manage_user.email %></td>
-            <td class="main-table--actions">
-              <%= link_to "<i class=\"fas fa-pencil-alt\"></i> Edit".html_safe, edit_manage_user_path( manage_user.id ) %>
-              <%= link_to "<i class=\"far fa-trash-alt\"></i> Destroy".html_safe, manage_user_path( manage_user.id ), method: :delete, data: { confirm: 'Are you sure?' }, class: 'text-destroy'  %></td>
+            <td colspan="7"><%= manage_user.email %></td>
+            <td colspan="3" class="main-table--actions">
+              <a href="<%= edit_manage_user_path( manage_user.id ) %>">
+                <i class="fas fa-pencil-alt"></i>
+                <%= t('binda.edit') %>
+              </a>
+              <a href="<%= manage_user_path( manage_user.id ) %>"
+                class="text-destroy" 
+                data-method="delete"
+                data-confirm="<%= t('binda.confirm_delete') %>">
+                <i class="far fa-trash-alt"></i>
+                <%= t('binda.delete') %>
+              </a>
           </tr>
-
         <% end %>
-
       </tbody>
     </table>
-
-    <%= link_to "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> New User".html_safe, new_manage_user_path, class: 'main-header--link b-btn b-btn-primary' %>
-
+    <a href="<%= new_manage_user_path %>"
+      class="main-header--link b-btn b-btn-primary">
+      <i class="fa fa-plus" aria-hidden="true"></i>
+      <%= t('binda.new') %> <%= t('binda.user') %>
+    </a>
   </div>
-
-<% end %>
+<% end %>

data/app/views/binda/manage/users/new.html.erb

@@ -1,8 +1,19 @@
+<% content_for :title do %>
+  <%= t('binda.new') %> <%= t('binda.user') %>
+<% end %>
+
+
 <% content_for :header do %>
-	<h3>New User</h3>
-  <a href="<%= manage_users_path %>" class="main-header--back"><span class="glyphicon glyphicon-list"></span> Back to list</a>
+	<h3>
+    <%= t('binda.new') %> <%= t('binda.user') %>
+	</h3>
+  <a href="<%= manage_users_path %>" class="main-header--back">
+  	<i class="fas fa-list-ul"></i> 
+  	<%= "#{ t :back_to_index }".capitalize %>
+  </a>
 <% end %>
-	
+
+
 <% content_for :content do %>
 	<%= render 'form_body', manage_user: @user %>
 <% end %>

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

@@ -1,54 +1,31 @@
 <div class="standard-form">
-
 <%= simple_form_for structure, 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 %>
-
+  <%= render 'layouts/binda/form_errors', f: f %>
   <div class="standard-form--body">
-
     <div class="standard-form--container">
-
       <div class="standard-form--header">
         <small><%= "#{ t :details }".capitalize %></small>
       </div>
-
       <div class="standard-form--fields">
-
-        <%= f.input :name, hint: t(:title_hint), label: "#{t('binda.title')}".capitalize  %>
-
+        <%= f.input :name, hint: t(:title_hint)  %>
         <% if structure.slug.nil? %>
           <%= f.input :slug, as: :hidden %>
         <% else %>
           <%= f.input :slug %>
         <% end %>
       </div>
-
     </div>
-
     <div class="standard-form--container">
       <div class="form-section">
         <%= render "form_section", section: structure, f: f %>
       </div>
     </div>
-
   </div>
-
   <div class="standard-form--sidebar">
     <div class="standard-form--container">
         <%= render "form_sidebar", section: structure, f: f %>
     </div>
   </div>
-
 <% end %>
-
 </div>

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

@@ -1,80 +1,58 @@
 <div class="standard-form--header">
-  <small><%= "#{ t :field_group }".pluralize %></small>
+  <small>
+  	<%= "#{ t :field_group }".pluralize %>
+  </small>
 </div>
-
-<%# - - - - - - - - - - - - %>
-<%# FORM ITEM               %>
-<%# - - - - - - - - - - - - %>
 <%= f.simple_fields_for :field_groups, f.object.field_groups.order( :position, :name ) do |ff| %>
-
   <div id="form-item-<%= ff.object.id %>" class="form-item">
-
 		<%= ff.input :structure_id, as: :hidden %>
 		<%= ff.input :id, as: :hidden %>
-
-
-		<%# - - - - - - - - - - - - %>
-		<%# EDIT/REMOVE BUTTONS     %>
-		<%# - - - - - - - - - - - - %>
 		<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 %>
+					<i class="far fa-trash-alt"></i> 
+					<%= t('binda.delete').capitalize %>
 			  </a>
-			  <p><%= t('binda.new_item_in_repeater', { arg1: '' })%></p>
+			  <p>
+			  	<%= t('binda.new_item_in_repeater', { arg1: '' })%>		
+			  </p>
 			<% else %>
-	      <%= link_to "<i class=\"fas fa-pencil-alt\"></i> #{ t('binda.edit')}".html_safe,
-                    structure_field_group_path( @structure.slug, ff.object.slug ),
-	                  class: 'form-item--edit-item' %>
-
-	      <%= link_to "<i class=\"far fa-trash-alt\"></i> #{t('binda.delete').capitalize}".html_safe,
-	                  structure_field_group_path( @structure.slug, ff.object.slug ),
-	                  method: :delete,
-	                  data: { confirm: t('binda.confirm_delete') },
-	                  class: 'form-item--delete-repeater-item' %>
-
+				<a href="<%= structure_field_group_path( @structure.slug, ff.object.slug ) %>"
+					class="form-item--edit-item">
+					<i class="fas fa-pencil-alt"></i>
+					<%= t('binda.edit') %>
+				</a>
+				<a href="<%= structure_field_group_path( @structure.slug, ff.object.slug ) %>"
+					class="form-item--delete-repeater-item"
+					data-confirm="<%= t('binda.confirm_delete') %>"
+					data-method="delete">
+					<i class="far fa-trash-alt"></i> 
+					<%= t('binda.delete').capitalize %>
+				</a>
 	      <p><%= ff.object.name %></p>
 			<% end %>
 	  </div>
-
-		<%# - - - - - - - - - - - - %>
-		<%# NAME                    %>
-		<%# - - - - - - - - - - - - %>
-		<%= ff.input :name, label: "#{ t :name }".capitalize, wrapper_html: { class: "form-item--half-size" }  %>
-
-
-		<%# - - - - - - - - - - - - %>
-		<%# SLUG                    %>
-		<%# - - - - - - - - - - - - %>
-    <%= ff.input :slug, wrapper_html: { class: "form-item--half-size" } %>
-
+		<%= ff.input :name, 
+			label: "#{ t :name }".capitalize, 
+			wrapper_html: { class: "form-item--half-size" }  
+		%>
+    <%= ff.input :slug, 
+    	wrapper_html: { class: "form-item--half-size" } 
+    %>
 	</div>
-
 <% end %>
-
-
-<%# - - - - - - - - - - - - %>
-<%# FORM NEW ITEM           %>
-<%# - - - - - - - - - - - - %>
 <%= f.simple_fields_for 'new_field_groups[]', @structure.field_groups.build() do |ff| %>
   <div id="field-group-<%= f.object.id %>--new-form-item" class="form-item form-item--new">
-
-		<%# - - - - - - - - - - - - %>
-		<%# EDIT/REMOVE BUTTONS     %>
-		<%# - - - - - - - - - - - - %>
 		<div class="standard-form--secondary-header form-item--header form-item--repeater-header">
-			<%# - - - - - - - - - - - - %>
-			<%# BUTTONS                 %>
-			<%# - - - - - - - - - - - - %>
 			<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 %>
+		     data-confirm="<%= t('binda.structure.confirm_delete') %>">
+				<i class="far fa-trash-alt"></i> 
+				<%= t('binda.delete').capitalize %>
 		  </a>
-		  <p><%= t('binda.new_item_in_repeater', { arg1: '' })%></p>
+		  <p>
+		  	<%= t('binda.new_item_in_repeater', { arg1: '' })%>
+	  	</p>
 	  </div>
 		<div class="form-item--editor">
 			<%= ff.input :structure_id, as: :hidden %>
@@ -82,21 +60,21 @@
 			<%= ff.input :name, label: "#{ t :name }".capitalize, wrapper_html: { class: "form-item--half-size" } %>
       <%= ff.input :slug, wrapper_html: { class: "form-item--half-size" } %>
 		</div>
-
 	</div>
 <% end %>
-
-
-<%# - - - - - - - - - - - - - - %>
-<%# 'ADD NEW FORM ITEM' BUTTON  %>
-<%# - - - - - - - - - - - - - - %>
 <% if section.slug.nil? %>
-  <p class="standard-form--suggestion"><%= t( :hint_create_parent_before_child, arg1: "#{ t :structure }", arg2: "#{ t :field_group }" ).capitalize %></p>
+  <p class="standard-form--suggestion">
+  	<%= t( :hint_create_parent_before_child, arg1: "#{ t :structure }", arg2: "#{ t :field_group }" ).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_path( @structure.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_group %>	
+	  <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_path( @structure.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') %>
+    	<%= t('binda.field_group.singular') %>	
 	  </a>
 	</div>
-	  
 <% end %>