Skip to content

Commit

Permalink
Merge pull request #76 from hron84/fix-input-addons
Browse files Browse the repository at this point in the history
Fix input addons
  • Loading branch information
stouset committed Mar 18, 2013
2 parents ecccd31 + 119e472 commit 4ae2f41
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/twitter_bootstrap_form_for/form_builder.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -94,9 +94,10 @@ def inline(label = nil, &block)
self.div_wrapper(attribute, :class => 'control-group') do self.div_wrapper(attribute, :class => 'control-group') do
template.concat self.label(attribute, label) if label template.concat self.label(attribute, label) if label
template.concat template.content_tag(:div, :class => classes.join(' ')) { template.concat template.content_tag(:div, :class => classes.join(' ')) {
block.call if block.present? and classes.include?('input-prepend')
template.concat super(attribute, *(args << options)) template.concat super(attribute, *(args << options))
template.concat error_span(attribute) template.concat error_span(attribute)
block.call if block.present? block.call if block.present? and classes.include?('input-append')
} }
end end
end end
Expand Down

0 comments on commit 4ae2f41

Please sign in to comment.