Moved form helpers from application_helper to a real FormHelper

app/views/registration_form_fields/_form.html.haml

@@ -1,15 +1,14 @@
 = form_for @registration_form_field do |f|
-	- if @registration_form_field.errors.any?
-		#error_explanation
-			%h2= "#{pluralize(@registration_form_field.errors.count, "error")} prohibited this registration_form_field from being saved:"
-			%ul
-				- @registration_form_field.errors.full_messages.each do |msg|
-					%li= msg
 	- if @conference
-		= field :conference_id, :hidden_field_tag, value: @conference.id
-	= field f, :field_type, :select, RegistrationFormField::Types.keys
+		= f.hidden_field :conference_id, value: @conference.id
+	= f.select :field_type, RegistrationFormField::Types.keys
 	- RegistrationFormField::Fields.each do |key, value|
-		- classes = RegistrationFormField::TypesForField(key.to_sym).collect{|v| 'field-type-' + v.to_s}
-		- classes << 'registration-form-field-field'
-		= eval('field f, :' + key.to_s + ', :' + value[:control] + (value[:options] ? ', ' + (value[:options].map.with_index{|v, i| 'value[:options][' + i.to_s + ']'}.join(', ') || 'nil') : '') + ", classes: classes")
-	= actions :save
+		- options = {:html => { :classes => RegistrationFormField::TypesForField(key.to_sym).collect{|v| 'field-type-' + v.to_s} } }
+		- options[:html][:classes] << 'registration-form-field-field'
+		-# eval('field f, :' + key.to_s + ', :' + value[:control] + (value[:options] ? ', ' + (value[:options].map.with_index{|v, i| 'value[:options][' + i.to_s + ']'}.join(', ') || 'nil') : '') + ", classes: classes")
+		- if value[:options]
+			- fields = options_for_select(value[:options].first.map { |v| [_("form_field.#{v}"), v]})
+			= f.send(value[:control], key.to_s, fields, options)
+		- else
+			= f.send(value[:control], key.to_s, options)
+	= f.actions :save