Adding more registration options, and starting work on supporter levels

app/views/admin/conference/_sidebar.html.haml

@@ -4,6 +4,10 @@
       %li.active= link_to "Conference", "#"
     - else
       %li= link_to "Conference", admin_conference_path(@conference.short_title)
+    - if activated == "Levels"
+      %li.active= link_to "Supporter Levels", "#"
+    - else
+      %li= link_to "Supporter Levels", admin_conference_supporter_levels_path(@conference.short_title)
     - if activated == "Call for Papers"
       %li.active= link_to "Call for Papers", "#"
     - else
@@ -28,3 +32,8 @@
       %li.active= link_to "Emails", "#"
     - else
       %li= link_to "Emails", admin_conference_email_settings_path(@conference.short_title)
+    - if activated == "Diet"
+      %li.active= link_to "Dietary Choices", "#"
+    - else
+      %li= link_to "Dietary Choices", admin_conference_dietary_list_path(@conference.short_title)
+

app/views/admin/dietchoices/_dietary_choice_fields.html.erb

@@ -0,0 +1,6 @@
+<div class="nested-fields">
+    <%= f.inputs do %>
+        <%= f.input :title %>
+        <%= remove_association_link :dietary_choice, f %>
+    <% end %>
+</div>

app/views/admin/dietchoices/diets_list.html.haml

@@ -0,0 +1,9 @@
+.container-fluid
+  .row-fluid
+    .span3
+      = render 'admin/conference/sidebar', :activated => "Diet"
+    .span9
+      = semantic_form_for(@conference, :url => admin_conference_dietary_update_path(@conference.short_title)) do |f|
+        = f.input :use_dietary_choices, :label => false
+        = dynamic_association :dietary_choices, "Dietary Choices", f
+        = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}

app/views/admin/supporter_levels/_supporter_level_fields.html.erb

@@ -0,0 +1,7 @@
+<div class="nested-fields">
+    <%= f.inputs do %>
+        <%= f.input :title%>
+        <%= f.input :url  %>
+        <%= remove_association_link :supporter_level, f %>
+    <% end %>
+</div>

app/views/admin/supporter_levels/supporter_levels.html.haml

@@ -0,0 +1,9 @@
+.container-fluid
+  .row-fluid
+    .span3
+      = render 'admin/conference/sidebar', :activated => "Levels"
+    .span9
+      = semantic_form_for(@conference, :url => admin_conference_supporter_levels_path(@conference.short_title)) do |f|
+        = f.input :use_supporter_levels, :label => false
+        = dynamic_association :supporter_levels, "Supporter Levels", f
+        = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}

app/views/conference_registration/register.html.haml

@@ -17,8 +17,17 @@
         = f.input :attending_social_events, :label => false
         = f.input :attending_social_events_with_partner, :label => false
         = f.input :using_affiliated_lodging, :label => false
+        = f.input :handicapped_access_required, :label => false
         = f.input :arrival, :as => :string,  :input_html => {:value => (f.object.arrival.to_formatted_s(:db_without_seconds) unless f.object.arrival.nil?), :id => "conference-reg-start-datepicker", :readonly => "readonly"  }
         = f.input :departure, :as => :string, :input_html => {:value => (f.object.departure.to_formatted_s(:db_without_seconds) unless f.object.arrival.nil?), :id => "conference-reg-end-datepicker", :readonly => "readonly"  }
+        - if @conference.use_dietary_choices?
+          = 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)"
+        - if @conference.use_supporter_levels?
+          = f.semantic_fields_for :supporter_registration do |reg|
+            = reg.input :supporter_level, :as => :select, :collection => @conference.supporter_levels
+            = reg.input :code, :hint => "If you have a confirmation or registration code, enter it here."
         - if @registered
           = f.action :submit, :button_html => { :value => "Update Registration", :class => "btn btn-primary" }
           = link_to "Unregister", register_conference_path(@conference.short_title),:method => :delete, :class => "btn btn-danger",