From 1d85b03463192ffa89eb77b6878ae13ff5dbd353 Mon Sep 17 00:00:00 2001 From: Lucas Mazza Date: Fri, 8 Nov 2013 10:38:06 -0200 Subject: [PATCH] Update Bootstrap references URLs and name For what is worth we are still supporting v2, so its worth to keep this up to date. Closes #925. --- README.md | 8 ++++---- lib/generators/simple_form/install_generator.rb | 4 ++-- lib/generators/simple_form/templates/README | 2 +- .../config/initializers/simple_form_bootstrap.rb | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index bf216aa2..7b3dbcab 100644 --- a/README.md +++ b/README.md @@ -43,23 +43,23 @@ Also, if you want to use the country select, you will need the gem 'country_select' ``` -### Twitter Bootstrap +### Bootstrap -**Simple Form** can be easily integrated to the [Twitter Bootstrap](http://twitter.github.com/bootstrap). +**Simple Form** can be easily integrated to the [Bootstrap](http://getbootstrap.com/2.3.2/) 2.3. To do that you have to use the `bootstrap` option in the install generator, like this: ```console rails generate simple_form:install --bootstrap ``` -You have to be sure that you added a copy of the [Twitter Bootstrap](http://twitter.github.com/bootstrap) +You have to be sure that you added a copy of the [Bootstrap](http://getbootstrap.com/2.3.2/) assets on your application. For more information see the generator output, our [example application code](https://github.com/rafaelfranca/simple_form-bootstrap) and [the live example app](http://simple-form-bootstrap.plataformatec.com.br/). -**NOTE**: **Simple Form** integration requires Twitter Bootstrap version 2.0 or higher. +**NOTE**: **Simple Form** integration requires Bootstrap version 2.3. ### Zurb Foundation 3 diff --git a/lib/generators/simple_form/install_generator.rb b/lib/generators/simple_form/install_generator.rb index fbb0e91f..89af6640 100644 --- a/lib/generators/simple_form/install_generator.rb +++ b/lib/generators/simple_form/install_generator.rb @@ -4,12 +4,12 @@ module SimpleForm desc "Copy SimpleForm default files" source_root File.expand_path('../templates', __FILE__) class_option :template_engine, desc: 'Template engine to be invoked (erb, haml or slim).' - class_option :bootstrap, type: :boolean, desc: 'Add the Twitter Bootstrap wrappers to the SimpleForm initializer.' + class_option :bootstrap, type: :boolean, desc: 'Add the Bootstrap wrappers to the SimpleForm initializer.' class_option :foundation, type: :boolean, desc: 'Add the Zurb Foundation 3 wrappers to the SimpleForm initializer.' def info_bootstrap return if options.bootstrap? || options.foundation? - puts "SimpleForm 2 supports Twitter Bootstrap and Zurb Foundation 3. If you want "\ + puts "SimpleForm 2 supports Bootstrap and Zurb Foundation 3. If you want "\ "a configuration that is compatible with one of these frameworks, then please " \ "re-run this generator with --bootstrap or --foundation as an option." end diff --git a/lib/generators/simple_form/templates/README b/lib/generators/simple_form/templates/README index 1a25db3d..25ed9174 100644 --- a/lib/generators/simple_form/templates/README +++ b/lib/generators/simple_form/templates/README @@ -1,7 +1,7 @@ =============================================================================== Be sure to have a copy of the Bootstrap stylesheet available on your - application, you can get it on http://twitter.github.com/bootstrap. + application, you can get it on http://getbootstrap.com/2.3.2/. Inside your views, use the 'simple_form_for' with one of the Bootstrap form classes, '.form-horizontal', '.form-inline', '.form-search' or diff --git a/lib/generators/simple_form/templates/config/initializers/simple_form_bootstrap.rb b/lib/generators/simple_form/templates/config/initializers/simple_form_bootstrap.rb index ad4ca74c..26ba7cef 100644 --- a/lib/generators/simple_form/templates/config/initializers/simple_form_bootstrap.rb +++ b/lib/generators/simple_form/templates/config/initializers/simple_form_bootstrap.rb @@ -37,8 +37,8 @@ SimpleForm.setup do |config| end end - # Wrappers for forms and inputs using the Twitter Bootstrap toolkit. - # Check the Bootstrap docs (http://twitter.github.com/bootstrap) + # Wrappers for forms and inputs using the Bootstrap toolkit. + # Check the Bootstrap docs (http://getbootstrap.com/2.3.2/) # to learn about the different styles for forms and inputs, # buttons and other elements. config.default_wrapper = :bootstrap