fix registration page, only show volunteering tab if option is enabled for the conference

app/views/conference_registration/_registration.html.haml

@@ -16,15 +16,18 @@
       %br
       = f.fields_for :person do |p|
         = p.text_field :public_name, :for => :person
-      - if @conference.use_supporter_levels? and @conference.supporter_levels.length > 0
+
+      - if @conference.questions
+        = render :partial => "questions", :locals => {:f => f}
+        %br
+
+      - if @conference.use_supporter_levels? && @conference.supporter_levels.length > 0
         = f.semantic_fields_for :supporter_registration do |reg|
           = reg.input :supporter_level, :as => :select, :collection => @conference.supporter_levels
           = reg.input :code, :label => "Confirmation or registration code (if applicable)"
           %span#supporter-link.help-block
-      = f.input :attending_with_partner, :label => false
-      = f.input :using_affiliated_lodging, :label => false
-      = f.input :handicapped_access_required, :label => false
-      = f.input :other_special_needs, :label => "Any other special needs?", :input_html => {:rows => 2, :class => "span6"}
+
+      = f.input :other_special_needs, :label => "Any other needs or comments?", :input_html => {:rows => 2, :class => "span6"}
 
       - if @workshops.count > 0
         =f.inputs "Register to workshops" do
@@ -38,6 +41,11 @@
         %br Yes, I'll be attending...
         %br
         = f.input :social_events, :as => :check_boxes, :label => false
+    - if @conference.use_dietary_choices?
+      = f.inputs "Food" do
+        = f.input :dietary_choice, :collection => [["None", nil]] + @conference.dietary_choices.map {|x| [x.title, x.id]},
+                  :include_blank => false, :label => "Special Dietary Restriction"
+        = f.input :other_dietary_choice, :input_html => {:rows => "2"}, :label => "Other Dietary Restictions (please describe)"
 
 :javascript
     $("#registration_supporter_registration_attributes_supporter_level_id").change(function () {
@@ -67,5 +75,4 @@
         onSelect: function(selected) {
             $("#registration-arrival-datepicker").datepicker("option","maxDate", selected)
         }
-    });
-
+    });