effective_bootstrap 0.9.24 → 0.9.29

data/app/assets/stylesheets/effective_article_editor/input.scss

@@ -0,0 +1 @@
+@import 'overrides';

data/app/assets/stylesheets/effective_article_editor/overrides.scss

@@ -0,0 +1 @@
+body { padding-top: 0px !important; }

data/app/assets/stylesheets/effective_bootstrap_article_editor.scss

@@ -0,0 +1 @@
+@import 'effective_article_editor/input';

data/app/assets/stylesheets/effective_has_many/input.scss

@@ -1,42 +1,17 @@
-body.dragging,
-body.dragging * {
-  cursor: move !important;
-}
-
 .form-has-many {
-  .has-many-placeholder {
-    position: relative;
-    height: 2rem;
-
-    &:before {
-      position: absolute;
-      content: '';
-      background-image: asset-data-url('icons/arrow-right-circle.svg');
-      background-repeat: no-repeat;
-      height: 2rem;
-      width: 2rem;
-    }
-  }
-
-  .has-many-fields.dragged {
-    position: absolute;
-    opacity: 0;
-    z-index: 2000;
-    .has-many-move { display: none; }
-  }
-
-  .has-many-move svg { margin-top: 6px; }
+  .has-many-fields.sortable-ghost { border-top: solid 3px #212529; }
   .has-many-move { display: none; }
+  .has-many-remove-disabled { opacity: 0; cursor: default !important; }
 
-  .has-many-remove { margin-top: 1.5rem; }
+  .has-many-remove { margin-top: 1rem; }
   .has-many-move { margin-top: 1.5rem; }
 }
 
 .form-has-many.reordering {
-  .has-many-move { display: inline-block; }
+  .has-many-move { display: inline-block; cursor: grab; }
 }
 
 .form-has-many.tight {
   .has-many-remove { margin-top: 0; }
-  .has-many-move { margin-top: 0; }
+  .has-many-move { margin-top: 0.5rem; }
 }

data/app/assets/stylesheets/effective_rich_text_area/extensions.scss

@@ -61,19 +61,7 @@ trix-editor {
 }
 
 .trix-content {
-  h1, h2, h3, h4, h5, h6 {
-    line-height: 1.2;
-    margin: 0;
-  }
-
-  h1 { font-size: 36px; }
-  h2 { font-size: 26px; }
-  h3 { font-size: 18px; }
-  h4 { font-size: 18px; }
-  h5 { font-size: 14px; }
-  h6 { font-size: 12px; }
-
-  .attachment { width: 100%; }
+  .attachment { max-width: 100%; }
 
   .attachment--content.attachment--horizontal-rule,
   .attachment--content[data-trix-content-type~='vnd.rubyonrails.horizontal-rule.html'] {

data/app/assets/stylesheets/effective_rich_text_area/rich_text_area.scss

@@ -12,11 +12,6 @@
   }
 }
 
-// Trix image caption
-.trix-content {
-  figcaption.attachment__caption { display: none; }
-}
-
 // Bootstrap 4 Feedback client side
 .was-validated .form-control:invalid ~ .trix-content, { border-color: #dc3545 !important; }
 .was-validated .form-control:valid ~ .trix-content { border-color: #28a745 !important; }

data/app/models/effective/form_builder.rb

@@ -22,6 +22,10 @@ module Effective
     alias_method :super_text_area, :text_area
     alias_method :super_hidden_field, :hidden_field
 
+    def article_editor(name, options = {}, &block)
+      Effective::FormInputs::ArticleEditor.new(name, options, builder: self).to_html(&block)
+    end
+
     def clear(name = 'Clear', options = {})
       (options = name; name = 'Clear') if name.kind_of?(Hash)
       Effective::FormInputs::Clear.new(name, options, builder: self).to_html

data/app/models/effective/form_inputs/article_editor.rb

@@ -0,0 +1,77 @@
+module Effective
+  module FormInputs
+    class ArticleEditor < Effective::FormInput
+
+      def build_input(&block)
+        @builder.super_text_area(name, options[:input])
+      end
+
+      def input_html_options
+        { class: 'effective_article_editor form-control', id: unique_id, autocomplete: 'off' }
+      end
+
+      def input_js_options
+        {
+          active_storage: active_storage,
+          css: '/assets/effective_article_editor/',
+          custom: {
+            css: ['/assets/application.css', '/assets/effective_bootstrap_article_editor.css']
+          },
+          classes: {
+            body: 'article-editor-body',
+            table: 'table'
+          },
+          grid: {
+            classname: 'row',
+            columns: 12,
+            gutter: '1px',
+            offset: {
+              left: '15px',
+              right: '15px',
+            },
+            patterns: {
+              '6|6': 'col-sm-6|col-sm-6',
+              '4|4|4': 'col-sm-4|col-sm-4|col-sm-4',
+              '3|3|3|3': 'col-sm-3|col-sm-3|col-sm-3|col-sm-3',
+              '2|2|2|2|2|2': 'col-sm-2|col-sm-2|col-sm-2|col-sm-2|col-sm-2|col-sm-2',
+              '3|6|3': 'col-sm-3|col-sm-6|col-sm-3',
+              '2|8|2': 'col-sm-2|col-sm-8|col-sm-2',
+              '5|7': 'col-sm-5|col-sm-7',
+              '7|5': 'col-sm-7|col-sm-5',
+              '4|8': 'col-sm-4|col-sm-8',
+              '8|4': 'col-sm-8|col-sm-4',
+              '3|9': 'col-sm-3|col-sm-9',
+              '9|3': 'col-sm-9|col-sm-3',
+              '2|10': 'col-sm-2|col-sm-10',
+              '10|2': 'col-sm-10|col-sm-2',
+              '12': 'col-sm-12'
+            }
+          },
+          plugins: ['blockcode', 'imageposition', 'imageresize', 'inlineformat', 'removeformat', 'reorder', 'style'],
+          quote: {
+            template: '<blockquote><p></p></blockquote>'
+          },
+          styles: {
+            table: {
+              'bordered': { title: 'Bordered', classname: 'table-bordered' },
+              'responsive': { title: 'Responsive', classname: 'table-responsive' },
+              'small': { title: 'Small', classname: 'table-sm' },
+              'striped': { title: 'Striped', classname: 'table-striped' },
+            }
+          }
+        }
+      end
+
+      def active_storage
+        return @active_storage unless @active_storage.nil?
+
+        @active_storage = if options.key?(:active_storage)
+          options.delete(:active_storage)
+        else
+          defined?(ActiveStorage).present?
+        end
+      end
+
+    end
+  end
+end

data/app/models/effective/form_inputs/has_many.rb

@@ -7,8 +7,9 @@ module Effective
         object.send(name).build() if build? && collection.blank?
 
         errors = (@builder.error(name) if errors?) || BLANK
+        can_remove_method
 
-        errors + content_tag(:div, options[:input]) do
+        errors + content_tag(:div, options[:input].except(:collection)) do
           has_many_fields_for(block) + has_many_links_for(block)
         end
       end
@@ -76,6 +77,11 @@ module Effective
         end
       end
 
+      def can_remove_method
+        return @can_remove_method unless @can_remove_method.nil?
+        @can_remove_method = (options[:input].delete(:can_remove_method) || false)
+      end
+
       # reorder: true
       def reorder?
         return @reorder unless @reorder.nil?
@@ -107,19 +113,23 @@ module Effective
 
       def render_resource(resource, block)
         remove = BLANK
+        reorder = BLANK
+        can_remove = (can_remove_method.blank? || !!resource.send(can_remove_method))
 
         content = @builder.fields_for(name, resource) do |form|
           fields = block.call(form)
 
-          remove += form.super_hidden_field(:_destroy) if remove? && resource.persisted?
-          remove += form.super_hidden_field(:position) if reorder? && !fields.include?('][position]')
+          remove += form.super_hidden_field(:_destroy) if remove? && can_remove && resource.persisted?
+          reorder += form.super_hidden_field(:position) if reorder? && !fields.include?('][position]')
 
           fields
         end
 
-        remove += link_to_remove(resource) if (remove? || resource.new_record?)
+        if remove?
+          remove += (can_remove || resource.new_record?) ? link_to_remove(resource) : disabled_link_to_remove(resource)
+        end
 
-        content_tag(:div, render_fields(content, remove), class: 'has-many-fields')
+        content_tag(:div, render_fields(content, (remove + reorder)), class: 'has-many-fields')
       end
 
       def render_fields(content, remove)
@@ -169,7 +179,7 @@ module Effective
       def link_to_reorder(block)
         content_tag(
           :button,
-          icon('list') + 'Reorder',
+          icon('reorder') + 'Reorder',
           class: 'has-many-reorder btn btn-secondary',
           title: 'Reorder',
           data: {
@@ -181,7 +191,7 @@ module Effective
       def link_to_remove(resource)
         content_tag(
           :button,
-          icon('trash-2') + 'Remove',
+          icon('trash-2'),
           class: 'has-many-remove btn btn-danger',
           title: 'Remove',
           data: {
@@ -191,8 +201,20 @@ module Effective
         )
       end
 
+      def disabled_link_to_remove(resource)
+        content_tag(
+          :button,
+          icon('trash-2'),
+          class: 'has-many-remove-disabled btn btn-danger',
+          title: 'Remove',
+          data: {
+            'effective-form-has-many-remove-disabled': true,
+          }
+        )
+      end
+
       def has_many_move
-        @has_many_move ||= content_tag(:span, icon('move'), class: 'has-many-move')
+        @has_many_move ||= content_tag(:span, icon('grip-lines'), class: 'has-many-move')
       end
 
       def build_resource

data/config/effective_bootstrap.rb

@@ -1,26 +1,4 @@
 EffectiveBootstrap.setup do |config|
-  # Authorization Method
-  #
-  # This method is called by all controller actions with the appropriate action and resource
-  # If it raises an exception or returns false, an Effective::AccessDenied Error will be raised
-  #
-  # Use via Proc:
-  # Proc.new { |controller, action, resource| authorize!(action, resource) }       # CanCan
-  # Proc.new { |controller, action, resource| can?(action, resource) }             # CanCan with skip_authorization_check
-  # Proc.new { |controller, action, resource| authorize "#{action}?", resource }   # Pundit
-  # Proc.new { |controller, action, resource| current_user.is?(:admin) }           # Custom logic
-  #
-  # Use via Boolean:
-  # config.authorization_method = true  # Always authorized
-  # config.authorization_method = false # Always unauthorized
-  #
-  # Use via Method (probably in your application_controller.rb):
-  # config.authorization_method = :my_authorization_method
-  # def my_authorization_method(resource, action)
-  #   true
-  # end
-  config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) }
-
   # Replaces rails_ujs data-confirm with a custom inline implementation.
   # You will need to recompile assets (or "rm -rf tmp/") if you change this.
   config.use_custom_data_confirm = true

data/lib/effective_bootstrap.rb

@@ -1,33 +1,14 @@
 require 'inline_svg'
+require 'effective_resources'
 require 'effective_bootstrap/engine'
 require 'effective_bootstrap/version'
 
 module EffectiveBootstrap
 
-  # The following are all valid config keys
-  mattr_accessor :authorization_method
-
-  mattr_accessor :use_custom_data_confirm
-
-  def self.setup
-    yield self
+  def self.config_keys
+    [:use_custom_data_confirm]
   end
 
-  def self.authorized?(controller, action, resource)
-    @_exceptions ||= [Effective::AccessDenied, (CanCan::AccessDenied if defined?(CanCan)), (Pundit::NotAuthorizedError if defined?(Pundit))].compact
-
-    return !!authorization_method unless authorization_method.respond_to?(:call)
-    controller = controller.controller if controller.respond_to?(:controller)
-
-    begin
-      !!(controller || self).instance_exec((controller || self), action, resource, &authorization_method)
-    rescue *@_exceptions
-      false
-    end
-  end
-
-  def self.authorize!(controller, action, resource)
-    raise Effective::AccessDenied.new('Access Denied', action, resource) unless authorized?(controller, action, resource)
-  end
+  include EffectiveGem
 
 end

data/lib/effective_bootstrap/engine.rb

@@ -8,7 +8,11 @@ module EffectiveBootstrap
     end
 
     initializer 'effective_bootstrap.assets' do |app|
-      app.config.assets.precompile += ['effective_bootstrap_manifest.js', 'icons/*']
+      app.config.assets.precompile += [
+        'effective_bootstrap_manifest.js',
+        'effective_bootstrap_article_editor.css',
+        'icons/*'
+      ]
     end
 
     initializer 'effective_bootstrap.action_text' do |app|

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.9.24'.freeze
+  VERSION = '0.9.29'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.9.24
+  version: 0.9.29
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2021-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -26,18 +26,32 @@ dependencies:
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bootstrap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: effective_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: inline_svg
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -242,6 +256,7 @@ files:
 - app/assets/images/icons/globe.svg
 - app/assets/images/icons/google.svg
 - app/assets/images/icons/grid.svg
+- app/assets/images/icons/grip-lines.svg
 - app/assets/images/icons/hard-drive.svg
 - app/assets/images/icons/hash.svg
 - app/assets/images/icons/headphones.svg
@@ -318,6 +333,7 @@ files:
 - app/assets/images/icons/radio.svg
 - app/assets/images/icons/refresh-ccw.svg
 - app/assets/images/icons/refresh-cw.svg
+- app/assets/images/icons/reorder.svg
 - app/assets/images/icons/repeat.svg
 - app/assets/images/icons/rewind.svg
 - app/assets/images/icons/rotate-ccw.svg
@@ -404,6 +420,8 @@ files:
 - app/assets/images/icons/zap.svg
 - app/assets/images/icons/zoom-in.svg
 - app/assets/images/icons/zoom-out.svg
+- app/assets/javascripts/effective_article_editor/initialize.js.coffee
+- app/assets/javascripts/effective_article_editor/input.js
 - app/assets/javascripts/effective_bootstrap.js
 - app/assets/javascripts/effective_bootstrap/base.js.coffee
 - app/assets/javascripts/effective_bootstrap/confirm.js.coffee.erb
@@ -435,7 +453,8 @@ files:
 - app/assets/javascripts/effective_file/input.js
 - app/assets/javascripts/effective_has_many/initialize.js.coffee
 - app/assets/javascripts/effective_has_many/input.js
-- app/assets/javascripts/effective_has_many/jquery.sortable.js
+- app/assets/javascripts/effective_has_many/sortable-jquery.js
+- app/assets/javascripts/effective_has_many/sortable.js
 - app/assets/javascripts/effective_integer/initialize.js.coffee
 - app/assets/javascripts/effective_integer/input.js
 - app/assets/javascripts/effective_number_text/initialize.js.coffee
@@ -592,11 +611,14 @@ files:
 - app/assets/javascripts/moment/locale/zh-hk.js
 - app/assets/javascripts/moment/locale/zh-tw.js
 - app/assets/javascripts/moment/moment.js
+- app/assets/stylesheets/effective_article_editor/input.scss
+- app/assets/stylesheets/effective_article_editor/overrides.scss
 - app/assets/stylesheets/effective_bootstrap.scss
 - app/assets/stylesheets/effective_bootstrap/base.scss
 - app/assets/stylesheets/effective_bootstrap/forms.scss
 - app/assets/stylesheets/effective_bootstrap/icons.scss
 - app/assets/stylesheets/effective_bootstrap/overrides.scss
+- app/assets/stylesheets/effective_bootstrap_article_editor.scss
 - app/assets/stylesheets/effective_bootstrap_editor.scss
 - app/assets/stylesheets/effective_checks/input.scss
 - app/assets/stylesheets/effective_datetime/bootstrap-datetimepicker.scss
@@ -622,6 +644,7 @@ files:
 - app/helpers/effective_icons_helper.rb
 - app/models/effective/form_builder.rb
 - app/models/effective/form_input.rb
+- app/models/effective/form_inputs/article_editor.rb
 - app/models/effective/form_inputs/check_box.rb
 - app/models/effective/form_inputs/checks.rb
 - app/models/effective/form_inputs/ck_editor.rb