Merge pull request #13 from differentreality/event_registration

Event registration

app/views/conference_registration/register.html.haml

@@ -26,6 +26,11 @@
         = 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}
+
+        - if @workshops.count > 0
+          =f.inputs "Register to workshops" do
+            = f.input :events, :as => :check_boxes, :label => false, :collection => @workshops
+
       = f.inputs "Travel Info" do
         = f.input :arrival, :as => :string,  :input_html => {:value => (f.object.arrival.to_formatted_s(:db_without_seconds) unless f.object.arrival.nil?), :id => "registration-arrival-datepicker", :readonly => "readonly"  }
         = f.input :departure, :as => :string, :input_html => {:value => (f.object.departure.to_formatted_s(:db_without_seconds) unless f.object.departure.nil?), :id => "registration-departure-datepicker", :readonly => "readonly"  }

app/views/proposal/_proposal_form.html.haml

@@ -6,6 +6,7 @@
   %section#details
     - unless @event.state === "unconfirmed" || @event.state === "confirmed"
       = f.input :event_type_id,:as => :select, :collection => @event_types, :include_blank => false, :label => "Session Type"
+    = f.input :require_registration
     = f.input :abstract, :input_html => {:rows => 5, :class => "span11"},
       :required => true, :label => "Session Abstract"
     You have used