Registration fixes and improvements

This commit is contained in:
Godwin
2017-06-05 13:57:05 -07:00
parent eed9bd8b40
commit fd729c4a49
12 changed files with 251 additions and 60 deletions
@@ -2,7 +2,7 @@
= columns(medium: 12) do
= registration_step_header_title
- if @info.present?
= @info
= @info.html_safe
- else
= registration_step_header_description
= row do
@@ -5,5 +5,5 @@
= textfield :address, @address, required: true, big: true
.multi-field
= textfield :city, @city.city, readonly: true
= textfield :territory, @city.translate_territory, readonly: true
= textfield :country, @city.translate_country, readonly: true
= textfield :territory, @city.translate_territory.html_safe, readonly: true
= textfield :country, @city.translate_country.html_safe, readonly: true
@@ -7,8 +7,8 @@
%ul
- policies.each do |term|
%li
- id = "policies[#{term}]"
= check_box_tag(id, 1, (@accepted_policies || {}).include?(term))
- id = "policies_#{term}"
= check_box_tag("policies[#{term}]", 1, (@accepted_policies || {}).include?(term), id: id)
%label.term{for: id}=_"articles.policy.term.#{term.to_s}", :s, 2
= columns(medium: 12) do
%p=_'articles.conference_registration.paragraphs.Confirm_Agreement', :p
+10 -9
View File
@@ -3,24 +3,24 @@
= columns(medium: 12) do
= save_registration_step do
- if @is_attending
%table#review
.table.responsive-table#review
- @step_data.each do |step, data|
- unless data[:type] == :none
%tr
%th
.table-tr
.table-th
=_"articles.conference_registration.step_names.#{step}"
= button :edit, name: :edit_step, value: step, class: [:unstyled, :edit]
%td
.table-td
- case data[:type]
- when :bool
=_"forms.actions.generic.#{data[:value] ? 'yes' : 'no'}"
- when :list
= data[:value].map { |item| _"#{data[:key]}.#{item}" }.join(_!(", "))
= data[:value].map { |item| _"#{data[:key]}.#{item}" }.join(_!(", ")).html_safe
- when :currency
= (number_to_currency data[:value].to_f, unit: '$')
=_!(data[:currency].to_s).html_safe
- when :date
= date(data[:value].to_date, :long)
= date(data[:value].to_date, :long).html_safe
- when :enum
=_("#{data[:key] || ('forms.labels.generic.' + step.to_s + '.')}#{data[:value]}")
- when :html
@@ -29,7 +29,7 @@
- if data[:key].present?
=_"#{data[:key]}.#{data[:value]}"
- else
= data[:value]
= data[:value].to_s.html_safe
- else
%p.centered=_'articles.conference_registration.paragraphs.registration_cancelled', :p
- if @allow_cancel_attendance
@@ -43,5 +43,6 @@
%h3=_'articles.workshops.headings.Workshops', :t
%p=_'articles.conference_registration.paragraphs.workshops', :p
.actions.centered
= link_to (_'articles.conference_registration.actions.View_Workshops'), workshops_path(@this_conference), class: :button
= link_to (_'actions.workshops.create'), create_workshop_path(@this_conference), class: [:button, :modify]
.buttons
= link_to (_'articles.conference_registration.actions.View_Workshops'), workshops_path(@this_conference), class: :button
= link_to (_'actions.workshops.create'), create_workshop_path(@this_conference), class: [:button, :modify]