bootstrap_forms 1.0.2 → 1.0.3

data/README.markdown

@@ -69,12 +69,12 @@ See description above...
 = f.collection_radio_buttons :primary_category_id, Category.all, :id, :name
 ```
 
-Uneditable Field
+Uneditable Input
 ----------------
-Bootstrap Forms adds another helper method that generates the necessary markup for uneditable fields:
+Bootstrap Forms adds another helper method that generates the necessary markup for uneditable inputs:
 
 ```haml
-= f.uneditable_field :name
+= f.uneditable_input :name
 ```
 
 yields:

data/bootstrap_forms.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "bootstrap_forms"
-  s.version     = "1.0.2"
+  s.version     = "1.0.3"
   s.author      = "Seth Vargo"
   s.email       = "sethvargo@gmail.com"
   s.homepage    = "https://github.com/sethvargo/bootstrap_forms"

data/lib/bootstrap_forms/form_builder.rb

@@ -1,12 +1,12 @@
 module BootstrapForms
   class FormBuilder < ActionView::Helpers::FormBuilder
-    delegate :content_tag, :hidden_field_tag, :check_box_tag, :radio_button_tag, :link_to, :to => :@template
+    delegate :content_tag, :hidden_field_tag, :check_box_tag, :radio_button_tag, :button_tag, :link_to, :to => :@template
 
     def error_messages
       if object.errors.full_messages.any?
-        content_tag(:div, :class => 'alert alert-error') do
-          link_to('&times;'.html_safe, '#', {:class => 'close', :data => { :dismiss => "alert" }}) +
-          content_tag(:p, I18n.t('bootstrap_forms.errors.header', :model => object.class.model_name.humanize)) +
+        content_tag(:div, :class => 'alert alert-block alert-error') do
+          link_to('&times;'.html_safe, '#', {:class => 'close', :data => { :dismiss => 'alert' }}) +
+          content_tag(:h4, I18n.t('bootstrap_forms.errors.header', :model => object.class.model_name.humanize), :class => 'alert-heading') +
           content_tag(:ul) do
             object.errors.full_messages.map do |message|
               content_tag(:li, message)
@@ -29,7 +29,7 @@ module BootstrapForms
         @options = args.extract_options!
         @args = args
 
-        clearfix_div do
+        control_group_div do
           label_field + input_div do
             extras { super(name, *(@args << @options)) }
           end
@@ -42,7 +42,7 @@ module BootstrapForms
       @options = args.extract_options!
       @args = args
 
-      clearfix_div do
+      control_group_div do
         input_div do
           label(@name, :class => [ 'checkbox', required_class ].compact.join(' ')) do
             extras { super(name, *(@args << @options)) + object.class.human_attribute_name(name) }
@@ -56,23 +56,19 @@ module BootstrapForms
       @options = args.extract_options!
       @args = args
 
-      clearfix_div do
-        label_field + input_div do
-          extras do
-            content_tag(:ul, :class => 'inputs-list') do
-              records.collect do |record|
-                element_id = "#{object_name}_#{attribute}_#{record.send(record_id)}"
-                checkbox = check_box_tag("#{object_name}[#{attribute}][]", record.send(record_id), object.send(attribute).include?(record.send(record_id)), :id => element_id)
-
-                content_tag(:li) do
-                  content_tag(:label) do
-                    checkbox + content_tag(:span, record.send(record_name))
-                  end
-                end
-              end.join('').html_safe
-            end
+      control_group_div do
+        label_field + extras do
+          content_tag(:div, :class => 'controls') do
+            records.collect do |record|
+              element_id = "#{object_name}_#{attribute}_#{record.send(record_id)}"
+              checkbox = check_box_tag("#{object_name}[#{attribute}][]", record.send(record_id), [object.send(attribute)].flatten.include?(record.send(record_id)), @options.merge({:id => element_id}))
+
+              content_tag(:label, :class => ['checkbox', ('inline' if @options[:inline])].compact.join(' ')) do
+                checkbox + content_tag(:span, record.send(record_name))
+              end
+            end.join('').html_safe
           end
-        end + hidden_field_tag("#{object_name}[#{attribute}][]")
+        end
       end
     end
 
@@ -81,32 +77,28 @@ module BootstrapForms
       @options = args.extract_options!
       @args = args
 
-      clearfix_div do
-        label_field + input_div do
-          extras do
-            content_tag(:ul, :class => 'inputs-list') do
-              records.collect do |record|
-                element_id = "#{object_name}_#{attribute}_#{record.send(record_id)}"
-                radiobutton = radio_button_tag("#{object_name}[#{attribute}][]", record.send(record_id), object.send(attribute) == record.send(record_id), :id => element_id)
-
-                content_tag(:li) do
-                  content_tag(:label) do
-                    radiobutton + content_tag(:span, record.send(record_name))
-                  end
-                end
-              end.join('').html_safe
-            end
+      control_group_div do
+        label_field + extras do
+          content_tag(:div, :class => 'controls') do
+            records.collect do |record|
+              element_id = "#{object_name}_#{attribute}_#{record.send(record_id)}"
+              radiobutton = radio_button_tag("#{object_name}[#{attribute}][]", record.send(record_id), object.send(attribute) == record.send(record_id), @options.merge({:id => element_id}))
+
+              content_tag(:label, :class => ['radio', ('inline' if @options[:inline])].compact.join(' ')) do
+                radiobutton + content_tag(:span, record.send(record_name))
+              end
+            end.join('').html_safe
           end
         end
       end
     end
 
-    def uneditable_field(name, *args)
+    def uneditable_input(name, *args)
       @name = name
       @options = args.extract_options!
       @args = args
 
-      clearfix_div do
+      control_group_div do
         label_field + input_div do
           extras do
             content_tag(:span, :class => 'uneditable-input') do
@@ -125,12 +117,12 @@ module BootstrapForms
       @options[:class] = 'btn btn-primary'
 
       content_tag(:div, :class => 'form-actions') do
-        super(name, *(args << @options)) + ' ' + link_to(I18n.t('bootstrap_forms.buttons.cancel'), @options[:back_path] || :back, :class => 'btn cancel')
+        super(name, *(args << @options)) + ' ' + button_tag(I18n.t('bootstrap_forms.buttons.cancel'), :type => 'reset', :class => 'btn cancel')
       end
     end
 
     private
-    def clearfix_div(&block)
+    def control_group_div(&block)
       @options[:error] = object.errors[@name].collect{|e| "#{@options[:label] || @name} #{e}".humanize}.join(', ') unless object.errors[@name].empty?
 
       klasses = ['control-group']
@@ -155,15 +147,12 @@ module BootstrapForms
     end
 
     def label_field(&block)
-      label(@name, block_given? ? block : @options[:label], :class => [ 'control-label', required_class ].compact.join(' '))
+      label(@name, block_given? ? block : @options[:label], :class => ['control-label', required_class].compact.join(' '))
     end
 
     def required_class
-      if object.class.validators_on(@name).any? { |v| v.kind_of? ActiveModel::Validations::PresenceValidator }
-        'required'
-      else
-        nil
-      end
+      'required' if object.class.validators_on(@name).any? { |v| v.kind_of? ActiveModel::Validations::PresenceValidator }
+      nil
     end
 
     %w(help_inline error success warning help_block append prepend).each do |method_name|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_forms
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000 Z
+date: 2012-02-08 00:00:00.000000000 Z
 dependencies: []
 description: Bootstrap Forms makes Twitter's Bootstrap on Rails easy to use by creating
   helpful form builders that minimize markup in your views.