effective_form_inputs 1.1.15 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 937725fe7bfe1c08ac559edcacdb52ea6ee2a37c
-  data.tar.gz: 06bf13049aeec498038a5c306bbabc0b8f498bae
+  metadata.gz: 90f5076595ba940118763164668a2d02f0fcb5f9
+  data.tar.gz: b993340a53be0274d77d2bf36200bab4e477da78
 SHA512:
-  metadata.gz: 5cde7d118be3449afde95fa63650d181963e88d2cc6e5bbead22773d609326b457716b231234761fb82aaf98d4376910560e3e1e29ceb1a26c5591084e423d50
-  data.tar.gz: 4514ab3d6a80d8bb9d2a55d54bc62ad65ccc4c7d40e19a3e61e0e7c2d7c617b8d49fcb75f59a0990efa30f51992f02799859ecbf8c4311f9212e298ea886f43a
+  metadata.gz: f056ce1b75729929c346f35650f4e355a51ec48b5e1f51de0076d5bd6693e4fb08bec5719c9e8332c6983bcae5ce15ff874c717d1c7fcdfb7556442bd32ed31e
+  data.tar.gz: a0c6003793fb2c9d11aff6a91940a882ffa9bbe10c50c57416e3974f48a3713393984373c1fb365a560be0448e9bad9212a8edfb4f44b6bd2da345f47fb233c2

data/app/helpers/effective_bootstrap3_helper.rb

@@ -0,0 +1,121 @@
+module EffectiveBootstrap3Helper
+
+  # An effective Bootstrap3 menu DSL
+  # Automatically puts in the 'active' class based on request path
+
+  # %ul.nav.navbar-nav.navbar-right
+  #   = nav_link_to 'Sign In', new_user_session_path
+  #   = nav_dropdown 'Settings' do
+  #     = nav_link_to 'Account Settings', user_settings_path
+  #     %li.divider
+  #     = nav_link_to 'Sign In', new_user_session_path, method: :delete
+  def nav_link_to(label, path, opts = {})
+    content_tag(:li, class: ('active' if request.fullpath.include?(path))) do
+      link_to(label, path, opts)
+    end
+  end
+
+  def nav_dropdown(label, link_class: [], list_class: [], &block)
+    raise 'expected a block' unless block_given?
+
+    content_tag(:li, class: 'dropdown') do
+      content_tag(:a, class: 'dropdown-toggle', href: '#', 'data-toggle': 'dropdown', role: 'button', 'aria-haspopup': 'true', 'aria-expanded': 'false') do
+        label.html_safe + content_tag(:span, '', class: 'caret')
+      end + content_tag(:ul, class: 'dropdown-menu') { yield }
+    end
+  end
+
+  # An effective Bootstrap3 tabpanel DSL
+  # Inserts both the tablist and the tabpanel
+
+  # = tabs do
+  #   = tab 'Imports' do
+  #     %p Imports
+
+  #   = tab 'Exports' do
+  #     %p Exports
+
+  # If you pass active 'label' it will make that tab active. Otherwise first.
+  def tabs(active: nil, panel: {}, list: {}, content: {}, &block)
+    raise 'expected a block' unless block_given?
+
+    @_tab_mode = :panel
+    @_tab_active = (active || :first)
+
+    content_tag(:div, {role: 'tabpanel'}.merge(panel)) do
+      content_tag(:ul, {class: 'nav nav-tabs', role: 'tablist'}.merge(list)) { yield } # Yield to tab the first time
+    end + content_tag(:div, {class: 'tab-content'}.merge(content)) do
+      @_tab_mode = :content
+      @_tab_active = (active || :first)
+      yield # Yield tot ab the second time
+    end
+  end
+
+  def tab(label, controls = nil, &block)
+    controls ||= label.to_s.parameterize.gsub('_', '-')
+    controls = controls[1..-1] if controls[0] == '#'
+
+    active = (@_tab_active == :first || @_tab_active == label)
+
+    @_tab_active = nil if @_tab_active == :first
+
+    if @_tab_mode == :panel # Inserting the label into the tabpanel top
+      content_tag(:li, role: 'presentation', class: ('active' if active)) do
+        content_tag(:a, href: '#' + controls, 'aria-controls': controls, 'data-toggle': 'tab', role: 'tab') do
+          label
+        end
+      end
+    else # Inserting the content into the tab itself
+      content_tag(:div, id: controls, class: "tab-pane#{' active' if active}", role: 'tabpanel') do
+        yield
+      end
+    end
+  end
+
+  ### Icon Helpers for actions_column or elsewhere
+  def show_icon_to(path, options = {})
+    glyphicon_to('eye-open', path, {title: 'Show'}.merge(options))
+  end
+
+  def edit_icon_to(path, options = {})
+    glyphicon_to('edit', path, {title: 'Edit'}.merge(options))
+  end
+
+  def destroy_icon_to(path, options = {})
+    defaults = {title: 'Destroy', data: {method: :delete, confirm: 'Delete this item?'}}
+    glyphicon_to('trash', path, defaults.merge(options))
+  end
+
+  def settings_icon_to(path, options = {})
+    glyphicon_to('cog', path, {title: 'Settings'}.merge(options))
+  end
+
+  def ok_icon_to(path, options = {})
+    glyphicon_to('ok', path, {title: 'OK'}.merge(options))
+  end
+
+  def approve_icon_to(path, options = {})
+    glyphicon_to('ok', path, {title: 'Approve'}.merge(options))
+  end
+
+  def remove_icon_to(path, options = {})
+    glyphicon_to('remove', path, {title: 'Remove'}.merge(options))
+  end
+
+  def glyphicon_tag(icon, options = {})
+    if icon.to_s.start_with?('glyphicon-')
+      content_tag(:span, '', {class: "glyphicon #{icon}"}.merge(options))
+    else
+      content_tag(:span, '', {class: "glyphicon glyphicon-#{icon}"}.merge(options))
+    end
+  end
+
+  def glyphicon_to(icon, path, options = {})
+    content_tag(:a, options.merge(href: path)) do
+      glyphicon_tag(icon)
+    end
+  end
+  alias_method :bootstrap_icon_to, :glyphicon_to
+  alias_method :glyph_icon_to, :glyphicon_to
+
+end

data/app/models/inputs/effective_radio_buttons/input.rb

@@ -37,6 +37,7 @@ module Inputs
 
         if options[:item_wrapper_tag]
           active = (builder.object.send(options[:value_method]).to_s == value.to_s)
+          #active ||= (builder.object.send(options[:value_method]).to_s == Array(value).first.to_s)
 
           content_tag(options[:item_wrapper_tag], item,
             class: [
@@ -79,7 +80,7 @@ module Inputs
       end
 
       def value
-        options[:checked] || super
+        Array(options[:checked] || super).first
       end
 
       def options

data/app/models/inputs/effective_time_picker/input.rb

@@ -4,7 +4,7 @@ module Inputs
       delegate :content_tag, :text_field_tag, :to => :@template
 
       def default_input_js
-        {format: 'HH:mm', showClear: true}
+        { format: 'HH:mm', showClear: true, useCurrent: 'hour' }
       end
 
       def default_input_html

data/lib/effective_form_inputs/engine.rb

@@ -17,10 +17,17 @@ module EffectiveFormInputs
       Rails.application.config.to_prepare do
         ActiveSupport.on_load :action_controller do
           helper EffectiveFormInputsHelper
+          helper EffectiveBootstrap3Helper
         end
       end
     end
 
-
+    initializer 'effective_form_inputs.check_for_effective_bootstrap' do |app|
+      Rails.application.config.to_prepare do
+        if defined?(EffectiveBootstrap)
+          raise 'effective_form_inputs and effective_bootstrap cannot be run alongside eachother. Sorry.'
+        end
+      end
+    end
   end
 end

data/lib/effective_form_inputs/version.rb

@@ -1,3 +1,3 @@
 module EffectiveFormInputs
-  VERSION = '1.1.15'.freeze
+  VERSION = '1.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_form_inputs
 version: !ruby/object:Gem::Version
-  version: 1.1.15
+  version: 1.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,6 +87,7 @@ files:
 - app/assets/stylesheets/effective_select/overrides.scss
 - app/assets/stylesheets/effective_select/select2.css
 - app/assets/stylesheets/effective_time_picker/input.scss
+- app/helpers/effective_bootstrap3_helper.rb
 - app/helpers/effective_form_inputs_helper.rb
 - app/models/effective/form_builder_inputs.rb
 - app/models/effective/form_input.rb
@@ -142,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Collection of Form Inputs