effective_bootstrap 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45cba1fb03f24d07e64c2d042661ff15fbd05b12
-  data.tar.gz: ce40e7151a4b92853b547d2e799dd4cc9f95a365
+  metadata.gz: eaaea45b1e57e497554feb12fc6f67c6a6baec1d
+  data.tar.gz: 58fcb83582beefb8df6f6156d9ddea639042db88
 SHA512:
-  metadata.gz: 06a31a9005d368b42d51185e8bf6fa66f5807fdeacfe7264eef6369dd9fb33111600d228f1f3ee0ee19c881936538572a6a8405b20e8f6aa1e785093da771f7c
-  data.tar.gz: e1571762f4706f6618c70e1e53a2c55b49da87d3b09092e86a96e1320d7e49876436b23e20bfd188c98b8af4172154d25f079db86e5a8f06020607a9e4dcf622
+  metadata.gz: 94603f7e4177c8055bf1a195a4cde0ba2e7e015c64cb50067b9d953c0926a0862ed1c5b4fc2fc611572f3afe159eb8296825a78c1be5e3618a988265d95062af
+  data.tar.gz: 99978bffcaceb1735181533e02f7dfc3b7010452371b540e660016170f317cca010e33b9b2d58e70578a3253a901ae43b019456e9710240ecf5e3ae2bb3f1f59

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

@@ -1,3 +1,4 @@
 @import './forms';
 @import './icons';
+@import './overrides';
 

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

@@ -1,5 +1,5 @@
 // Submit buttons
-.form-actions {
+.form-actions.form-group {
   border-top: solid 1px #eee;
   margin-top: 1rem;
 
@@ -7,7 +7,9 @@
   align-items: center;
   justify-content: flex-end;
 
-  > * { margin-top: 1rem; }
+  > * {
+    margin: 1rem 0 0 0.5rem;
+  }
 }
 
 // Spinner

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

@@ -0,0 +1,6 @@
+.btn-group {
+  button.dropdown-toggle-split:first-child {
+    border-bottom-right-radius: 0px;
+    border-top-right-radius: 0px;
+  }
+}

data/app/helpers/effective_bootstrap_helper.rb

@@ -1,6 +1,110 @@
 # Boostrap4 Helpers
 
 module EffectiveBootstrapHelper
+  # Button Dropdowns
+  # https://getbootstrap.com/docs/4.0/components/dropdowns/
+  #
+  # = dropdown do
+  #   = dropdown_link_to 'Something', root_path
+  #   = dropdown_divider
+  #   = dropdown_link_to 'Another', root_path
+  #
+  # Button Dropdowns
+  # variations can be :dropup, :dropleft, :dropright
+  # split can be true, false
+  # right is to right align things
+  def dropdown(variation: nil, split: true, btn: 'btn-outline-primary', right: false, &block)
+    raise 'expected a block' unless block_given?
+
+    @_dropdown_link_tos = []; yield
+
+    return @_dropdown_link_tos.first if @_dropdown_link_tos.length <= 1
+
+    retval = if split
+      first = @_dropdown_link_tos.first
+      menu = content_tag(:div, @_dropdown_link_tos[1..-1].join.html_safe, class: ['dropdown-menu', ('dropdown-menu-right' if right)].compact.join(' '))
+      split = content_tag(:button, class: "btn #{btn} dropdown-toggle dropdown-toggle-split", type: 'button', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) do
+        content_tag(:span, 'Toggle Dropdown', class: 'sr-only')
+      end
+
+      content_tag(:div, class: 'btn-group') do
+        content_tag(:div, class: ['btn-group', variation.to_s.presence].compact.join(' '), role: 'group') do
+          [:dropleft].include?(variation) ? (split + menu + first) : (first + split + menu)
+        end
+      end
+    else
+      raise 'split false is unsupported'
+    end
+
+    @_dropdown_link_tos = nil
+
+    retval
+  end
+
+  # This is a special variant of dropdown
+  # dots do
+  #   = dropdown_link_to 'Edit', edit_path(thing)
+  def dots(options = nil, &block)
+    (options ||= {})[:class] = "dropdown dropdown-dots #{options.delete(:class)}".strip
+
+    content_tag(:span, options) do
+      content_tag(:button, class: "btn btn-dots dropdown-toggle #{options.delete(:button_class)}", 'aria-expanded': true, 'aria-haspopup': true, 'data-toggle': 'dropdown', type: 'button') do
+      end + content_tag(:div, capture(&block), class: 'dropdown-menu')
+    end
+  end
+
+  def dots_link_to(label, path, options = {})
+    options[:class] = [options[:class], 'dropdown-item'].compact.join(' ')
+
+    concat link_to(label, path, options)
+  end
+
+  # # Works with dots do and dropdown do
+  def dropdown_link_to(label, path, options = {})
+    unless @_dropdown_link_tos
+      options[:class] = [options[:class], 'dropdown-item'].compact.join(' ')
+      return link_to(label, path, options)
+    end
+
+    if @_dropdown_link_tos.length == 0
+      options[:class] = [options[:class], 'btn btn-outline-primary'].compact.join(' ') unless options[:class].to_s.include?('btn-')
+    else
+      options[:class] = [options[:class], 'dropdown-item'].compact.join(' ')
+    end
+
+    @_dropdown_link_tos << link_to(label, path, options)
+
+    nil
+  end
+
+  # Works with dots ao and dropdown do
+  def dropdown_divider
+    unless @_dropdown_link_tos
+      content_tag(:div, '', class: 'dropdown-divider')
+    else
+      @_dropdown_link_tos << content_tag(:div, '', class: 'dropdown-divider')
+      nil
+    end
+  end
+
+  def list_group(&block)
+    content_tag(:div, yield, class: 'list-group')
+  end
+
+  # List group
+  # = list_group_link_to
+  # Automatically puts in the 'active' class based on request path
+  def list_group_link_to(label, path, opts = {})
+    # Regular link item
+    opts[:class] = if request.fullpath.include?(path)
+      [opts[:class], 'list-group-item active'].compact.join(' ')
+    else
+      [opts[:class], 'list-group-item'].compact.join(' ')
+    end
+
+    link_to(label.to_s, path, opts)
+  end
+
   # Nav links and dropdowns
   # Automatically puts in the 'active' class based on request path
 

data/app/helpers/effective_icons_helper.rb

@@ -13,6 +13,10 @@ module EffectiveIconsHelper
     link_to(icon(svg), url, options)
   end
 
+  def new_icon_to(path, options = {})
+    icon_to('plus', path, { title: 'New' }.merge(options))
+  end
+
   def show_icon_to(path, options = {})
     icon_to('eye', path, { title: 'Show' }.merge(options))
   end

data/app/models/effective/form_builder.rb

@@ -79,6 +79,7 @@ module Effective
     end
 
     def static_field(name, options = {}, &block)
+      options = { value: options } if options.kind_of?(String)
       Effective::FormInputs::StaticField.new(name, options, builder: self).to_html(&block)
     end
 

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

@@ -17,6 +17,10 @@ module Effective
         { input_group: { class: 'input-group' }, prepend: content_tag(:span, icon('calendar'), class: 'input-group-text') }
       end
 
+      def datetime_to_s
+        value&.strftime('%F')
+      end
+
     end
   end
 end

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

@@ -18,7 +18,11 @@ module Effective
       end
 
       def build_input(&block)
-        @builder.super_text_field(name, options[:input])
+        @builder.super_text_field(name, options[:input].merge(value: datetime_to_s))
+      end
+
+      def datetime_to_s
+        value&.strftime('%F %H:%M')
       end
 
       private

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

@@ -21,7 +21,7 @@ module Effective
 
       def build_button_group(&block)
         if buttons?
-          content_tag(:div, yield, id: button_group_id, class: 'btn-group btn-group-toggle', 'data-toggle': 'buttons')
+          content_tag(:div, yield, id: button_group_id, class: 'btn-group btn-group-toggle effective-radios', 'data-toggle': 'buttons')
         else
           yield
         end
@@ -93,7 +93,7 @@ module Effective
 
       def item_label_options
         if buttons?
-          { class: 'btn btn-secondary' }
+          { class: 'btn btn-outline-secondary' }
         elsif custom?
           { class: 'custom-control-label' }
         else

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

@@ -11,10 +11,33 @@ module Effective
       end
 
       def build_input(&block)
-        content = block_given? ? capture(&block) : (options[:input].delete(:value) || value)
+        content = if block_given?
+          capture(&block)
+        elsif options[:input][:value]
+          options[:input].delete(:value)
+        elsif resource_path
+          link_to(value, resource_path, title: value.to_s)
+        else
+          value
+        end
+
         content_tag(:p, content, options[:input].except(:readonly, :required, :value).merge(id: tag_id))
       end
 
+      def resource_path
+        # I don't want to hardcode effective_resources as a dependency of this gem. But it's so useful...
+        return false unless defined?(EffectiveResources)
+
+        return false unless value.kind_of?(ActiveRecord::Base)
+
+        @_resource_path ||= (
+          Effective::Resource.new(value, namespace: @template.controller_path.split('/').first).action_path(:edit) ||
+          Effective::Resource.new(@template.controller_path).action_path(:edit, value) ||
+          Effective::Resource.new(value, namespace: @template.controller_path.split('/').first).action_path(:show) ||
+          Effective::Resource.new(@template.controller_path).action_path(:show, value)
+        )
+      end
+
     end
   end
 end

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

@@ -17,6 +17,10 @@ module Effective
         { input_group: { class: 'input-group' }, prepend: content_tag(:span, icon('clock'), class: 'input-group-text') }
       end
 
+      def datetime_to_s
+        value&.strftime('%H:%M')
+      end
+
     end
   end
 end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,26 +16,26 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Everything you need to get set up with bootstrap 4.
 email:
 - info@codeandeffect.com
@@ -365,6 +379,7 @@ files:
 - 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_date/input.scss
 - app/assets/stylesheets/effective_datetime/bootstrap-datetimepicker.scss
 - app/assets/stylesheets/effective_datetime/input.scss