gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Syntax style + code groomming

Browse source
This commit is contained in:
Stella Rouzi 2015-10-06 14:15:38 +03:00
parent eface6a91b
commit 759aa54689
16 changed files with 64 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/views/conference_registrations/_form.html.haml
View file

@ -21,14 +21,7 @@
= semantic_form_for(@registration, url: conference_conference_registrations_path(@conference.short_title)) do |f|
= render partial: 'devise/shared/sign_up_form_embedded'
- if @conference.questions.any?
= render partial: 'questions', locals: { f: f }
- if @conference.events.workshops.any?
=f.inputs 'Register to Workshops' do
= f.input :events, as: :check_boxes, label: false, collection: @conference.events.workshops
= f.inputs 'Your Travel Info' do
= f.input :arrival, as: :string, label: 'Your arrival time', 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, label: 'Your departure time', input_html: { value: (f.object.departure.to_formatted_s(:db_without_seconds) unless f.object.departure.nil?), id: 'registration-departure-datepicker', readonly: 'readonly' }
= render partial: 'registration_info', locals: { f: f }
.row
.col-md-12
%p.pull-right

2
app/views/conference_registrations/_questions.html.haml
View file

@ -5,4 +5,4 @@
:member_label => Proc.new {|a| a.answer.title}
- if q.question_type.id == 3 # multiple choice
= f.input :qanswers, :collection => q.qanswers, :as => :check_boxes, label: q.title,
:member_label => Proc.new {|a| a.answer.title}
:member_label => Proc.new {|a| a.answer.title}

8
app/views/conference_registrations/_registration_info.html.haml Normal file
View file

@ -0,0 +1,8 @@
- if @conference.questions.any?
= render partial: 'conference_registrations/questions', locals: { f: f }
- if @conference.events.workshops.any?
=f.inputs 'Pre-registration required for the following:' do
= f.input :events, as: :check_boxes, label: false, collection: @conference.events.workshops
= f.inputs 'Your Travel Info' do
= f.input :arrival, as: :string, label: 'Your arrival time', 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, label: 'Your departure time', input_html: { value: (f.object.departure.to_formatted_s(:db_without_seconds) unless f.object.departure.nil?), id: 'registration-departure-datepicker', readonly: 'readonly' }