Retire semantic_form_for
Also a buttload of form cleanups...
This commit is contained in:
parent
350b1ebbbe
commit
81853d1ef9
136 changed files with 1825 additions and 1441 deletions
|
|
@ -1,34 +1,9 @@
|
|||
.container
|
||||
.row
|
||||
.col-md-12
|
||||
.page-header
|
||||
%h1
|
||||
Registration for
|
||||
= @conference.title
|
||||
.row
|
||||
.col-md-8
|
||||
- unless current_user
|
||||
%legend
|
||||
%span
|
||||
=link_to('#signup', role: 'tab', "aria-controls" => "home", "data-toggle" => "tab") do
|
||||
= ENV['OSEM_NAME'] || 'OSEM'
|
||||
Account
|
||||
%span.pull-right#account-already
|
||||
=link_to('#signin', role: 'tab', "aria-controls" => "home", "data-toggle" => "tab") do
|
||||
Already have an account?
|
||||
.tab-content
|
||||
.tab-pane.active{role: 'tabpanel', id: 'signup'}
|
||||
= semantic_form_for(@registration, url: conference_conference_registration_path(@conference.short_title)) do |f|
|
||||
= render partial: 'devise/shared/sign_up_form_embedded'
|
||||
|
||||
= render partial: 'registration_info', locals: { f: f }
|
||||
= f.input :conference_id, as: :hidden, value: @conference.id
|
||||
.row
|
||||
.col-md-12
|
||||
%p.pull-right
|
||||
- if @conference.user_registered?(current_user)
|
||||
= f.action :submit, button_html: { value: 'Update Registration', class: 'btn btn-primary' }
|
||||
- else
|
||||
=f.action :submit, button_html: { value: 'Register', class: 'btn btn-primary', id: 'register' }
|
||||
.tab-pane{role: 'tabpanel', id: 'signin'}
|
||||
= render partial: 'devise/shared/sign_in_form_embedded'
|
||||
= form_for(@registration, url: conference_conference_registration_path(@conference.short_title)) do |f|
|
||||
= render partial: 'devise/registrations/new_embedded'
|
||||
= render partial: 'registration_info', locals: { f: f }
|
||||
= f.hidden_field :conference_id, value: @conference.id
|
||||
%p.pull-right
|
||||
- if @conference.user_registered?(current_user)
|
||||
= f.submit 'Update Registration', { class: 'btn btn-primary' }
|
||||
- else
|
||||
=f.submit 'Register', { class: 'btn btn-primary', id: 'register' }
|
||||
|
|
|
|||
|
|
@ -6,22 +6,25 @@
|
|||
I have read and accepted the
|
||||
= code_of_conduct_link
|
||||
- else
|
||||
= f.input :accepted_code_of_conduct,
|
||||
label: "I have read and accept the #{code_of_conduct_link}".html_safe,
|
||||
required: true
|
||||
.checkbox
|
||||
%label
|
||||
= f.check_box :accepted_code_of_conduct, required: true
|
||||
I have read and accept the
|
||||
= code_of_conduct_link
|
||||
%abbr{title: 'This field is required'} *
|
||||
|
||||
- if @conference.program.events.with_registration_open.any? || @registration.events.any?
|
||||
= f.inputs 'Pre-registration required for the following:' do
|
||||
|
||||
- @registration.events_ordered.each do |event|
|
||||
%label
|
||||
= hidden_field_tag "registration[event_ids][]", nil
|
||||
= check_box_tag "registration[event_ids][]", event.id, event.registrations.include?(@registration)
|
||||
= event.title
|
||||
.text-muted
|
||||
= registered_text(event)
|
||||
- if event.scheduled?
|
||||
(Scheduled on: #{event.time.to_date})
|
||||
%br
|
||||
%h4
|
||||
Pre-registration required for the following:
|
||||
- @registration.events_ordered.each do |event|
|
||||
%label
|
||||
= hidden_field_tag "registration[event_ids][]", nil
|
||||
= check_box_tag "registration[event_ids][]", event.id, event.registrations.include?(@registration)
|
||||
= event.title
|
||||
.text-muted
|
||||
= registered_text(event)
|
||||
- if event.scheduled?
|
||||
(Scheduled on: #{event.time.to_date})
|
||||
%br
|
||||
|
||||
= render 'conferences/code_of_conduct', organization: @conference.organization
|
||||
|
|
|
|||
23
app/views/conference_registrations/edit.html.haml
Normal file
23
app/views/conference_registrations/edit.html.haml
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
.container
|
||||
.row
|
||||
.col-md-12
|
||||
.page-header
|
||||
%h1
|
||||
Registration for
|
||||
= @conference.title
|
||||
.row
|
||||
.col-md-8
|
||||
- unless current_user
|
||||
%legend
|
||||
%span
|
||||
=link_to('#signup', role: 'tab', "aria-controls" => "home", "data-toggle" => "tab") do
|
||||
= ENV['OSEM_NAME'] || 'OSEM'
|
||||
Account
|
||||
%span.pull-right#account-already
|
||||
=link_to('#signin', role: 'tab', "aria-controls" => "home", "data-toggle" => "tab") do
|
||||
Already have an account?
|
||||
.tab-content
|
||||
.tab-pane.active{role: 'tabpanel', id: 'signup'}
|
||||
= render partial: 'form'
|
||||
.tab-pane{role: 'tabpanel', id: 'signin'}
|
||||
= render partial: 'devise/sessions/new_embedded'
|
||||
23
app/views/conference_registrations/new.html.haml
Normal file
23
app/views/conference_registrations/new.html.haml
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
.container
|
||||
.row
|
||||
.col-md-12
|
||||
.page-header
|
||||
%h1
|
||||
Registration for
|
||||
= @conference.title
|
||||
.row
|
||||
.col-md-8
|
||||
- unless current_user
|
||||
%legend
|
||||
%span
|
||||
=link_to('#signup', role: 'tab', "aria-controls" => "home", "data-toggle" => "tab") do
|
||||
= ENV['OSEM_NAME'] || 'OSEM'
|
||||
Account
|
||||
%span.pull-right#account-already
|
||||
=link_to('#signin', role: 'tab', "aria-controls" => "home", "data-toggle" => "tab") do
|
||||
Already have an account?
|
||||
.tab-content
|
||||
.tab-pane.active{role: 'tabpanel', id: 'signup'}
|
||||
= render partial: 'form'
|
||||
.tab-pane{role: 'tabpanel', id: 'signin'}
|
||||
= render partial: 'devise/sessions/new_embedded'
|
||||
Loading…
Add table
Add a link
Reference in a new issue