binda 0.1.5 → 0.1.6

data/app/assets/javascripts/binda/index.js

@@ -2,11 +2,9 @@
 /// INDEX OF BINDA'S SCRIPTS
 ///- - - - - - - - - - - - - - - - - - - -
 
-import { _FormItem } from "./components/form_item";
-import { _FormItemRepeater } from "./components/form_item_repeater";
+import { _FormItemCollapsable } from "./components/form_item_collapsable";
 import { _FormItemImage } from "./components/form_item_image";
 import { _FieldSettingChoices } from "./components/field_setting_choices";
-import { _FormItemEditor } from "./components/form_item_editor";
 import { _FileUpload } from "./components/fileupload";
 import { _Shader } from "./components/login-shader";
 import { _LoginForm } from "./components/login_form";
@@ -17,28 +15,22 @@ import setupSelect2 from "./components/select2";
 import setupRadioToggle from "./components/radio-toggle";
 
 $(document).ready(function() {
-	if (_FormItem.isSet()) {
-		_FormItem.setEvents();
+	if (_FormItemCollapsable.isPresent()) {
+		_FormItemCollapsable.setEvents();
 	}
-	if (_FormItemRepeater.isSet()) {
-		_FormItemRepeater.setEvents();
-	}
-	if (_FormItemImage.isSet()) {
+	if (_FormItemImage.isPresent()) {
 		_FormItemImage.setEvents();
 	}
-	if (_FieldSettingChoices.isSet()) {
+	if (_FieldSettingChoices.isPresent()) {
 		_FieldSettingChoices.setEvents();
 	}
-	if (_FormItemEditor.isSet()) {
-		_FormItemEditor.setEvents();
-	}
-	if (_FileUpload.isSet()) {
+	if (_FileUpload.isPresent()) {
 		_FileUpload.setEvents();
 	}
-	if (_LoginForm.isSet()) {
+	if (_LoginForm.isPresent()) {
 		_LoginForm.init();
 	}
-	if (_Shader.isSet()) {
+	if (_Shader.isPresent()) {
 		_Shader.setup();
 		_Shader.start();
 	}
@@ -51,7 +43,7 @@ $(document).ready(function() {
 
 // handle event
 window.addEventListener("optimizedResize", function() {
-	if (_Shader.isSet()) {
+	if (_Shader.isPresent()) {
 		_Shader.resize();
 	}
 });

data/app/assets/stylesheets/binda/components/field_setting_choices.scss

@@ -20,7 +20,10 @@
 }
 
 .field-setting-choices--add-choice {
-  float: right;
+  position: absolute;
+  top: 0;
+  right: 0;
+  padding: 20px 12px 8px;
 }
 
 .form-item--editor .field-setting-choices--choice {
@@ -48,8 +51,7 @@
 
 .field-setting-choices--choice-label,
 .field-setting-choices--choice-value {
-  position: relative;
-  float: left;
+  display: inline-block;
   width: calc(50% - 16px);
 }
 

data/app/assets/stylesheets/binda/components/form_item.scss

@@ -1,8 +1,6 @@
 .form-item {
   display: block;
   overflow-y: hidden;
-  transition: max-height 0.6s ease-out;
-
   @extend .clearfix;
 }
 
@@ -11,9 +9,16 @@
 }
 
 .form-item--half-size {
-  position: relative;
-  float: left;
-  width: 50%;
+  // OLD SOLUTION (nicer, but can't be used with max-height=0 and overflow-y=hidden)
+  // position: relative;
+  // float: left;
+  // width: 50%;
+
+  // NEW SOLUTION (not very nice but plays nicely with max-height=0 and overflow-y=hidden)
+  display: inline-block;
+  width: calc(
+    50% - 3px
+  ); // 5px are for the weird issue caused by non-blank space around the inline-block elements
 
   .form-group {
     border-top: none !important;
@@ -33,12 +38,6 @@
   }
 }
 
-.form-item--new {
-  position: absolute;
-  top: 101%;
-  max-height: 0;
-}
-
 .form-item--select-input {
   display: inline-block;
   width: 240px;
@@ -78,14 +77,6 @@
   transform: rotate(180deg);
 }
 
-.form-item--editor {
-  overflow-y: hidden;
-  // max-height: is set via javascript in app/assets/javscripts/components/form_item_editor.js;
-  // default is 0
-  max-height: 0;
-  transition: max-height 0.6s ease-out;
-}
-
 .form-item--repeater {
   overflow-y: hidden;
   // inherit transitions from sortable and add max-height
@@ -102,64 +93,26 @@
   transition: all 0.6s ease;
 }
 
-.font-item--collapsed .form-item--repeater-fields {
-  margin-bottom: 8px;
+.form-item--collapsable {
+  transition: box-shadow 0.3s ease, transform 0.3s ease,
+    max-height 0.6s ease-out !important;
 }
 
-.form-item--repeater-section {
-  overflow-x: hidden; // This ensure that the div doesn't become wider when draggin sortable items to the right
-  margin-bottom: 0;
-
-  ul.sortable > li {
-    margin-top: -1px; // this solve the issue of a 2px border between 2 repeaters
-    border: 1px solid $color-gray-lighter;
-  }
-
-  ul.sortable > li > * {
-    display: block;
-  }
-
-  ul.sortable {
-    margin-bottom: 0;
-  }
-
-  .ui-sortable-handle:hover {
-    background-color: transparent;
-  }
-
-  .sortable--toggle-text:first-child {
-    display: none;
-  }
-
-  .sortable--toggle {
-    float: right;
-    margin: 0;
-  }
-
-  .sortable--enabled {
-    .form-item--repeater-fields {
-      margin: 0;
-      padding: 0;
-    }
-  }
+.form-item--collapsable-stack {
+  transition: box-shadow 0.3s ease, transform 0.3s ease,
+    max-height 0.6s ease-out !important;
+}
 
-  .form-item--new {
-    position: absolute;
-    top: 101%;
-    max-height: 0;
-  }
+.font-item--collapsed .form-item--collapsable-stack {
+  margin-bottom: 8px;
 }
 
-.form-item--repeater-section--add-new {
+.form--add-list-item {
   float: right;
   margin-right: 8px;
 }
 
-.form-item--repeater-title {
-  display: block;
-  margin-bottom: 20px;
-}
-
+.standard-form--secondary-header,
 .form-item--header {
   padding: 4px;
   background-color: $color-gray-lightest !important;
@@ -171,14 +124,14 @@
 }
 
 .form-item--collapse-btn,
-.form-item--delete-repeater-item,
+.form--delete-list-item,
 .form-item--edit-item {
   float: right;
   margin-top: 8px;
   margin-right: 8px;
 }
 
-a.form-item--delete-repeater-item {
+a.form--delete-list-item {
   cursor: pointer;
   transition: color 0.2s ease;
   color: $color-danger;

data/app/assets/stylesheets/binda/components/standard-form.scss

@@ -178,5 +178,60 @@
   padding: 12px;
 }
 
-.standard-form--choices-header {
+.standard-form--repeater,
+.standard-form--field-group,
+.standard-form--structure {
+  overflow-x: hidden; // This ensure that the div doesn't become wider when draggin sortable items to the right
+  margin-bottom: 0;
+
+  ul.sortable > li {
+    margin-top: -1px; // this solve the issue of a 2px border between 2 repeaters
+    border: 1px solid $color-gray-lighter;
+  }
+
+  ul.sortable > li > * {
+    display: block;
+  }
+
+  ul.sortable {
+    margin-bottom: 0;
+  }
+
+  .ui-sortable-handle:hover {
+    background-color: transparent;
+  }
+
+  .sortable--toggle-text:first-child {
+    display: none;
+  }
+
+  .sortable--toggle {
+    float: right;
+    margin: 0;
+  }
+
+  .sortable--enabled {
+    .form-item--collapsable-stack {
+      margin: 0;
+      padding: 0;
+      max-height: 0;
+    }
+  }
 }
+
+.standard-form--fields-list { 
+
+  .form-group {
+    padding: 0px 12px 28px ;
+  }
+
+  > .form-group {
+    padding-top: 20px;
+    padding-bottom: 0;
+  }
+}
+
+.standard-form--field-group-description {
+  color: $color-gray;
+  padding: 20px 12px 28px ;
+}

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

@@ -70,6 +70,14 @@ body#tinymce {
 
 .mce-btn {
   background-color: $color-gray-lightest !important;
+
+  &.mce-active {
+    background-color: $color-gray !important;
+  }
+}
+
+.mce-primary {
+  background-color: $color-gray !important;
 }
 
 .mce-btn:hover,

data/app/controllers/binda/application_controller.rb

@@ -4,6 +4,7 @@ module Binda
     protect_from_forgery with: :exception
 
 		before_action :authenticate_user!
+		before_action :set_locale
 
 		# _ indicates that we are not using the argument in the method
 	  def after_sign_in_path_for(_)
@@ -15,5 +16,10 @@ module Binda
 	  	root_path
 	  end
 
+	  # Avoid inheriting locale from application on which Binda is mounted
+	  def set_locale
+	  	I18n.locale = I18n.default_locale
+	  end
+
   end
 end

data/app/controllers/binda/boards_controller.rb

@@ -16,7 +16,7 @@ module Binda
 
     def update
       if @board.update(board_params)
-        redirect_to structure_board_path( @structure.slug, @board.slug ), notice: 'Setting was successfully updated.'
+        redirect_to structure_board_path(@structure.slug, @board.slug), notice: 'Setting was successfully updated.'
       else
         render :edit, flash: { alert: @board.errors }
       end
@@ -28,17 +28,14 @@ module Binda
     end
 
     def new_repeater
-      @repeater_setting = FieldSetting.find( params[:repeater_setting_id] )
-      position = @instance.repeaters.find_all{|r| r.field_setting_id = @repeater_setting.id }.length + 1
-      @repeater = @instance.repeaters.create( field_setting: @repeater_setting, position: position )
+      @repeater_setting = FieldSetting.find(params[:repeater_setting_id])
+      @repeater = @instance.repeaters.create(field_setting: @repeater_setting)
       render 'binda/fieldable/_form_item_new_repeater', layout: false
     end
 
     def sort_repeaters
-      params[:repeater].each_with_index do |id, i|
-        Repeater.find( id ).update({ position: i + 1 })
-      end
-      head :ok
+      sort_repeaters_by(params["form--list-item"])
+      render json: { id: "##{params[:id]}" }, status: 200
     end
 
     def dashboard
@@ -49,7 +46,7 @@ module Binda
     end
 
     def upload
-      if @board.update( upload_params(:board) )
+      if @board.update(upload_params(:board))
         respond_to do |format|
           format.json { render json: upload_details }
         end
@@ -75,10 +72,19 @@ module Binda
 
       # Only allow a trusted parameter "white list" through.
       def board_params
-        params.require(:board).permit( 
-          :name, :slug, :position, :structure_id,
+        params.require(:board).permit(
+          :id, :name, :slug, :position, :structure_id,
           { structure_attributes:  [ :id ] },
-          *fieldable_params )
+          *fieldable_params)
+      end
+
+      # Sort repeaters following the order with which are listed in the array provided as a argument.
+      #
+      # @param repeaters [Array] the list of ids of the repeaters
+      def sort_repeaters_by(repeaters)
+        repeaters.each_with_index do |id, i|
+          Repeater.find(id).update_column('position', i+1)
+        end
       end
   end
 end

data/app/controllers/binda/components_controller.rb

@@ -35,7 +35,7 @@ module Binda
       @component = @structure.components.build(component_params)
 
       if @component.save
-        redirect_to structure_component_path( @structure.slug, @component.slug ), notice: "#{ @structure.name } was successfully created."
+        redirect_to structure_component_path(@structure.slug, @component.slug), notice: "#{ @structure.name } was successfully created."
       else
         @instance = @component
         render :edit, flash: { alert: @component.errors }
@@ -44,7 +44,7 @@ module Binda
 
     def update
       if @component.update(component_params)
-        redirect_to structure_component_path( @structure.slug, @component.slug ), notice: "#{ @structure.name.capitalize } was successfully updated."
+        redirect_to structure_component_path(@structure.slug, @component.slug), notice: "#{ @structure.name.capitalize } was successfully updated."
       else
         render :edit, flash: { alert: @component.errors }
       end
@@ -52,26 +52,23 @@ module Binda
 
     def destroy
       @component.destroy
-      redirect_to structure_components_url( @structure.slug ), notice: "#{ @structure.name.capitalize } was successfully destroyed."
+      redirect_to structure_components_url(@structure.slug), notice: "#{ @structure.name.capitalize } was successfully destroyed."
     end
 
     def new_repeater
-      @repeater_setting = FieldSetting.find( params[:repeater_setting_id] )
-      position = @instance.repeaters.find_all{|r| r.field_setting_id=@repeater_setting.id }.length + 1
-      @repeater = @instance.repeaters.create( field_setting: @repeater_setting, position: position )
+      @repeater_setting = FieldSetting.find(params[:repeater_setting_id])
+      @repeater = @instance.repeaters.create!(field_setting: @repeater_setting)
       render 'binda/fieldable/_form_item_new_repeater', layout: false
     end
 
-    def sort_repeaters
-      params[:repeater].each_with_index do |id, i|
-        Repeater.find( id ).update({ position: i + 1 })
-      end
+    def sort_repeaters      
+      sort_repeaters_by(params["form--list-item"])
       render json: { id: "##{params[:id]}" }, status: 200
     end
     
     def sort
       params[:component].each_with_index do |id, i|
-        Component.find( id ).update_column('position', i + 1) # use update_column to skip callbacks (which leads to huge useless memory consumption)
+        Component.find(id).update_column('position', i+1) # use update_column to skip callbacks (which leads to huge useless memory consumption)
       end
       render json: { id: "##{params[:id]}" }, status: 200
     end
@@ -82,7 +79,7 @@ module Binda
     end
 
     def upload
-      if @component.update( upload_params(:component) )
+      if @component.update(upload_params(:component))
         render json: upload_details, status: 200
       else
         render json: @component.errors.full_messages, status: 400
@@ -92,7 +89,7 @@ module Binda
     private
       # Use callbacks to share common setup or constraints between actions.
       def set_structure
-        @structure = Structure.friendly.find( params[:structure_id] )
+        @structure = Structure.friendly.find(params[:structure_id])
       end
 
       def set_component
@@ -105,12 +102,20 @@ module Binda
 
       # Only allow a trusted parameter "white list" through.
       def component_params
-        params.require(:component).permit( 
-          :name, :slug, :position, :publish_state, :structure_id, :category_ids,
+        params.require(:component).permit(
+          :id, :name, :slug, :position, :publish_state, :structure_id, :category_ids,
           {structure_attributes:  [ :id ]}, 
-          {categories_attributes: [ :id, :category_id ]}, *fieldable_params )
+          {categories_attributes: [ :id, :category_id ]}, *fieldable_params)
       end
 
+      # Sort repeaters following the order with which are listed in the array provided as a argument.
+      #
+      # @param repeaters [Array] the list of ids of the repeaters
+      def sort_repeaters_by(repeaters)
+        repeaters.each_with_index do |id, i|
+          Repeater.find(id).update_column('position', i)
+        end
+      end
   end
 end