Skip to content
This repository has been archived by the owner on Aug 13, 2019. It is now read-only.

Commit

Permalink
Revert "Update simple_form to 2.0.4"
Browse files Browse the repository at this point in the history
This reverts commit baa3a6e.
  • Loading branch information
Blaž Hrastnik committed Dec 9, 2012
1 parent baa3a6e commit 19339e9
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 126 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ gem "kronic", "~> 1.1.3"
gem "nokogiri", "~> 1.5.5"
gem "rake"
gem "RedCloth", "~> 4.2.9"
gem "simple_form", "~> 2.0.4"
gem "simple_form", "~> 1.2.2"
gem "validates_timeliness", "~> 3.0.14"
gem "yajl-ruby"
gem "thin", "~> 1.5.0"
Expand Down
6 changes: 2 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,7 @@ GEM
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
simple_form (2.0.4)
actionpack (~> 3.0)
activemodel (~> 3.0)
simple_form (1.2.2)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
Expand Down Expand Up @@ -230,7 +228,7 @@ DEPENDENCIES
rake
rspec-rails
sass-rails (~> 3.2.5)
simple_form (~> 2.0.4)
simple_form (~> 1.2.2)
sqlite3
steak
thin (~> 1.5.0)
Expand Down
138 changes: 24 additions & 114 deletions config/initializers/simple_form.rb
Original file line number Diff line number Diff line change
@@ -1,126 +1,45 @@
# Use this setup block to configure all options available in SimpleForm.
SimpleForm.setup do |config|
# Wrappers are used by the form builder to generate a
# complete input. You can remove any component from the
# wrapper, change the order or even add your own to the
# stack. The options given below are used to wrap the
# whole input.
config.wrappers :default, :class => :input,
:hint_class => :field_with_hint, :error_class => :field_with_errors do |b|
## Extensions enabled by default
# Any of these extensions can be disabled for a
# given input by passing: `f.input EXTENSION_NAME => false`.
# You can make any of these extensions optional by
# renaming `b.use` to `b.optional`.

# Determines whether to use HTML5 (:email, :url, ...)
# and required attributes
b.use :html5

# Calculates placeholders automatically from I18n
# You can also pass a string as f.input :placeholder => "Placeholder"
b.use :placeholder

## Optional extensions
# They are disabled unless you pass `f.input EXTENSION_NAME => :lookup`
# to the input. If so, they will retrieve the values from the model
# if any exists. If you want to enable the lookup for any of those
# extensions by default, you can change `b.optional` to `b.use`.

# Calculates maxlength from length validations for string inputs
b.optional :maxlength

# Calculates pattern from format validations for string inputs
b.optional :pattern

# Calculates min and max from length validations for numeric inputs
b.optional :min_max

# Calculates readonly automatically from readonly attributes
b.optional :readonly

## Inputs
b.use :label_input
b.use :hint, :wrap_with => { :tag => :span, :class => :hint }
b.use :error, :wrap_with => { :tag => :span, :class => :error }
end

# The default wrapper to be used by the FormBuilder.
config.default_wrapper = :default

# Define the way to render check boxes / radio buttons with labels.
# Defaults to :nested for bootstrap config.
# :inline => input + label
# :nested => label > input
config.boolean_style = :nested

# Default class for buttons
config.button_class = 'btn'

# Method used to tidy up errors. Specify any Rails Array method.
# :first lists the first message for each field.
# Use :to_sentence to list all errors for each field.
# config.error_method = :first

# Default tag used for error notification helper.
config.error_notification_tag = :div
# Components used by the form builder to generate a complete input. You can remove
# any of them, change the order, or even add your own components to the stack.
# config.components = [ :label_input, :hint, :error ]

# CSS class to add for error notification helper.
config.error_notification_class = 'alert alert-error'
# Default tag used on hints.
# config.hint_tag = :span

# ID to add for error notification helper.
# config.error_notification_id = nil
# Default tag used on errors.
# config.error_tag = :span

# Series of attempts to detect a default label method for collection.
# config.collection_label_methods = [ :to_label, :name, :title, :to_s ]

# Series of attempts to detect a default value method for collection.
# config.collection_value_methods = [ :id, :to_s ]
# Method used to tidy up errors.
# config.error_method = :first

# You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
# config.collection_wrapper_tag = nil
# Default tag used for error notification helper.
# config.error_notification_tag = :p

# You can define the class to use on all collection wrappers. Defaulting to none.
# config.collection_wrapper_class = nil
# You can wrap all inputs in a pre-defined tag.
# config.wrapper_tag = :div

# You can wrap each item in a collection of radio/check boxes with a tag,
# defaulting to :span. Please note that when using :boolean_style = :nested,
# SimpleForm will force this option to be a label.
# config.item_wrapper_tag = :span
# CSS class to add to all wrapper tags.
# config.wrapper_class = :input

# You can define a class to use in all item wrappers. Defaulting to none.
# config.item_wrapper_class = nil
# CSS class to add to the wrapper if the field has errors.
# config.wrapper_error_class = :field_with_errors

# How the label text should be generated altogether with the required text.
# config.label_text = lambda { |label, required| "#{required} #{label}" }

# You can define the class to use on all labels. Default is nil.
config.label_class = 'control-label'

# You can define the class to use on all forms. Default is simple_form.
# config.form_class = :simple_form

# You can define which elements should obtain additional classes
# config.generate_additional_classes_for = [:wrapper, :label, :input]

# Whether attributes are required by default (or not). Default is true.
config.required_by_default = false

# Tell browsers whether to use default HTML5 validations (novalidate option).
# Default is enabled.
config.browser_validations = false

# Collection of methods to detect if a file type was given.
# config.file_methods = [ :mounted_as, :file?, :public_filename ]
# Series of attemps to detect a default label method for collection.
# config.collection_label_methods = [ :to_label, :name, :title, :to_s ]

# Custom mappings for input types. This should be a hash containing a regexp
# to match as key, and the input type that will be used when the field name
# matches the regexp as value.
# config.input_mappings = { /count/ => :integer }
# Series of attemps to detect a default value method for collection.
# config.collection_value_methods = [ :id, :to_s ]

# Custom wrappers for input types. This should be a hash containing an input
# type as key and the wrapper that will be used for all inputs with specified type.
# config.wrapper_mappings = { :string => :prepend }
# Collection of methods to detect if a file type was given.
# config.file_methods = [ :file?, :public_filename ]

# Default priority for time_zone inputs.
# config.time_zone_priority = nil
Expand All @@ -130,13 +49,4 @@

# Default size for text inputs.
# config.default_input_size = 50

# When false, do not use translations for labels.
# config.translate_labels = true

# Automatically discover new inputs in Rails' autoload path.
# config.inputs_discovery = true

# Cache SimpleForm inputs discovery
# config.cache_discovery = !Rails.env.development?
end
end
13 changes: 6 additions & 7 deletions config/locales/simple_form.en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,16 @@ en:
# When using html, text and mark won't be used.
# html: '<abbr title="required">*</abbr>'
error_notification:
default_message: "Please review the problems below:"
default_message: "Some errors were found, please take a look:"
# Labels and hints examples
# labels:
# defaults:
# password: 'Password'
# password: 'Password'
# user:
# new:
# email: 'E-mail to sign in.'
# email: 'E-mail para efetuar o sign in.'
# edit:
# email: 'E-mail.'
# hints:
# defaults:
# username: 'User name to sign in.'
# password: 'No special characters, please.'
# username: 'User name to sign in.'
# password: 'No special characters, please.'

0 comments on commit 19339e9

Please sign in to comment.