effective_bootstrap 0.9.35 → 0.9.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 724c9c09be1863a089556b42c8569d61c0dc8c5a94efde7406bad1c2835fe359
-  data.tar.gz: 8deca06ebd23e4ac4c572c82caf861847f8932c169e6f32ebe2c052f4634cc40
+  metadata.gz: ac9e0d6013b991db010ef717fe181ea041d2d9e756e0bb477d9ff7544248b718
+  data.tar.gz: f212aea0848dd0d7d50b0186b798ce9cb52d8c5e17bba7f4cfd63b69cc716861
 SHA512:
-  metadata.gz: 3b7b872f2f83381421e3511b2b6401ccc672c68a8e550760e0e093002ec691f709f8ff39d936909ad9013125d8924bffe739309b6f30431488195d78600d7b1e
-  data.tar.gz: 2ed3d029a6f61ba2100df032d078c9d93e51a062d9d97acc8aefea7ed951f5947749d9c875f580efde85eadc1e15b3c2795683f7f7b7decea5b4070bd84d0ac7
+  metadata.gz: a87134d9311b1837d06e9e37857c03930a52cb0c211a2bd1dd05276ecd7eca76d57615e71cea80b271b9f11a7469647ff4915f790330f19ddd8a2c185a0604c6
+  data.tar.gz: 35fca4a527a44b58237cc6e71ab8846aa4da76d0f1c7e82078d272323bfb90be12ca16c4f27574603b118a90f5831753fb0e010bc7e5586626c982cf8be33901

data/app/assets/javascripts/effective_has_many/initialize.js.coffee

@@ -36,8 +36,27 @@ $(document).on 'click', '[data-effective-form-has-many-add]', (event) ->
   template = atob($obj.data('effective-form-has-many-template')).replace(/HASMANYINDEX/g, uid)
 
   $fields = $(template).hide().fadeIn('fast')
-  EffectiveBootstrap.initialize($fields)
   $obj.closest('.has-many-links').before($fields)
+  EffectiveBootstrap.initialize($fields)
+
+  assignPositions($hasMany)
+  true
+
+$(document).on 'click', '[data-effective-form-has-many-insert]', (event) ->
+  event.preventDefault()
+
+  $obj = $(event.currentTarget)
+  $hasMany = $obj.closest('.form-has-many')
+  return unless $hasMany.length > 0
+
+  $add = $hasMany.children('.has-many-links').find('[data-effective-form-has-many-template]')
+
+  uid = (new Date).valueOf()
+  template = atob($add.data('effective-form-has-many-template')).replace(/HASMANYINDEX/g, uid)
+
+  $fields = $(template).hide().fadeIn('fast')
+  $obj.closest('.has-many-fields').before($fields)
+  EffectiveBootstrap.initialize($fields)
 
   assignPositions($hasMany)
   true

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

@@ -3,12 +3,16 @@
   .has-many-move { display: none; }
   .has-many-remove-disabled { opacity: 0; cursor: default !important; }
 
+  .has-many-actions { margin-bottom: 0.75rem; }
   .has-many-remove { margin-top: 1rem; }
   .has-many-move { margin-top: 1.5rem; }
 }
 
 .form-has-many.reordering {
+  .has-many-actions { display: none; }
   .has-many-move { display: inline-block; cursor: grab; }
+
+  .form-has-many { display: none; }
 }
 
 .form-has-many.tight {

data/app/helpers/effective_bootstrap_helper.rb

@@ -10,7 +10,7 @@ module EffectiveBootstrapHelper
   def accordion(options = nil, &block)
     (options ||= {})[:class] = "accordion #{options.delete(:class)}".strip
 
-    id = "accordion-#{''.object_id}"
+    id = "accordion-#{effective_bootstrap_unique_id}"
 
     @_accordion_active = id
     content = content_tag(:div, capture(&block), options.merge(id: id))
@@ -62,7 +62,7 @@ module EffectiveBootstrapHelper
   def collapse(label, opts = {}, &block)
     raise 'expected a block' unless block_given?
 
-    id = "collapse-#{String.new.object_id}"
+    id = "collapse-#{effective_bootstrap_unique_id}"
     show = (opts.delete(:show) == true)
 
     link_opts = { 'data-toggle': 'collapse', role: 'button', href: "##{id}", 'aria-controls': "##{id}", 'aria-expanded': show }
@@ -259,7 +259,7 @@ module EffectiveBootstrapHelper
   def nav_dropdown(label, right: false, link_class: [], list_class: [], &block)
     raise 'expected a block' unless block_given?
 
-    id = "dropdown-#{''.object_id}"
+    id = "dropdown-#{effective_bootstrap_unique_id}"
 
     content_tag(:li, class: 'nav-item dropdown') do
       content_tag(:a, class: 'nav-link dropdown-toggle', href: '#', id: id, role: 'button', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) do
@@ -436,7 +436,7 @@ module EffectiveBootstrapHelper
 
     @_tab_mode = :tablist
     @_tab_active = (active || :first)
-    @_tab_unique = ''.object_id if unique
+    @_tab_unique = effective_bootstrap_unique_id if unique
 
     content_tag(:ul, {class: 'nav nav-tabs', role: 'tablist'}.merge(list)) do
       yield # Yield to tab the first time
@@ -476,7 +476,7 @@ module EffectiveBootstrapHelper
 
     @_tab_mode = :tablist_vertical
     @_tab_active = (active || :first)
-    @_tab_unique = ''.object_id if unique
+    @_tab_unique = effective_bootstrap_unique_id if unique
 
     content_tag(:div, class: 'row border') do
       content_tag(:div, class: 'col-3 border-right') do
@@ -504,4 +504,15 @@ module EffectiveBootstrapHelper
     end
   end
 
+  def effective_bootstrap_unique_id
+    # Set the first unique value
+    @_effective_bootstrap_unique_id ||= Time.zone.now.to_i
+
+    # Everytime we access this function make a new one
+    @_effective_bootstrap_unique_id = @_effective_bootstrap_unique_id + 1
+
+    # Return the updated value
+    @_effective_bootstrap_unique_id
+  end
+
 end

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

@@ -6,9 +6,9 @@ module Effective
       def self.defaults
         {
           active_storage: nil,
-          css: '/assets/article_editor/',
+          css: ['/assets/article_editor/arx-frame.min.css'],
           custom: {
-            css: ['/assets/application.css', '/assets/effective_bootstrap_article_editor.css']
+            css: ['/assets/effective_bootstrap_article_editor.css']
           },
           classes: {
             body: 'article-editor-body',
@@ -40,7 +40,7 @@ module Effective
               '12': 'col-sm-12'
             }
           },
-          plugins: ['blockcode', 'cellcolor', 'imageposition', 'imageresize', 'inlineformat', 'removeformat', 'reorder', 'style'],
+          plugins: ['blockcode', 'cellcolor', 'imageposition', 'imageresize', 'inlineformat', 'listitem', 'removeformat', 'reorder', 'style'],
           quote: {
             template: '<blockquote><p></p></blockquote>'
           },
@@ -75,7 +75,15 @@ module Effective
       end
 
       def input_js_options
-        self.class.defaults.merge(active_storage: active_storage)
+        self.class.defaults.merge(active_storage: active_storage, custom: { css: custom_css })
+      end
+
+      def custom_css
+        [
+          (@template.asset_pack_path('application.css') if @template.respond_to?(:asset_pack_path)),
+          (@template.asset_path('application.css') if @template.respond_to?(:asset_path)),
+          ('/assets/effective_bootstrap_article_editor.css')
+        ]
       end
 
       def active_storage

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

@@ -51,6 +51,20 @@ module Effective
         end
       end
 
+      # insert: false
+      def insert
+        return @insert unless @insert.nil?
+
+        @insert ||= begin
+          insert = options[:input].delete(:insert)
+          insert.nil? ? false : insert
+        end
+      end
+
+      def insert?
+        !!insert
+      end
+
       # errors: true
       def errors?
         return @errors unless @errors.nil?
@@ -62,7 +76,7 @@ module Effective
       end
 
       # remove: true
-      def remove?
+      def remove
         return @remove unless @remove.nil?
 
         @remove ||= begin
@@ -77,6 +91,10 @@ module Effective
         end
       end
 
+      def remove?
+        !!remove
+      end
+
       def can_remove_method
         return @can_remove_method unless @can_remove_method.nil?
         @can_remove_method = (options[:input].delete(:can_remove_method) || false)
@@ -114,6 +132,7 @@ module Effective
       def render_resource(resource, block)
         remove = BLANK
         reorder = BLANK
+        insert = BLANK
         can_remove = (can_remove_method.blank? || !!resource.send(can_remove_method))
 
         content = @builder.fields_for(name, resource) do |form|
@@ -129,7 +148,11 @@ module Effective
           remove += (can_remove || resource.new_record?) ? link_to_remove(resource) : disabled_link_to_remove(resource)
         end
 
-        content_tag(:div, render_fields(content, (remove + reorder)), class: 'has-many-fields')
+        if insert?
+          insert = render_insert() if add? && reorder?
+        end
+
+        content_tag(:div, insert + render_fields(content, remove + reorder), class: 'has-many-fields')
       end
 
       def render_fields(content, remove)
@@ -141,12 +164,25 @@ module Effective
             content_tag(:div, remove, class: 'col-auto')
           end
         when :cards
-          raise('unsupported')
+          content_tag(:div, class: 'form-row mb-3') do
+            (reorder? ? content_tag(:div, has_many_move, class: 'col-auto') : BLANK) +
+            content_tag(:div, content, class: 'col mr-auto') do
+              content_tag(:div, class: 'card') do
+                content_tag(:div, class: 'card-body') do
+                  content_tag(:div, remove, class: 'float-right') + content
+                end
+              end
+            end
+          end
         else
           content + remove
         end
       end
 
+      def render_insert()
+        content_tag(:div, link_to_insert(), class: 'has-many-actions')
+      end
+
       def render_template(block)
         resource = build_resource()
         index = collection.length
@@ -176,6 +212,27 @@ module Effective
         )
       end
 
+      # f.has_many :things, insert: { label: (icon('plus-circle') + 'Insert Article') }
+      # f.has_many :things, insert: (icon('plus-circle') + 'Insert Article')
+      def link_to_insert
+        tag = (insert[:tag] if insert.kind_of?(Hash))
+        title = (insert[:title] || insert[:label] if insert.kind_of?(Hash))
+        html_class = (insert[:class] if insert.kind_of?(Hash))
+
+        label = (insert[:label] if insert.kind_of?(Hash))
+        label = insert if insert.kind_of?(String)
+
+        content_tag(
+          (tag || :button),
+          (label || (icon('plus-circle') + 'Insert Another')),
+          class: 'has-many-insert ' + (html_class || 'btn btn-secondary'),
+          title: (title || 'Insert Another'),
+          data: {
+            'effective-form-has-many-insert': true,
+          }
+        )
+      end
+
       def link_to_reorder(block)
         content_tag(
           :button,
@@ -189,11 +246,18 @@ module Effective
       end
 
       def link_to_remove(resource)
+        tag = (remove[:tag] if remove.kind_of?(Hash))
+        title = (remove[:title] || remove[:label] if remove.kind_of?(Hash))
+        html_class = (remove[:class] if remove.kind_of?(Hash))
+
+        label = (remove[:label] if remove.kind_of?(Hash))
+        label = remove if remove.kind_of?(String)
+
         content_tag(
-          :button,
-          icon('trash-2'),
-          class: 'has-many-remove btn btn-danger',
-          title: 'Remove',
+          (tag || :button),
+          (label || icon('trash-2')),
+          class: 'has-many-remove ' + (html_class || 'btn btn-danger'),
+          title: (title || 'Remove'),
           data: {
             'confirm': "Remove #{resource}?",
             'effective-form-has-many-remove': true,

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.9.35'.freeze
+  VERSION = '0.9.39'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.9.35
+  version: 0.9.39
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-28 00:00:00.000000000 Z
+date: 2021-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails