Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge branch 'master' into updated-gems

Browse source 
Conflicts:
	Gemfile.lock
	app/views/deliveries/_form.html.haml
This commit is contained in:
wvengen 2013-07-17 11:04:28 +02:00
commit eef4626107
32 changed files with 708 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

13
config/initializers/simple_form_bootstrap.rb
View file

@ -36,7 +36,18 @@ SimpleForm.setup do |config|
input.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
end
end
# Do not use the label in tables
config.wrappers :intable, :tag => 'div', :class => 'control-group control-group-intable', :error_class => 'error' do |b|
b.use :html5
b.use :placeholder
b.wrapper :tag => 'div', :class => 'controls controls-intable' do |ba|
ba.use :input
ba.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
ba.use :hint, :wrap_with => { :tag => 'p', :class => 'help-block' }
end
end
# Wrappers for forms and inputs using the Twitter Bootstrap toolkit.
# Check the Bootstrap docs (http://twitter.github.com/bootstrap)
# to learn about the different styles for forms and inputs,