@@ -1,6 +1,9 @@ require "form_builder_helper" module AccessibleForm + mattr_accessor :css_class, :label_separator + @@css_class = 'aFrm' + @@label_separator = ':' class PAFormBuilder < ActionView::Helpers::FormBuilder @@ -10,8 +13,8 @@ module AccessibleForm src = <<-END_SRC def #{selector}(field, options = {}) field = field.to_s - label_text, required, note = extract_paf_options(field, options) - generic_field(field, super, label_text, {:required => required, :note => note}) + label_text, opts = extract_paf_options(field, options) + generic_field(field, super, label_text, opts) end END_SRC class_eval src, __FILE__, __LINE__ @@ -21,8 +24,8 @@ module AccessibleForm src = <<-END_SRC def #{selector}(field, options = {}) field = field.to_s - label_text, required, note = extract_paf_options(field, options) - generic_field(field, super, label_text, {:required => required, :note => note}) + label_text, opts = extract_paf_options(field, options) + generic_field(field, super, label_text, opts) end END_SRC class_eval src, __FILE__, __LINE__ @@ -38,8 +41,8 @@ module AccessibleForm def file_column_field(field, options = {}) field = field.to_s - label_text, required, note = extract_paf_options(field, options) - generic_field(field, @template.file_column_field(@object_name, field, options), label_text, {:required => required, :note => note}) + label_text, opts = extract_paf_options(field, options) + generic_field(field, @template.file_column_field(@object_name, field, options), label_text, opts) end def separator(new_section_name, options = {}) @@ -57,7 +60,7 @@ module AccessibleForm required = options[:required] ? @template.content_tag('span', '*', :class => 'requiredField') : '' note = options[:note] ? @template.content_tag('em', " #{options[:note]}") : '' unless label_text.blank? - if options[:label] == :after + if options[:after] li(field + label(label_text, "#{@object_name}_#{fieldname}", true) + required + note) else li( @@ -75,36 +78,38 @@ module AccessibleForm end def label text, for_field, after = false - @template.content_tag 'label', "#{text}#{after ? '' : ':'}", :for => for_field + @template.content_tag 'label', (text.to_s + (after ? '' : AccessibleForm.label_separator)), :for => for_field end def extract_paf_options field, options label_text = options.delete(:label) || field.to_s.humanize - required = options.delete(:required) || false - note = options.delete(:note) || false - [label_text, required, note] + [label_text, {:required => false, :note => false, :after => false}.merge(options)] end end def a_form_for(object_name, *args, &proc) options = args.last.is_a?(Hash) ? args.last : {} if options[:html].nil? then - options[:html] = { :class => "aFrm" } + options[:html] = { :class => AccessibleForm.css_class } else - options[:html][:class] = (options[:html][:class].nil?) ? "aFrm" : "#{options[:html][:class]} aFrm" + options[:html][:class] = (options[:html][:class].nil?) ? AccessibleForm.css_class : "#{options[:html][:class]} aFrm" end legend = options.delete :legend if legend.blank? - prefix = options[:prefix].blank? ? "<fieldset><ol>" : options[:prefix] - postfix = options[:postfix].blank? ? "</fieldset></ol>" : options[:postfix] + prefix = options[:prefix].blank? ? '<fieldset><ol>' : options[:prefix] + postfix = options[:postfix].blank? ? '</ol></fieldset>' : options[:postfix] else prefix = options[:prefix].blank? ? "<fieldset><legend>#{legend}</legend><ol>" : options[:prefix] postfix = options[:postfix].blank? ? '</ol></fieldset>' : options[:postfix] end + + # Temp? workaround for having to inject ourselves into crap + html_options = options.delete(:html) || {} + html_options[:method] = :put if object_name.is_a?(ActiveRecord::Base) && object_name.id custom_form_for( PAFormBuilder, prefix, postfix, - form_tag(options.delete(:url) || {}, options.delete(:html) || {}), + form_tag(options.delete(:url) || object_name, html_options), object_name, *args, &proc) end lib/accessible_form_builder.rb @@ -1,12 +1,12 @@ # Create the +form_for+ and +remote_form_for+ methods for a particular # form builder. # from rubaidh.com's tabular form builder -def custom_form_for(builder, fields_pre, fields_post, form_tag, object_name, *args, &proc) +def custom_form_for(builder, prefix, postfix, form_tag, object_name, *args, &proc) raise ArgumentError, "Missing block" unless block_given? options = args.last.is_a?(Hash) ? args.pop : {} - concat(form_tag, proc.binding) - concat(fields_pre, proc.binding) + concat(form_tag) + concat(prefix) fields_for(object_name, *(args << options.merge(:builder => builder)), &proc) - concat(fields_post, proc.binding) - concat("</form>", proc.binding) + concat(postfix) + concat("</form>") end lib/form_builder_helper.rb 192e32fdeaa9fae35cb38d2abf675b1a167897c6 nwiger nwiger@pdsd65-31-27.989studios.com http://github.com/shift/accessible_form_builder/commit/60fed33fb0b13ea859b6f0fd10124ed991603c5d 60fed33fb0b13ea859b6f0fd10124ed991603c5d 2009-02-19T15:35:57-08:00 2009-02-19T15:35:57-08:00 Added functionality for nested_forms support in Rails 2.3 and exposed attribute accessors c241f03702795157e833165442a81766d93f9782 nwiger nwiger@pdsd65-31-27.989studios.com