binda 0.1.3 → 0.1.4

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

@@ -1,15 +1,23 @@
 <div class="standard-form--header">
-  <small><%= "#{ t :publish }".capitalize %></small>
+  <small>
+    <%= "#{ t :publish }".capitalize %>  
+  </small>
 </div>
-
 <div class="standard-form--radio">
   <%= f.input :instance_type,
             as: :radio_buttons,
             collection: ['component','board'],
             include_blank: false,
             label_method: -> (x){ "<span class=\"standard-form--input-box\"></span>#{x}".html_safe }%>
-
 </div>
+<div class="standard-form--radio">
+  <%= f.input :has_preview,
+              label: "<span class=\"standard-form--input-box\"></span>#{ t('binda.has_preview')}".html_safe,
+              as: :boolean,
+              include_blank: false,
+              hint: "#{t('binda.preview_path_warning')}:<br /> #{binda.root_path}#{@structure.slug}/:slug".html_safe %>
+</div>
+
 <% if !@structure.new_record? && @structure.instance_type == 'component' %>
   <div class="standard-form--radio">
     <%= f.input :has_categories,
@@ -18,18 +26,17 @@
                 include_blank: false,
                 hint: t('binda.has_categories_hint') %>
   </div>
-  <div class="standard-form--radio">
-    <%= f.input :has_preview,
-                label: "<span class=\"standard-form--input-box\"></span>#{ t('binda.has_preview')}".html_safe,
-                as: :boolean,
-                include_blank: false,
-                hint: "#{t('binda.preview_path_warning')}:<br /> #{binda.root_path}#{@structure.slug}/:slug".html_safe %>
-  </div>
 <% end %>
 <div class="standard-form--main-actions">
   <%= button_tag '<i class="fas fa-check"></i>Save changes'.html_safe, { class: 'b-btn-block b-btn b-btn-primary b-btn-settings', id: 'save' } %>
-
   <% unless @structure.new_record? %>
-    <a class="form-body--delete b-btn-block b-btn b-btn-outline-danger b-btn-settings" href="<%= url_for([@structure]) %>" data-method="delete" data-confirm="This operation will delete this structure and there is no coming back. Are you ok with that?"><i class="far fa-trash-alt"></i> <%= t('binda.delete').capitalize %> <%= @structure.name.capitalize %></a>
+    <a class="form-body--delete b-btn-block b-btn b-btn-outline-danger b-btn-settings" 
+      href="<%= url_for([@structure]) %>" 
+      data-method="delete"
+      data-confirm="<%= t('binda.structure.confirm_delete') %>">
+      <i class="far fa-trash-alt"></i>
+      <%= t('binda.delete').capitalize %> 
+      <%= @structure.name.capitalize %>
+    </a>
   <% end %>
 </div>

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

@@ -1,11 +1,28 @@
+<% content_for :title do %>
+  <%= t('binda.edit_structure', { arg1: @structure.name })%>  
+<% end %>
+
+
 <% content_for :header do %>
   <div class="main-header--buttons">
-    <%= link_to "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> New Structure".html_safe, new_structure_path, class: 'main-header--link b-btn b-btn-primary' %>
+  	<a href="<%= new_structure_path %>"
+  		class="main-header--link b-btn b-btn-primary"
+      test-hook="new-structure-btn">
+  		<i class="fa fa-plus" aria-hidden="true"></i>
+  		<%= t('binda.new_structure') %>
+  	</a>
   </div>
-	<p class="main-header--title"><%= t('binda.edit_structure', { arg1: @structure.name })%></p>
-  <a href="<%= structures_path %>" class="main-header--back"><span class="glyphicon glyphicon-list"></span> Back to list</a>
+	<p class="main-header--title">
+		<%= t('binda.edit_structure', { arg1: @structure.name })%>	
+	</p>
+  <a href="<%= structures_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', structure: @structure %>
 <% end %>

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

@@ -1,41 +1,61 @@
+<% content_for :title do %>
+  <%= t('binda.structure.plural') %>
+<% end %>
+
+
 <% content_for :header do %>
   <div class="main-header--buttons">
-    <%= link_to "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> New Structure".html_safe, new_structure_path, class: 'main-header--link b-btn b-btn-primary' %>
+    <a href="<%= new_structure_path %>"
+      class="main-header--link b-btn b-btn-primary">
+      <i class="fa fa-plus" aria-hidden="true"></i>
+      <%= t('binda.new_structure') %>
+    </a>
     <%= get_structures_sort_index_link %>
   </div>
-  <p class="main-header--title">Structures</p>
+  <p class="main-header--title">
+    <%= t('binda.structure.plural') %>
+  </p>
 <% end %>
 
+
 <% content_for :content do %>
   <div class="main-table--container">
+    <table class="standard-form--container">
+      <thead class="standard-form--header">
+        <tr>
+          <th colspan="7"><%= t('binda.structure.plural') %></th>
+          <th colspan="3"></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @structures.order( :name ).each do |structure| %>
+          <tr class="main-table--hover" id="structure_<%= structure.id %>">
 
-      <table class="standard-form--container">
-        <thead class="standard-form--header">
-          <tr>
-            <th>Structures</th>
-            <th style="width: 30%"></th>
+            <td colspan="7"><%= link_to structure.name, structure_path(structure) %></td>
+            <td colspan="3" class="main-table--actions">
+              <a href="<%= edit_structure_path(structure) %>">
+                <i class="fas fa-pencil-alt"></i>
+                <%= t('binda.edit') %>
+              </a>
+              <a href="<%= structure_path(structure) %>"
+                class="text-destroy"
+                data-method="delete"
+                data-confirm="<%= t('binda.structure.confirm_delete') %>">
+                <i class="far fa-trash-alt"></i>
+                <%= t('binda.delete') %>
+              </a>
+            </td>
           </tr>
-        </thead>
-        
-        <tbody>
-          <% @structures.order( :name ).each do |structure| %>
-            <tr class="main-table--hover" id="structure_<%= structure.id %>">
-
-              <td><%= link_to structure.name, structure_path(structure) %></td>
-              <td class="main-table--actions">
-                <%= link_to "<i class=\"fas fa-pencil-alt\"></i> Edit".html_safe, edit_structure_path(structure) %>
-                <%= link_to  "<i class=\"far fa-trash-alt\"></i> Destroy".html_safe, structure, method: :delete, data: { confirm: 'Are you sure?' }, class: 'text-destroy' %>
-              </td>
-            </tr>
-          <% end %>
-        <tbody>
-      </table>
-
+        <% end %>
+      <tbody>
+    </table>
     <div class="b-btn--container">
       <%= paginate @structures %>
-      <%= link_to "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> New Structure".html_safe, new_structure_path, class: 'main-header--link b-btn b-btn-primary' %>
+      <a href="<%= new_structure_path %>"
+        class="main-header--link b-btn b-btn-primary">
+        <i class="fa fa-plus" aria-hidden="true"></i>
+        <%= t('binda.new_structure') %>
+      </a>
     </div>
-
   </div>
-
 <% end %>

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

@@ -1,8 +1,19 @@
+<% content_for :title do %>
+	<%= t('binda.new_structure') %>
+<% end %>
+
 <% content_for :header do %>
-  <h3>New Structure</h3>
-  <a href="<%= structures_path %>" class="main-header--back"><span class="glyphicon glyphicon-list"></span> Back to list</a>
+  <h3>
+  	<%= t('binda.new_structure') %>
+  </h3>
+  <a href="<%= structures_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', structure: @structure %>
 <% end %>

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

@@ -1,36 +1,56 @@
+<% content_for :title do %>
+  <%= t 'binda.structure.plural' %>  
+<% end %>
+
 <% content_for :header do %>
   <div class="main-header--buttons">
-    <%= link_to "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> New Structure".html_safe, new_structure_path, class: 'main-header--link b-btn b-btn-primary' %>
+    <a href="<%= new_structure_path %>"
+      class="main-header--link b-btn b-btn-primary">
+      <i class="fa fa-plus" aria-hidden="true"></i>
+      <%= t('binda.new_structure') %>
+    </a>
   </div>
-  <p class="main-header--title"><%= t 'binda.structures' %></p>
+  <p class="main-header--title">
+    <%= t 'binda.structure.plural' %>  
+  </p>
 <% end %>
 
-<% content_for :content do %>
 
+<% content_for :content do %>
   <%= render 'layouts/binda/popup_warning' %>
-
   <div class="main-table--container">
-    <h5 class="text-muted"><%= t('binda.sort_index_hint', { arg1: t('binda.structures').downcase }).html_safe %></h5>
-
+    <h5 class="text-muted">
+      <%= t('binda.sort_index_hint', { arg1: t('binda.structure.plural').downcase }).html_safe %>  
+    </h5>
     <div class="main-sortable-table">
       <div class="main-sortable-table--header-row">
         <div class="main-sortable-table--header-title">
-          <p>Structures</p>
+          <p>
+            <%= t('binda.structure.plural') %>
+          </p>
         </div>
       </div>
-      <div id="structures--sort-index" class="sortable" data-update-url="<%= structures_sort_path() %>" data-message="<%= t 'binda.sort_items_loader', { arg1: t('binda.components').downcase } %>">
-      <% @structures.order( :name ).each do |structure| %>
-        <div id="structure_<%= structure.id %>" class="main-sortable-table--row ui-sortable-handle">
-          <div class="main-sortable-table--row-cell">
-            <p><%= structure.name %></p>
+      <div id="structures--sort-index" 
+        class="sortable" 
+        data-update-url="<%= structures_sort_path() %>" 
+        data-message="<%= t 'binda.sort_items_loader', { arg1: t('binda.components').downcase } %>">
+        <% @structures.order( :name ).each do |structure| %>
+          <div id="structure_<%= structure.id %>" 
+            class="main-sortable-table--row ui-sortable-handle">
+            <div class="main-sortable-table--row-cell">
+              <p>
+                <%= structure.name %>
+              </p>
+            </div>
           </div>
-        </div>
-      <% end %>
+        <% end %>
       </div>
     </div>
   </div>
-
   <%= paginate @structures %>
-  <%= link_to "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> New Structure".html_safe, new_structure_path, class: 'main-header--link b-btn b-btn-primary' %>
-
+  <a href="<%= new_structure_path %>"
+    class="main-header--link b-btn b-btn-primary">
+    <i class="fa fa-plus" aria-hidden="true"></i>
+    <%= t('binda.new_structure') %>
+  </a>
 <% end %>

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

@@ -1,25 +1,37 @@
+<% content_for :title do %>
+  <%= t('binda.login_welcome', { arg1: get_website_name }) %>    
+<% end %>
+
+
 <% content_for :background do %>
   <div id="background-shader">
     <%= render 'binda/users/sessions/background' %>
   </div>
   <div class="login--header">
-    <p><%= t('binda.login_welcome', { arg1: get_website_name }) %></p>
+    <p>
+      <%= t('binda.login_welcome', { arg1: get_website_name }) %>    
+    </p>
   </div>
   <div class="login--footer">
-    <a href="https://github.com/lacolonia/binda" target="_blank"><%= t('binda.login_credit', { arg1: Binda::VERSION.to_s }) %></a>
+    <a href="https://github.com/lacolonia/binda" target="_blank">
+      <%= t('binda.login_credit', { arg1: Binda::VERSION.to_s }) %>  
+    </a>
   </div>
 <% end %>
 
-<div class="login">
-
-  <%= simple_form_for resource, as: resource_name, url: session_path(resource_name), html: { class: 'login--form'} do |f| %>
 
+<div class="login">
+  <%= simple_form_for resource, 
+    as: resource_name, 
+    url: session_path(resource_name), 
+    html: { class: 'login--form'} do |f| %>
       <div class="form-inputs">
         <ol class="login--questions">
           <li>
             <span>
               <label for="email">
-                <i class="far fa-user"></i> <%= t 'binda.login_email' %>
+                <i class="far fa-user"></i> 
+                <%= t 'binda.login_email' %>
               </label>
             </span>
             <%= f.input 'email', label: false %>
@@ -27,36 +39,29 @@
           <li>        
             <span>
               <label for="password">
-                <i class="fas fa-key"></i> <%= t 'binda.login_password' %>
+                <i class="fas fa-key"></i> 
+                <%= t 'binda.login_password' %>
               </label>
             </span>
             <%= f.input 'password', label: false %>
           </li>
         </ol>
       </div>
-
-
       <div class="login--controls">
-
         <button class="login--next login--show"></button>
-              
         <div class="update-form--button form-actions login--submit-button">
           <%= button_tag '<i class="fas fa-check"></i> ->'.html_safe, {
               class: 'b-btn b-btn-primary b-btn-alternative',
               id: 'save',
           } %>
         </div>
-
         <div class="form-inputs login--radio-button">
-          <input type="radio" name="login" id="remember" data-waschecked="true"><label for="remember"><span></span>Remember me</label>
+          <input type="radio" name="login" id="remember" data-waschecked="true">
+            <label for="remember">
+              <span></span> <%= t('binda.remember_me') %>
+            </label>
         </div>
-
       </div>
-
   <% end %>
-
   <%= render "binda/users/shared/links" %>
-
-</div>
-
-
+</div>

data/app/views/layouts/binda/_form_errors.html.erb

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

data/app/views/layouts/binda/_sidebar.html.erb

@@ -22,19 +22,19 @@
       <% if structure.instance_type == 'component' %>
         <li class="main-sidebar--structure <%= 'main-sidebar--first-structure' if index == 0 %>">
           <a href="<%= structure_components_path( structure ) %>">
-            <span class="glyphicon glyphicon-th-list" aria-hidden="true"></span> 
+            <i class="fas fa-list-ul"></i> 
             <%= structure.name.humanize.pluralize  %> 
           </a>
           <% if structure.has_categories %>
             <a class="main-sidebar--sub-link" href="<%= structure_categories_path( structure.slug ) %>">
-              <span class="glyphicon glyphicon-tags" aria-hidden="true"></span> <%= t(:category).capitalize.pluralize %>
+              <i class="fas fa-tags"></i> <%= t(:category).capitalize.pluralize %>
             </a>
           <% end %>
         </li>
       <% else %>
         <li class="main-sidebar--structure <%= 'main-sidebar--first-structure' if index == 0 %>">
           <a href="<%= structure_board_path( structure, structure.board ) %>">
-            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
+            <i class="fas fa-list-alt"></i>
             <%= structure.board.name.humanize %>
           </a>
         </li>
@@ -43,18 +43,18 @@
     <% if current_user.is_superadmin %>
       <li>
         <a href="<%= structures_path %>">
-          <span class="glyphicon glyphicon-edit" aria-hidden="true"></span> Structures
+          <i class="fas fa-sitemap"></i> Structures
         </a>
       </li>
     <% end %>
     <li>
       <a href="<%= manage_users_path %>">
-        <span class="glyphicon glyphicon-user" aria-hidden="true"></span> Users
+        <i class="fas fa-user"></i> Users
       </a>
     </li>
     <li>
       <a href="<%= destroy_user_session_path %>" data-method="delete">
-        <span class="glyphicon glyphicon-log-out" aria-hidden="true"></span> Log out
+        <i class="fas fa-sign-out-alt"></i> Log out
       </a>
     </li>
   </ul>

data/app/views/layouts/binda/application.html.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="<%= I18n.locale %>">
   <head>
-    <title>Binda CMS -- <%= controller_name.capitalize %> <%= action_name.capitalize %></title>
+    <title>Binda CMS -- <%= yield :title %></title>
     <%= csrf_meta_tags %>
 
     <link href="https://fonts.googleapis.com/css?family=Work+Sans:300,600" rel="stylesheet">

data/config/initializers/carrierwave.rb

@@ -1,5 +1,5 @@
 # see: https://til.codes/testing-carrierwave-file-uploads-with-rspec-and-factorygirl/
-# This apparently doesn't work... needs further investigation
+# REVIEW This apparently doesn't work... needs further investigation
 if Rails.env.test? || Rails.env.cucumber?
 
   # Setup Carrierwave to use local storage and disable file processing in test env
@@ -24,7 +24,8 @@ if Rails.env.test? || Rails.env.cucumber?
 
   # Setting asset_host
   # (this line should stay outside the initial if statement)
-  CarrierWave::Uploader::Base.descendants.each do |klass|
+  # REVIEW maybe the problem lies here...
+  CarrierWave::Uploader::Base.descendants.each do |_|
   	# Set the asset_host option for the carrierwave. 
     config.asset_host = ActionController::Base.asset_host
   end

data/config/locales/en.yml

@@ -42,9 +42,9 @@ en:
   default_choice_description: If you have added/removed any choice, this list might not be correct. Please save to update it.
   instance: instance
   structure_instance_type: 'This structure is for:'
-
+  
   binda:
-    title: title
+    title: Title
     view_website: View website
     error_related_to_itself: Sorry, this record cannot relate to itself
     confirm_delete: Do you really want to remove it?
@@ -64,18 +64,44 @@ en:
     delete: delete
     edit: edit
     sort: sort
-    structure: Structure
-    structures: Structures
-    field_group: Field group
-    field_groups: Field groups
-    field_setting: Field setting
-    field_settings: Field settings
+    structure:
+      singular: Structure
+      plural: Structures
+      confirm_delete: This operation will delete this structure and there is no coming back. Are you ok with that?    
+      validation_message: 
+        instance_type: "%{arg1} is not a valid instance"
+    field_group:
+      singular: Field group
+      plural: FIeld groups
+      confirm_delete: This operation will delete this group of settings and all related component content. Are you ok with that?
+      validation_message:
+        name: cannot be blank.
+        slug: "\"%{arg1}\" already in use. Please choose a different slug."
+        field_type: "isn't valid. Select a field type among these: %{arg1}."
+    default_field_group:
+      name: General details
+      error_on_create: General Details group hasn't been created
     repeater_field_settings: Fields settings of the %{arg1} repeater
+    field_setting:
+      singular: Field setting
+      plural: Field settings
+      confirm_delete: This operation will delete this setting and all related component content. Are you ok with that?
+      validation_message:
+        name: Field setting name cannot be blank.
+        slug: "\"%{arg1}\" already in use. Please choose a different slug."
+        field_type: "isn't valid. Please associate the field setting named \"%{arg1}\" with one of the following field types: %{arg2}."
+        field_group_id: "cannot be blank. Field setting named \"%{arg1}\" must be associated to a field group. Check if field_group_id propriety is set."
+        allow_null: "canont be true on a radio setting. Please ensure to set allow_null=false for the field setting named \"%{arg1}\" before saving it."
+        has_choice_before_updating_allow_null_to_false: "In order to require at least a choice, it's mandatory that at least one is available. Please create a choice for the field setting with slug \"%{arg1}\" before continuing."
     component: Component
     components: Component
-    new: new
-    new_structure: New %{arg1} structure
-    new_field_group: New %{arg1} field group
+    asset:
+      validation_message:
+        fieldable_id: cannot be blank. The %{arg1} must be associated with a component or a board
+        field_setting_id: cannot be blank. The %{arg1} must be associated with a field setting
+    new: New
+    new_structure: New structure
+    new_field_group: New field group
     new_component: New %{arg1}
     new_user: New User
     new_category: New %{arg1} category
@@ -103,8 +129,26 @@ en:
     login_password: Enter your password
     login_welcome: Welcome to %{arg1} admin panel
     login_credit: Built with Binda %{arg1}
+    selection:
+      validation_message:
+        choices: "The selection field with id=%{arg1} depending on \"%{arg2}\" must have at least a choice."
+    choice: 
+      default_label: Temporary choice
+      default_value: temporary-choice
+      validation_message:
+        label: Label cannot be blank
+        value: Value cannot be blank
+        field_setting_id: cannot be blank. Choice must be associated to a field setting. Check if field_setting_id propriety is set.
+        destroy: It's not possible to delete the last choice as this field setting requires at least one exists. Before trying again, please add another choice.
     choice_label: label
     choice_value: value
     allow_null: Require a choice
     allow_null_true: Choosing is not required 
-    allow_null_false: Require to choose among the available choices
+    allow_null_false: Require at least one choice
+    publish_state: Publish state
+    user: User
+    manage_users: Manage Users
+    remember_me: Remember me
+    no_available_choice: Sorry, no choice is available. 
+    no_available_choice_user_hint: Please contact the administrator
+    no_available_choice_superadmin_hint: Please ensure you setup at least two possible choices when editing the