diff --git a/app/helpers/registration_helper.rb b/app/helpers/registration_helper.rb index f0e941e..8feb741 100644 --- a/app/helpers/registration_helper.rb +++ b/app/helpers/registration_helper.rb @@ -129,15 +129,22 @@ module RegistrationHelper end end + message = if @update_message.present? && @update_status.present? + columns(medium: 12, class: @update_status, id: 'action-message') do + content_tag(:div, (_"articles.conference_registration.#{@update_status}.#{@update_message}", :s), class: :message).html_safe + end + else + '' + end + actions = columns(medium: 12, class: [:actions, :center]) do + content_tag(:div, actions.html_safe, class: :buttons).html_safe + end + form_tag(register_path(conference.slug), class: 'js-xhr') do - (@update_message.present? && @update_status.present? ? columns(medium: 12, class: @update_status, id: 'action-message') do - content_tag(:div, (_"articles.conference_registration.#{@update_status}.#{@update_message}", :s), class: :message).html_safe - end : '').html_safe + + message.html_safe + content.html_safe + (hidden_field_tag :step, step).html_safe + - columns(medium: 12, class: [:actions, :center]) do - content_tag(:div, actions.html_safe, class: :buttons).html_safe - end.html_safe + actions.html_safe end.html_safe end end diff --git a/app/views/application/_policy.html.haml b/app/views/application/_policy.html.haml index 96467f6..5e03bcf 100644 --- a/app/views/application/_policy.html.haml +++ b/app/views/application/_policy.html.haml @@ -1,3 +1,5 @@ +- checkboxes ||= false +- less_info ||= false .policy-agreement - if @is_policy_page %h2=_'articles.policy.headings.The_Agreement'