New registration completed and tested

app/views/conferences/_page_header.html.haml

@@ -1,3 +1,2 @@
-- @main_title_t ||= (@this_conference.title)
--# @page_title ||= (@this_conference.title)
+- @main_title_t ||= _!(@this_conference.title)
 = render partial: 'application/header', locals: { page_group: :conferences, page_key: page_key, image_file: @this_conference.poster_url }

app/views/conferences/register.html.haml

@@ -6,8 +6,20 @@
         = warning
 %article
   - if logged_in?
-    #step-content= render "registration_steps/#{@step}"
+    - add_stylesheet 'quill.css'
+    - add_javascript :quill
+    - add_inline_script :editor
+    #step-content
+      = step_message
+      = render "registration_steps/#{@step}"
   - else
+    = row do
+      = columns(medium: 12) do
+        %h2=_'articles.conference_registration.headings.Registration_Details'
+        %p= _'articles.conference_registration.paragraphs.Registration_Details'
+        %h3=_'articles.conference_registration.headings.Verify_Account'
+        %p=_'articles.conference_registration.paragraphs.Verify_Account'
+
     = row do
       = columns(medium: 12) do
         = render "application/login"

app/views/registration_steps/_group_ride.html.haml

@@ -0,0 +1,16 @@
+= row do
+  = columns(medium: 12) do
+    = registration_step_header_title
+    - if @info.present?
+      = @info
+    - else
+      = registration_step_header_description
+= row do
+  = columns(medium: 12) do
+    = save_registration_step do
+      .registration-step-options
+        .options
+          - [:yes, :maybe, :no].each do |option|
+            - class_name = [:unstyled]
+            - class_name << :selected if @will_attend == option
+            = button option, value: option, class: class_name

app/views/registration_steps/_payment_form.html.haml

@@ -15,7 +15,10 @@
             = radiobuttons :currency, (@currencies.map { |c| [(_"currencies.#{c}.displayName-count-other"), c] }), @currency
           .options.graded-options{class: "option-count-#{@amounts.size}"}
             - @amounts.each_with_index do |option, i|
-              = button (number_to_currency option, unit: '$'), value: option, name: :value, class: [:unstyled, "option-#{i + 1}"], data: { noxhr: 1 }
+              = button (number_to_currency option, unit: '$'), value: option, name: :value, class: [:unstyled, "option-#{i + 1}"]
           .custom-option
+            -# if Rails.env.test?
+            =# text_field_tag :custom_value, nil
+            -# else
             = number_field_tag :custom_value, 50.0, step: 0.05, min: 0.05
-            = button :custom_amount, name: :custom_amount, value: :custom, class: :unstyled, data: { noxhr: 1 }
+            = button :custom_amount, name: :custom_amount, value: :custom, class: :unstyled

app/views/registration_steps/_review.html.haml

@@ -26,7 +26,10 @@
                     - when :html
                       .scroller= richtext(data[:value].html_safe)
                     - else
-                      = data[:value]
+                      - if data[:key].present?
+                        =_"#{data[:key]}.#{data[:value]}"
+                      - else
+                        = data[:value]
       - else
         %p.centered=_'articles.conference_registration.paragraphs.registration_cancelled', :p
       - if @allow_cancel_attendance

app/views/workshops/index.html.haml

@@ -1,6 +1,11 @@
 = render 'conferences/page_header', page_key: 'Workshops'
 
 %article
+  = row do
+    = columns(medium: 12) do
+      .back-to=_'articles.conference_registration.headings.Back_to'
+      %ul.menu
+        %li=link_to (_'articles.conference_registration.headings.Your_Registration'), :register
   = row do
     = columns(medium: 12) do
       %h2=_'articles.workshops.headings.Workshops'

app/views/workshops/show.html.haml

@@ -1,7 +1,13 @@
 = render 'conferences/page_header', page_key: 'Conference_Registration'
 
 %article
-  = render 'workshops/show', :workshop => @workshop, :translations_available_for_editing => @translations_available_for_editing, :preview => false
+  = row do
+    = columns(medium: 12) do
+      .back-to=_'articles.conference_registration.headings.Back_to'
+      %ul.menu
+        %li=link_to (_'articles.conference_registration.headings.Workshops'), :workshops
+        %li=link_to (_'articles.conference_registration.headings.Your_Registration'), :register
+  = render 'workshops/show', workshop: @workshop, translations_available_for_editing: @translations_available_for_editing, preview: false
   = row do
     = columns(medium: 12) do
       .actions.next-prev