Skip to content

Use Bootstrap 4 radio button classes. #409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattbrictson merged 1 commit into from
Jan 28, 2018
Merged

Use Bootstrap 4 radio button classes. #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions lib/bootstrap_form/form_builder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,11 @@ def check_box_with_bootstrap(name, options = {}, checked_value = "1", unchecked_
def radio_button_with_bootstrap(name, value, *args)
options = args.extract_options!.symbolize_keys!
radio_options = options.except(:label, :label_class, :help, :inline, :custom)
radio_options[:class] = ["custom-control-input", options[:class]].compact.join(' ') if options[:custom]
if options[:custom]
radio_options[:class] = ["custom-control-input", options[:class]].compact.join(' ')
else
radio_options[:class] = ["form-check-input", options[:class]].compact.join(' ')
end
args << radio_options
radio_html = radio_button_without_bootstrap(name, value, *args)

Expand All @@ -172,14 +176,14 @@ def radio_button_with_bootstrap(name, value, *args)
radio_html.concat(label(name, options[:label], value: value, class: ["custom-control-label", label_class].compact.join(" ")))
end
else
label_class = " #{label_class}" if label_class
if options[:inline]
label_class = " #{label_class}" if label_class
radio_html
.concat(label(name, options[:label], { class: "radio-inline#{disabled_class}#{label_class}", value: value }.merge(options[:id].present? ? { for: options[:id] } : {})))
.concat(label(name, options[:label], { class: "form-check-label#{label_class}", value: value }.merge(options[:id].present? ? { for: options[:id] } : {})))
else
content_tag(:div, class: "form-check#{disabled_class}") do
radio_html
.concat(label(name, options[:label], { value: value, class: label_class }.merge(options[:id].present? ? { for: options[:id] } : {})))
.concat(label(name, options[:label], { class: "form-check-label#{label_class}", value: value }.merge(options[:id].present? ? { for: options[:id] } : {})))
end
end
end
Expand Down
104 changes: 52 additions & 52 deletions test/bootstrap_radio_button_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ class BootstrapRadioButtonTest < ActionView::TestCase
test "radio_button is wrapped correctly" do
expected = <<-HTML.strip_heredoc
<div class="form-check">
<input id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label for="user_misc_1">
<input class="form-check-input" id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label class="form-check-label" for="user_misc_1">
This is a radio button
</label>
</div>
Expand All @@ -20,8 +20,8 @@ class BootstrapRadioButtonTest < ActionView::TestCase
test "radio_button disabled label is set correctly" do
expected = <<-HTML.strip_heredoc
<div class="form-check disabled">
<input disabled="disabled" id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label for="user_misc_1">
<input class="form-check-input" disabled="disabled" id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label class="form-check-label" for="user_misc_1">
This is a radio button
</label>
</div>
Expand All @@ -32,8 +32,8 @@ class BootstrapRadioButtonTest < ActionView::TestCase
test "radio_button label class is set correctly" do
expected = <<-HTML.strip_heredoc
<div class="form-check">
<input id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label class="btn" for="user_misc_1">
<input class="form-check-input" id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label class="form-check-label btn" for="user_misc_1">
This is a radio button
</label>
</div>
Expand All @@ -44,8 +44,8 @@ class BootstrapRadioButtonTest < ActionView::TestCase
test "radio_button 'id' attribute is used to specify label 'for' attribute" do
expected = <<-HTML.strip_heredoc
<div class="form-check">
<input id="custom_id" name="user[misc]" type="radio" value="1" />
<label for="custom_id">
<input class="form-check-input" id="custom_id" name="user[misc]" type="radio" value="1" />
<label class="form-check-label" for="custom_id">
This is a radio button
</label>
</div>
Expand All @@ -55,8 +55,8 @@ class BootstrapRadioButtonTest < ActionView::TestCase

test "radio_button inline label is set correctly" do
expected = <<-HTML.strip_heredoc
<input id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label class="radio-inline" for="user_misc_1">
<input class="form-check-input" id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label class="form-check-label" for="user_misc_1">
This is a radio button
</label>
HTML
Expand All @@ -65,8 +65,8 @@ class BootstrapRadioButtonTest < ActionView::TestCase

test "radio_button disabled inline label is set correctly" do
expected = <<-HTML.strip_heredoc
<input disabled="disabled" id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label class="radio-inline disabled" for="user_misc_1">
<input class="form-check-input" disabled="disabled" id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label class="form-check-label" for="user_misc_1">
This is a radio button
</label>
HTML
Expand All @@ -75,8 +75,8 @@ class BootstrapRadioButtonTest < ActionView::TestCase

test "radio_button inline label class is set correctly" do
expected = <<-HTML.strip_heredoc
<input id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label class="radio-inline btn" for="user_misc_1">
<input class="form-check-input" id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label class="form-check-label btn" for="user_misc_1">
This is a radio button
</label>
HTML
Expand All @@ -89,8 +89,8 @@ class BootstrapRadioButtonTest < ActionView::TestCase
<div class="form-group">
<label for="user_misc">This is a radio button collection</label>
<div class="form-check">
<input id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label for="user_misc_1">
<input class="form-check-input" id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label class="form-check-label" for="user_misc_1">
Foobar
</label>
</div>
Expand All @@ -107,12 +107,12 @@ class BootstrapRadioButtonTest < ActionView::TestCase
<div class="form-group">
<label for="user_misc">Misc</label>
<div class="form-check">
<input id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label for="user_misc_1"> Foo</label>
<input class="form-check-input" id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label class="form-check-label" for="user_misc_1"> Foo</label>
</div>
<div class="form-check">
<input id="user_misc_2" name="user[misc]" type="radio" value="2" />
<label for="user_misc_2"> Bar</label>
<input class="form-check-input" id="user_misc_2" name="user[misc]" type="radio" value="2" />
<label class="form-check-label" for="user_misc_2"> Bar</label>
</div>
</div>
HTML
Expand All @@ -125,10 +125,10 @@ class BootstrapRadioButtonTest < ActionView::TestCase
expected = <<-HTML.strip_heredoc
<div class="form-group">
<label for="user_misc">Misc</label>
<input id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label class="radio-inline" for="user_misc_1"> Foo</label>
<input id="user_misc_2" name="user[misc]" type="radio" value="2" />
<label class="radio-inline" for="user_misc_2"> Bar</label>
<input class="form-check-input" id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label class="form-check-label" for="user_misc_1"> Foo</label>
<input class="form-check-input" id="user_misc_2" name="user[misc]" type="radio" value="2" />
<label class="form-check-label" for="user_misc_2"> Bar</label>
</div>
HTML

Expand All @@ -141,12 +141,12 @@ class BootstrapRadioButtonTest < ActionView::TestCase
<div class="form-group">
<label for="user_misc">Misc</label>
<div class="form-check">
<input checked="checked" id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label for="user_misc_1"> Foo</label>
<input class="form-check-input" checked="checked" id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label class="form-check-label" for="user_misc_1"> Foo</label>
</div>
<div class="form-check">
<input id="user_misc_2" name="user[misc]" type="radio" value="2" />
<label for="user_misc_2"> Bar</label>
<input class="form-check-input" id="user_misc_2" name="user[misc]" type="radio" value="2" />
<label class="form-check-label" for="user_misc_2"> Bar</label>
</div>
</div>
HTML
Expand All @@ -160,8 +160,8 @@ class BootstrapRadioButtonTest < ActionView::TestCase
<div class="form-group">
<label for="user_misc">This is a radio button collection</label>
<div class="form-check">
<input id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label for="user_misc_1"> rabooF</label>
<input class="form-check-input" id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label class="form-check-label" for="user_misc_1"> rabooF</label>
</div>
<small class="form-text text-muted">With a help!</small>
</div>
Expand All @@ -176,8 +176,8 @@ class BootstrapRadioButtonTest < ActionView::TestCase
<div class="form-group">
<label for="user_misc">This is a radio button collection</label>
<div class="form-check">
<input id="user_misc_address_1" name="user[misc]" type="radio" value="address_1" />
<label for="user_misc_address_1"> Foobar</label>
<input class="form-check-input" id="user_misc_address_1" name="user[misc]" type="radio" value="address_1" />
<label class="form-check-label" for="user_misc_address_1"> Foobar</label>
</div>
<small class="form-text text-muted">With a help!</small>
</div>
Expand All @@ -192,12 +192,12 @@ class BootstrapRadioButtonTest < ActionView::TestCase
<div class="form-group">
<label for="user_misc">Misc</label>
<div class="form-check">
<input id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label for="user_misc_1"> ooF</label>
<input class="form-check-input" id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label class="form-check-label" for="user_misc_1"> ooF</label>
</div>
<div class="form-check">
<input id="user_misc_2" name="user[misc]" type="radio" value="2" />
<label for="user_misc_2"> raB</label>
<input class="form-check-input" id="user_misc_2" name="user[misc]" type="radio" value="2" />
<label class="form-check-label" for="user_misc_2"> raB</label>
</div>
</div>
HTML
Expand All @@ -211,12 +211,12 @@ class BootstrapRadioButtonTest < ActionView::TestCase
<div class="form-group">
<label for="user_misc">Misc</label>
<div class="form-check">
<input id="user_misc_address_1" name="user[misc]" type="radio" value="address_1" />
<label for="user_misc_address_1"> Foo</label>
<input class="form-check-input" id="user_misc_address_1" name="user[misc]" type="radio" value="address_1" />
<label class="form-check-label" for="user_misc_address_1"> Foo</label>
</div>
<div class="form-check">
<input id="user_misc_address_2" name="user[misc]" type="radio" value="address_2" />
<label for="user_misc_address_2"> Bar</label>
<input class="form-check-input" id="user_misc_address_2" name="user[misc]" type="radio" value="address_2" />
<label class="form-check-label" for="user_misc_address_2"> Bar</label>
</div>
</div>
HTML
Expand All @@ -230,8 +230,8 @@ class BootstrapRadioButtonTest < ActionView::TestCase
<div class="form-group">
<label for="user_misc">This is a radio button collection</label>
<div class="form-check">
<input id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label for="user_misc_1"> rabooF</label>
<input class="form-check-input" id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label class="form-check-label" for="user_misc_1"> rabooF</label>
</div>
<small class="form-text text-muted">With a help!</small>
</div>
Expand All @@ -246,8 +246,8 @@ class BootstrapRadioButtonTest < ActionView::TestCase
<div class="form-group">
<label for="user_misc">This is a radio button collection</label>
<div class="form-check">
<input id="user_misc_address_1" name="user[misc]" type="radio" value="address_1" />
<label for="user_misc_address_1"> Foobar</label>
<input class="form-check-input" id="user_misc_address_1" name="user[misc]" type="radio" value="address_1" />
<label class="form-check-label" for="user_misc_address_1"> Foobar</label>
</div>
<small class="form-text text-muted">With a help!</small>
</div>
Expand All @@ -262,12 +262,12 @@ class BootstrapRadioButtonTest < ActionView::TestCase
<div class="form-group">
<label for="user_misc">Misc</label>
<div class="form-check">
<input id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label for="user_misc_1"> ooF</label>
<input class="form-check-input" id="user_misc_1" name="user[misc]" type="radio" value="1" />
<label class="form-check-label" for="user_misc_1"> ooF</label>
</div>
<div class="form-check">
<input id="user_misc_2" name="user[misc]" type="radio" value="2" />
<label for="user_misc_2"> raB</label>
<input class="form-check-input" id="user_misc_2" name="user[misc]" type="radio" value="2" />
<label class="form-check-label" for="user_misc_2"> raB</label>
</div>
</div>
HTML
Expand All @@ -281,12 +281,12 @@ class BootstrapRadioButtonTest < ActionView::TestCase
<div class="form-group">
<label for="user_misc">Misc</label>
<div class="form-check">
<input id="user_misc_address_1" name="user[misc]" type="radio" value="address_1" />
<label for="user_misc_address_1"> Foo</label>
<input class="form-check-input" id="user_misc_address_1" name="user[misc]" type="radio" value="address_1" />
<label class="form-check-label" for="user_misc_address_1"> Foo</label>
</div>
<div class="form-check">
<input id="user_misc_address_2" name="user[misc]" type="radio" value="address_2" />
<label for="user_misc_address_2"> Bar</label>
<input class="form-check-input" id="user_misc_address_2" name="user[misc]" type="radio" value="address_2" />
<label class="form-check-label" for="user_misc_address_2"> Bar</label>
</div>
</div>
HTML
Expand Down