effective_bootstrap 0.9.32 → 0.9.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e4006da022d1652bd4ca72bdc01f74262206efc1353d73b98e532b4c19c08b7
-  data.tar.gz: 2211cb0defef54a536616e3990f055454e09fb6344e9f612f014884122e76ad6
+  metadata.gz: 94b89263c7cf0d7564203f9559a68cfdbd2b07746a89f35628f0555162d2e898
+  data.tar.gz: dcee74c0acec05c3d0a7786e26b1ecf9f2a0468aeb1057cac836968ecf2880e2
 SHA512:
-  metadata.gz: 854a6a64b6df52e43acd1ea92657bf77b3772046e6b09f244077347f9d060d9642ee17793e0f80ded0b77606505d883b2ffc2af49a6c595e1ed1509ac2415244
-  data.tar.gz: bec57138a80b59d82faa2647682636ae054a6cffebfdb3a00d1f1eb13452e534195d1b36cbedd6471d28aaa2520ddd2b5b7792e32eb5193c8a1378cb266c65e2
+  metadata.gz: 40bff96ef02ba73728037aded9304d3e8b8f630b4916c64788ca8ab417e5630ed15415a5f70fa831ee3f7af73703698276a3b0c463d874b8f94bdfabe365cefa
+  data.tar.gz: c3865baf35793093b672a90da1e191d3d31e8ab1f97677927cfa33cc89d522493c255d9de109d1b1c6b815867d6d65065a43bd41fee28aca11a134a9264cf19d

data/app/assets/javascripts/effective_bootstrap/confirm.js.coffee.erb

@@ -18,8 +18,13 @@ if <%= !!EffectiveBootstrap.use_custom_data_confirm %> && (window.Rails || $.rai
         , 4000)
       false # don't show the confirmation dialog
 
-  (window.Rails || $.rails).confirm = (message) -> true
-  (window.Rails || $.rails).effective_bootstrap_custom_data_confirm = true
+  if window.Rails
+    window.Rails.confirm = (message) -> true
+    window.Rails.effective_bootstrap_custom_data_confirm = true
+
+  if $.rails
+    $.rails.confirm = (message) -> true
+    $.rails.effective_bootstrap_custom_data_confirm = true
 
   $(document).on 'confirm:complete', (event) -> $(event.target).data('confirmed')
 

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

@@ -1,3 +1,5 @@
 // Styles for the article editor look and feel
 // Use this to customize the textarea input, toolbar, etc
 // Does not affect the article editor iframe contents
+
+.indented-list { list-style-type: none !important; }

data/app/helpers/effective_bootstrap_helper.rb

@@ -274,6 +274,52 @@ module EffectiveBootstrapHelper
     content_tag(:div, '', class: 'dropdown-divider')
   end
 
+  # Breadcrumb
+  #
+  # https://getbootstrap.com/docs/4.0/components/breadcrumb/
+  # Builds a breadcrumb based on the controller namespace, action and @page_title instance variable
+  #
+  def bootstrap_breadcrumb(root_title: nil, root_path: nil, index_title: nil, index_path: nil, page_title: nil)
+    effective_resource = (@_effective_resource || Effective::Resource.new(controller_path))
+    resource = instance_variable_get('@' + effective_resource.name) if effective_resource.name
+
+    root_title ||= 'Home'
+    root_path ||= '/'
+
+    index_title ||= controller.class.name.split('::').last.sub('Controller', '').titleize
+    index_path ||= effective_resource.action_path(:index) || request.path.split('/')[0...-1].join('/')
+
+    page_title ||= (@page_title || resource&.to_s || controller.action_name.titleize)
+
+    # Build items
+    # An array of arrays [[title, url]]
+    items = []
+
+    # Namespaces
+    Array(effective_resource.namespace).each do |namespace|
+      items << [namespace.titleize, '/' + namespace]
+    end
+
+    # Home
+    items << [root_title, '/'] unless items.present?
+
+    # Controller index action
+    items << [index_title, index_path] unless controller.action_name == 'index'
+
+    # Always
+    items << [page_title, nil]
+
+    # Now take items and turn them into breadcrumbs
+    content_tag(:ol, class: 'breadcrumb') do
+      (items[0...-1].map do |title, path|
+        content_tag(:li, link_to(title, path, title: title), class: 'breadcrumb-item')
+      end + items[-1..-1].map do |title, path|
+        content_tag(:li, title, class: 'breadcrumb-item active', 'aria-current': 'page')
+      end).join.html_safe
+    end
+  end
+
+
   # Pagination
   #
   # https://getbootstrap.com/docs/4.0/components/pagination/

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', 'imageposition', 'imageresize', 'inlineformat', 'removeformat', 'reorder', 'style'],
+          plugins: ['blockcode', 'cellcolor', 'imageposition', 'imageresize', 'inlineformat', 'listitem', 'removeformat', 'reorder', 'style'],
           quote: {
             template: '<blockquote><p></p></blockquote>'
           },
@@ -51,6 +51,17 @@ module Effective
               'small': { title: 'Small', classname: 'table-sm' },
               'striped': { title: 'Striped', classname: 'table-striped' },
             }
+          },
+          cellcolors: {
+            'primary': { title: 'Primary', classname: 'table-primary' },
+            'secondary': { title: 'Secondary', classname: 'table-secondary' },
+            'active': { title: 'Active', classname: 'table-active' },
+            'success': { title: 'Success', classname: 'table-success' },
+            'danger': { title: 'Danger', classname: 'table-danger' },
+            'warning': { title: 'Warning', classname: 'table-warning' },
+            'info': { title: 'Info', classname: 'table-info' },
+            'light': { title: 'Light', classname: 'table-light' },
+            'dark': { title: 'Dark', classname: 'table-dark' }
           }
         }
       end
@@ -64,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/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.9.32'.freeze
+  VERSION = '0.9.36'.freeze
 end

metadata

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