effective_bootstrap 0.13.0 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32a2c9eaed6f8b91548c0b6b418c37e1385ea9f7323b429725849a72c7aa00a4
-  data.tar.gz: 59f3fc9353fa3630a6dc3e0b5f1e31e75b4e1b9bae511c8ad563d96ebc11f80f
+  metadata.gz: ecffafbb096f543759ef66fd919f85dbf96acebd446ba522b4427c831b7b5b55
+  data.tar.gz: 9793e72a94792bed35abec120c8346d9c11f170e0323aa06aff49f75650d6d7f
 SHA512:
-  metadata.gz: 3eb4e59a05641ce7b555a8265e5d61189235b60bd2200842860c9bd8077c89dd2e500424a89007f07fae42170e1fd9116c89439509061812e2d7d917a3614019
-  data.tar.gz: 150b453174902f53b00e99fc751220ce583016e9de0a2ce2bb9a7d10a880420045d4d656d3b8967b606b5edcb626b7b8cf0f28e4f369ec6c1472d436f7d5be0c
+  metadata.gz: 7394dc15b00b1e4bc79cd4bdffb220fa093b034dd0dc67beea558e4ae87b6e61c4d5fb37c3c9b9e4934811b0bd420c6e0da427445009b33f881d86b5097c79f0
+  data.tar.gz: ec4c87b103ebd7f621e6304948daeaa3adcf6078b9df9e71c6da1fba9593c98a6a97b882b3602e8b04cef5859d19d64b33d634c34107d18daed61417e0ed6c74

data/app/assets/stylesheets/effective_bootstrap/forms.scss

@@ -70,3 +70,29 @@ div.form-group > label + .btn-group { display: block; }
 
 // File Control
 .form-control-file { border: none !important; }
+
+// Radios
+form fieldset.effective-radios {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+form fieldset.effective-checks {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+form fieldset.effective-radios legend {
+  font-size: 1rem;
+  font-weight: inherit;
+  margin-top: 0.5rem;
+  margin-bottom: 1rem;
+}
+
+// Checks
+form fieldset.effective-checks > label {
+  font-size: 1rem;
+  font-weight: inherit;
+  margin-top: 0.5rem;
+  margin-bottom: 1rem;
+}

data/app/helpers/effective_bootstrap_helper.rb

@@ -64,15 +64,17 @@ module EffectiveBootstrapHelper
   # = card('title do')
   #   %p Stuff
   # = card('Stuff', header: 'header title')
-  def card(value = nil, opts = {}, &block)
+  def card(resource = nil, opts = {}, &block)
     raise('expected a block') unless block_given?
 
-    if value.kind_of?(Hash)
-      opts = value; value = nil
+    if resource.kind_of?(Hash)
+      opts = resource; resource = nil
     end
 
+    return if resource.kind_of?(Class) && !EffectiveResources.authorized?(self, :index, resource)
+
     header = opts.delete(:header)
-    title = opts.delete(:title) || effective_bootstrap_human_name(value)
+    title = opts.delete(:title) || opts.delete(:label) || effective_bootstrap_human_name(resource, plural: (opts.key?(:plural) ? opts.delete(:plural) : true))
 
     content_tag(:div, merge_class_key(opts, 'card mb-4')) do
       header = content_tag(:div, header, class: 'card-header') if header.present?
@@ -316,7 +318,7 @@ module EffectiveBootstrapHelper
   def nav_link_to(resource, path, opts = {})
     return if resource.kind_of?(Class) && !EffectiveResources.authorized?(self, :index, resource)
 
-    label = opts.delete(:label) || effective_bootstrap_human_name(resource, plural: true, prefer_model_name: true)
+    label = opts.delete(:label) || effective_bootstrap_human_name(resource, plural: (opts.key?(:plural) ? opts.delete(:plural) : true), prefer_model_name: true)
 
     if @_nav_mode == :dropdown  # We insert dropdown-items
       return link_to(label, path, merge_class_key(opts, 'dropdown-item'))
@@ -596,12 +598,13 @@ module EffectiveBootstrapHelper
 
   NUMBERS = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
 
-  def tab(label, options = {}, &block)
-    label = effective_bootstrap_human_name(label, prefer_model_name: true)
+  def tab(resource, opts = {}, &block)
+    return if resource.kind_of?(Class) && !EffectiveResources.authorized?(self, :index, resource)
+    label = opts.delete(:label) || effective_bootstrap_human_name(resource, plural: (opts.key?(:plural) ? opts.delete(:plural) : true), prefer_model_name: true)
 
     (@_tab_labels.push(label) and return) if @_tab_mode == :validate
 
-    controls = options.delete(:controls) || label.to_s.parameterize.gsub('_', '-')
+    controls = opts.delete(:controls) || label.to_s.parameterize.gsub('_', '-')
     controls = "item-#{controls}" if NUMBERS.include?(controls[0]) # Can't start with a number
     controls = controls[1..-1] if controls[0] == '#'
     controls = "#{controls}-#{@_tab_unique}" if @_tab_unique
@@ -617,7 +620,7 @@ module EffectiveBootstrapHelper
         content_tag(:a, label, id: ('tab-' + controls), class: ['nav-link', ('active' if active)].compact.join(' '), href: '#' + controls, 'aria-controls': controls, 'aria-selected': active.to_s, 'data-toggle': 'tab', role: 'tab')
       end
     else # Inserting the content into the tab itself
-      classes = ['tab-pane', 'fade', ('show active' if active), options[:class].presence].compact.join(' ')
+      classes = ['tab-pane', 'fade', ('show active' if active), opts[:class].presence].compact.join(' ')
       content_tag(:div, id: controls, class: classes, role: 'tabpanel', 'aria-labelledby': ('tab-' + controls), 'data-tab-label': label) do
         yield
       end

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

@@ -96,6 +96,8 @@ module Effective
             collection.inject({}) { |h, (k, group)| h[k] = translate(group).map { |obj| [obj.to_s, "#{obj.class.model_name}_#{obj.id}"] }; h }
           elsif grouped
             collection.inject({}) { |h, (k, group)| h[k] = translate(group).map { |obj| obj }; h }
+          elsif (collection == :boolean || collection == :booleans || collection == :boolean_collection)
+            EffectiveBootstrap.boolean_collection
           else
             translate(collection).map { |obj| obj }
           end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.13.0'.freeze
+  VERSION = '0.13.2'.freeze
 end

data/lib/effective_bootstrap.rb

@@ -11,4 +11,8 @@ module EffectiveBootstrap
 
   include EffectiveGem
 
+  def self.boolean_collection
+    [['Yes', true], ['No', false]]
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-31 00:00:00.000000000 Z
+date: 2023-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails