Merge OSEM updates

app/views/proposals/_proposal_form.html.haml

@@ -62,7 +62,7 @@
         250
       words.
 
-    - if current_user.is_admin? or @program.cfp.enable_registrations?
+    - if current_user.is_admin? or @program.cfp&.enable_registrations?
       = f.inputs 'Enable pre-registration' do
         = f.input :require_registration, label: 'Require participants to register to your event'
         - message = @event.room ? "Value must be between 1 and #{@event.room.size}" : 'Check room capacity after scheduling.'

app/views/proposals/new.html.haml

@@ -36,17 +36,17 @@
                 data: { min_words: type.minimum_abstract_length, max_words: type.maximum_abstract_length }]},
                 include_blank: false, label: 'Type', input_html: { class: 'select-help-toggle' }
 
+              - if @program.languages.present?
+                = f.input :language, as: :select,
+                  collection: @languages,
+                  include_blank: false, label: 'Language', input_html: { class: 'select-help-toggle' }
+
               - @program.event_types.each do |event_type|
                 %div{ class: 'help-block event_event_type_id collapse', id: "#{event_type.id}-help"}
                   %strong Directions
                   %div
                     = markdown(event_type.description)
 
-              - if @program.languages.present?
-                = f.input :language, as: :select,
-                  collection: @languages,
-                  include_blank: false, label: 'Language', input_html: { class: 'select-help-toggle' }
-
               = f.input :abstract, required: true, input_html: { rows: 5, data: { provide: 'markdown' } },
                 hint: markdown_hint