binda 0.1.0 → 0.1.1

data/app/assets/stylesheets/binda/index.scss

@@ -7,6 +7,7 @@
 
 // Standard UI
 @import "components/b-btn";
+@import "components/b-alert";
 
 // Components
 @import "components/main_sidebar";
@@ -18,6 +19,7 @@
 @import "components/login";
 @import "components/standard-form";
 @import "components/form_item";
+@import "components/form_item_choice";
 @import "components/form_item_image";
 @import "components/form_item_video";
 @import "components/sortable";

data/app/assets/stylesheets/binda/settings/common.scss

@@ -1,7 +1,8 @@
 body
 {
+  min-height: 100vh;
   padding: 0;
-  background-color: $body-bg;
+  background-image: linear-gradient( to bottom, $color-gray-lightest, darken($color-gray-lightest, 6%));
 }
 
 // this could be avoided using more recent version of bootstrap or with bourbon
@@ -49,6 +50,6 @@ body
 .pagination
 {
   float: left;
-  margin-top: 0px;
   width: 100%;
-}
+  margin-top: 0;
+}

data/app/assets/stylesheets/binda/settings/tiny_mce_overrides.scss

@@ -3,7 +3,7 @@
 body#tinymce
 {
   padding: 12px;
-  background-color: $color-gray-lightest;
+  background-color: $color-white;
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075) !important;
 }
 
@@ -12,7 +12,7 @@ body#tinymce
 {
   margin-bottom: $font-size-base * .5 !important;
   border: none !important;
-  background-color: $color-gray-lightest !important;
+  background-color: $color-white !important;
 }
 
 .mce-toolbar
@@ -21,7 +21,7 @@ body#tinymce
 }
 
 .mce-btn-group .mce-btn,
-.mce-flow-layout-item 
+.mce-flow-layout-item
 {
   margin-right: 2px !important;
   margin-left: 0 !important;
@@ -39,7 +39,7 @@ body#tinymce
 
 .mce-edit-area
 {
-  border: 1px solid $color-white !important;
+  border: 1px solid $color-gray-lightest !important;
   border-radius: 1px !important;
 }
 
@@ -53,7 +53,7 @@ body#tinymce
 {
   border: none !important;
   border-top: none !important;
-  background-color: $color-gray-lightest !important;
+  background-color: $color-white !important;
 }
 
 .mce-menubar
@@ -80,3 +80,19 @@ body#tinymce
 {
   box-shadow: none !important;
 }
+
+.mce-btn
+{
+  background-color: $color-gray-lightest !important;
+}
+
+.mce-btn:hover,
+.mce-btn:active 
+{
+  border-color: $color-gray-lighter !important;
+}
+
+div.mce-edit-area
+{
+  border-color: $color-gray-lightest !important;
+}

data/app/assets/stylesheets/binda/settings/variables.scss

@@ -25,10 +25,10 @@ $color-gray-dark:             rgb( 102, 102, 102 );
 $color-gray:                  rgb( 128, 128, 128 );
 $color-gray-light:            rgb( 153, 153, 153 );
 $color-gray-lighter:          rgb( 193, 193, 193 );
-$color-gray-lightest:         rgb( 229, 229, 229 );
+$color-gray-lightest:         rgb( 238, 238, 238 );
 
 $color-primary:               #337ab7;
-$color-success:               #5cb85c;
+$color-success:               #67CD9B;
 $color-info:                  #5bc0de;
 $color-warning:               #f0ad4e;
 $color-danger:                #fc4242;

data/app/controllers/binda/components_controller.rb

@@ -35,7 +35,8 @@ module Binda
       if @component.save
         redirect_to structure_component_path( @structure.slug, @component.slug ), notice: "#{ @structure.name } was successfully created."
       else
-        redirect_to new_structure_component_path( @structure.slug ), flash: { alert: @component.errors }
+        @instance = @component
+        render :edit, flash: { alert: @component.errors }
       end
     end
 
@@ -63,6 +64,7 @@ module Binda
       params[:repeater].each_with_index do |id, i|
         Repeater.find( id ).update({ position: i + 1 })
       end
+      render js: "$('.popup-warning').addClass('popup-warning--hidden');"
       head :ok
     end
     

data/app/controllers/binda/field_groups_controller.rb

@@ -35,7 +35,6 @@ module Binda
       # Add nested classes
       add_new_field_settings
       add_new_choices
-
       update_choices
 
       # Update the other ones
@@ -145,15 +144,20 @@ module Binda
         unless new_params[:new_choices].nil? 
           new_params[:new_choices].each do |choice|
             unless choice[:label].blank? || choice[:value].blank?
-              new_choice = Choice.create( choice )
-              unless new_choice
-                return redirect_to edit_structure_field_group_path( @structure.slug, @field_group.slug ), flash: { error: new_choice.errors }
-              end
+              create_new_choice choice
             end
           end
         end 
       end
 
+      # Create new choice (depends directly from add_new_choice method)
+      def create_new_choice choice
+        new_choice = Choice.create( choice )
+        unless new_choice
+          return redirect_to edit_structure_field_group_path( @structure.slug, @field_group.slug ), flash: { error: new_choice.errors }
+        end
+      end
+
       def update_choices
         return if field_group_params[:field_settings_attributes].nil?
         field_group_params[:field_settings_attributes].each do |_, field_setting_params|

data/app/controllers/binda/structures_controller.rb

@@ -61,14 +61,12 @@ module Binda
       params[:structure].each_with_index do |id, i|
         Structure.find( id ).update({ position: i + 1 })
       end
+      render js: "$('.popup-warning').addClass('popup-warning--hidden');"
       head :ok
     end
 
     def sort_index
       @structures = Structure.order('position').all.page params[:page]
-=begin
-      return redirect_to structure_components_path, alert: "There are too many #{@structure.name.pluralize}. It's not possible to sort more than #{Component.sort_limit} #{@structure.name.pluralize}." if @structure.components.length > Component.sort_limit
-=end
     end
 
     private

data/app/models/binda/choice.rb

@@ -54,22 +54,28 @@ module Binda
 				field_setting.default_choice_id = nil
 			end
 
+			# Update field setting with the new default choice
+			update_default_choice_of field_setting
+		end
+
+		# Update field setting with a default choice
+		# 
+		# This method is used by reset_default_choice method.
+		# 
+		# @param field_setting [ActiveRecord Object]
+		def update_default_choice_of field_setting
+
 			# Save and check if it's alright
-			unless field_setting.save
-				raise "It hasn't been possible to set the default choice for the current setting (#{field_setting.slug})."
-			end
+			raise "It hasn't been possible to set the default choice for the current setting (#{field_setting.slug})." unless field_setting.save
 
 			# Create an empty array in order to avoid generating an error on the following each loop
 			selections = Selection.joins(:field_setting).where(binda_field_settings: {id: field_setting.id })
 
 			# Make sure none of the Binda::Selection instances (radios/checkboxes/selects) are left without a choice
 			selections.each do |selection|
-				unless selection.choices.any?
-					selection.choices << Choice.find(self.field_setting.default_choice_id)
-					unless selection.save
-						raise "It hasn't been possible to set the default choice for Binda::Selection with id=#{selection.id}"
-					end
-				end
+				next if selection.choices.any?
+				selection.choices << Choice.find(self.field_setting.default_choice_id)
+				raise "It hasn't been possible to set the default choice for Binda::Selection with id=#{selection.id}" unless selection.save
 			end
 		end
 

data/app/views/binda/categories/_form.html.erb

@@ -5,10 +5,8 @@
   <%= 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>
+    <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>
@@ -22,7 +20,7 @@
     <div class="standard-form--container">
 
       <div class="standard-form--header">
-        <p><%= "#{ t :details }".capitalize %></p>
+        <small><%= "#{ t :details }".capitalize %></small>
       </div>
 
       <div class="standard-form--fields">
@@ -46,7 +44,7 @@
   <div class="standard-form--container standard-form--sidebar">
 
     <div class="standard-form--header">
-      <p><%= t(:setting).capitalize.pluralize %></p>
+      <small><%= t(:setting).capitalize.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/app/views/binda/categories/index.html.erb

@@ -9,10 +9,10 @@
   <div class="main-table--container">
 
       <table class="standard-form--container">
-        <thead>
+        <thead class="standard-form--header">
           <tr>
-            <th style="width: 70%;" class="standard-form--header"><%= t(:category).capitalize.pluralize %></th>
-            <th style="width: 30%;" class="standard-form--header"></th>
+            <th style="width: 70%;"><%= t(:category).capitalize.pluralize %></th>
+            <th style="width: 30%;"></th>
           </tr>
         </thead>
         

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

@@ -16,9 +16,9 @@
 
       <table class="standard-form--container" cellspacing="0">
 
-        <thead>
-
-            <th style="width: 50%", class="standard-form--header">
+        <thead class="standard-form--header">              
+          <tr>
+            <th style="width: 50%">
               <a href="<%=
                 if params[:order] == 'LOWER(name) ASC'
                   structure_components_path([@structure], order:'LOWER(name) DESC')
@@ -34,7 +34,7 @@
                 <% end %>
               </a>
             </th>
-            <th style="width: 20%", class="standard-form--header">
+            <th style="width: 20%">
               <a href="<%=
                 if params[:order] == 'publish_state ASC, LOWER(name) ASC'
                   structure_components_path([@structure], order:'publish_state DESC, LOWER(name) ASC')
@@ -50,8 +50,8 @@
                 <% end %>
               </a>
             </th>
-            <th style="width: 30%", class="standard-form--header"><p style="float: right;">Actions</p></th>
-
+            <th style="width: 30%">Actions</th>
+          </tr>
         </thead>
         <tbody>
           <% @components.each do |component| %>

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

@@ -8,8 +8,8 @@
 <% end %>
 
 <% content_for :content do %>
-  <div class="sortable-warning sortable-warning--hidden">
-      <div class="sortable-warning--loader">
+  <div class="popup-warning popup-warning--hidden">
+      <div class="popup-warning--loader">
         <span></span>
         <span></span>
         <span></span>
@@ -22,11 +22,11 @@
       <h5 class="text-muted"><%= t('binda.sort_index_hint', { arg1: @structure.name.humanize.split.join(' ').pluralize }).html_safe %></h5>
 
       <table class="standard-form--container table-sort">
-        <thead>
+        <thead  class="standard-form--header">
           <tr>
-            <th style="width: 50%;", class="standard-form--header">Title</th>
-            <th style="width: 50%;", class="standard-form--header">Publish state</th>
-            <th class="standard-form--header"></th>
+            <th style="width: 50%;">Title</th>
+            <th style="width: 50%;">Publish state</th>
+            <th></th>
           </tr>
         </thead>
         <tbody id="<%= @structure.slug %>-components--sort-index" class="sortable" data-update-url="<%= structure_components_sort_path( @structure.slug ) %>">

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

@@ -5,10 +5,8 @@
   <%= 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>
+    <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>
@@ -22,7 +20,7 @@
     <div class="standard-form--container">
 
       <div class="standard-form--header">
-        <p><%= "#{ t :details }" %></p>
+        <small><%= "#{ t :details }" %></small>
       </div>
 
       <%= f.input :name, label: "#{ t :title }" %>
@@ -40,11 +38,12 @@
       <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>
+          <small><%= "#{ t 'binda.field_settings' }" %></small>
         </div>
         
         <%= render "form_section", f: f %>
-
+        
+        <div class="clearfix"></div>
       </div>
 
       <% @field_group.field_settings.where( field_type: 'repeater' ).order( :position, :id ).each do |repeater| %>
@@ -52,11 +51,12 @@
           <div class="form-section">
 
             <div class="standard-form--header field-settings-header">
-              <p><%= "#{ t('binda.repeater_field_settings', arg1: repeater.name ) }" %></p>
+              <small><%= "#{ t('binda.repeater_field_settings', arg1: repeater.name ) }" %></small>
             </div>
 
             <%= render "form_section_repeater", f: f, repeater: repeater %>
 
+            <div class="clearfix"></div>
           </div>
         </div>
       <% end %>
@@ -70,7 +70,7 @@
     <div class="standard-form--container">
 
       <div class="standard-form--header">
-        <p><%= "#{ t :setting }".pluralize %></p>
+        <small><%= "#{ t :setting }".pluralize %></small>
       </div>
 
       <div class="standard-form--main-actions">

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

@@ -1,133 +1,124 @@
-<%= 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--container field-settings-container form-item--collapsable form-item--collapsed">
 
-<%# - - - - - - - - - - - - %>
-<%# 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?">
+	<%= ff.input :field_group_id, as: :hidden %>
+	<%= ff.input :id, as: :hidden %>
+	<%= ff.input :ancestry, as: :hidden unless ff.object.is_root? %>
 
-    <span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
-<% else %>
-
-  <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,
+	<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: 'Are you sure?' },
-                  class: 'text-destroy' %>
-    </div>
-
+                  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>
 
-<% end %>
-
-<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? %>
+	<div class="form-item--editor">
 
 		<%# - - - - - - - - - - - - %>
-		<%# SLUG                    %>
+		<%# NAME                    %>
 		<%# - - - - - - - - - - - - %>
 		<div class="form-item--half-size">
-			<%= ff.input :slug, as: :hidden, input_html: { class: "form-item--input" } %>
+			<%= ff.input :name, 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>
+		<% if ff.object.new_record? %>
 
-	<% else %>
-
-		<%# - - - - - - - - - - - - %>
-		<%# SLUG                    %>
-		<%# - - - - - - - - - - - - %>
-		<div class="form-item--half-size">
-			<%= ff.input :slug, as: :string, input_html: { class: "form-item--input" } %>
-		</div>
+			<%# - - - - - - - - - - - - %>
+			<%# SLUG                    %>
+			<%# - - - - - - - - - - - - %>
+			<%= ff.input :slug, as: :hidden, input_html: { class: "form-item--input" } %>
 
-    <%# - - - - - - - - - - - - %>
-    <%# FIELD TYPE              %>
-    <%# - - - - - - - - - - - - %>
-    <div class="form-item--full-size">
+	    <%# - - - - - - - - - - - - %>
+	    <%# 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>
+	      <% 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>
+		<% else %>
 
-		<%# - - - - - - - - - - - - %>
-		<%# POSITION                %>
-		<%# - - - - - - - - - - - - %>
-		<div class="form-item--full-size">
-			<%= ff.input :position, as: :integer, input_html: { class: "form-item--input" } %>
-		</div>
+			<%# - - - - - - - - - - - - %>
+			<%# SLUG                    %>
+			<%# - - - - - - - - - - - - %>
+			<div class="form-item--half-size">
+				<%= ff.input :slug, as: :string, input_html: { class: "form-item--input" } %>
+			</div>
 
-    <%# - - - - - - - - - - - - %>
-    <%# ACCEPTED STRUCTURES     %>
-    <%# - - - - - - - - - - - - %>
-		<% if ff.object.field_type == 'relation' %>
+	    <%# - - - - - - - - - - - - %>
+	    <%# FIELD TYPE              %>
+	    <%# - - - - - - - - - - - - %>
 	    <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 %>
+	      <% 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>
-    <% end %>
-
 
-		<% choiceables = ['radio', 'selection', 'checkbox'] %>
-		<% if choiceables.include? ff.object.field_type %>
+			<%# - - - - - - - - - - - - %>
+			<%# DESCRIPTION             %>
+			<%# - - - - - - - - - - - - %>
+			<div class="form-item--full-size">
+				<%= ff.input :description, input_html: { class: "form-item--input" } %>
+			</div>
 
 			<%# - - - - - - - - - - - - %>
-			<%# CHOICES                 %>
+			<%# POSITION                %>
 			<%# - - - - - - - - - - - - %>
-			<%= render 'form_item_choice', f: f, ff: ff  %>
+			<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 %>
-
-	<% end %>
-	<div class="clearfix"></div>
-
+		<div class="clearfix"></div>
+	</div>
 </div>