From f33e15c6e6f36d4fa0a45be700a4861dbb50aac4 Mon Sep 17 00:00:00 2001 From: Godwin Date: Wed, 9 Sep 2015 21:36:14 -0700 Subject: [PATCH] Added skip button to payment page --- app/assets/stylesheets/_application.scss | 7 + app/views/conferences/_done.html.haml | 8 +- app/views/conferences/_payment.html.haml | 4 + .../html_records/Broadcast-message--.html | 60 +- ...age--conferences.MyBikeBike.broadcast.html | 4 +- .../Broadcast-message--confirm.test.html | 59 +- .../data/html_records/Create-workshop--.html | 4 +- ...shop--conferences.MyBikeBike.register.html | 7 + .../Create-workshop--confirm.test.html | 119 +-- .../See-a-404-page--error_404.html | 55 +- ...ge--conferences.MyBikeBike.register-1.html | 4 +- ...ge--conferences.MyBikeBike.register-4.html | 7 + ...ge--conferences.MyBikeBike.register-5.html | 7 + ...stration-from-landing-page--doconfirm.html | 226 +++-- ...from-landing-page--email_confirmation.html | 4 +- .../data/html_records/View-stats--.html | 4 +- .../View-stats--confirm.test.html | 109 +-- config/locales/data/translation-info.yml | 925 ++++++++---------- 18 files changed, 764 insertions(+), 849 deletions(-) diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss index 7b09577..521dc96 100644 --- a/app/assets/stylesheets/_application.scss +++ b/app/assets/stylesheets/_application.scss @@ -1407,6 +1407,12 @@ $header-tilt: 8deg; } } +#main .skip { + button { + background-color: #CCC; + } +} + #main form.payment { text-align: center; @@ -1678,6 +1684,7 @@ $header-tilt: 8deg; display: block; max-height: 10em; overflow: hidden; + margin: 0.5em 0; @include default-box-shadow(top, 2); @include _(transition, transform 150ms ease-in-out); diff --git a/app/views/conferences/_done.html.haml b/app/views/conferences/_done.html.haml index 4bd0152..6ca184f 100644 --- a/app/views/conferences/_done.html.haml +++ b/app/views/conferences/_done.html.haml @@ -22,16 +22,16 @@ %td=date(@registration.departure) %tr %th=_'articles.conference_registration.headings.languages' - %td=_!((JSON.parse(@registration.languages).map { |x| _"languages.#{x}" }).join(', ').to_s).html_safe + %td=_!((JSON.parse(@registration.languages || '[]').map { |x| _"languages.#{x}" }).join(', ').to_s).html_safe %tr %th=_'articles.conference_registration.headings.housing' - %td=_"articles.conference_registration.questions.housing.#{@registration.housing}" + %td=_"articles.conference_registration.questions.housing.#{@registration.housing || 'none'}" %tr %th=_'articles.conference_registration.headings.bike' - %td=_"articles.conference_registration.questions.bike.#{@registration.bike}" + %td=_"articles.conference_registration.questions.bike.#{@registration.bike || 'none'}" %tr %th=_'articles.conference_registration.headings.food' - %td=_"articles.conference_registration.questions.food.#{@registration.food}" + %td=_"articles.conference_registration.questions.food.#{@registration.food || 'meat'}" %tr %th=_'articles.conference_registration.headings.allergies' %td diff --git a/app/views/conferences/_payment.html.haml b/app/views/conferences/_payment.html.haml index d7860e2..1f28345 100644 --- a/app/views/conferences/_payment.html.haml +++ b/app/views/conferences/_payment.html.haml @@ -16,5 +16,9 @@ = number_field_tag :amount, nil, :required => true, :step => 0.01, :min => 0.00 = button_tag :custom_amount, :value => :payment %p=_'articles.conference_registration.paragraphs.currency','(amounts are in $USD)' + = form_tag register_path(@this_conference.slug), :class => :payment do + = hidden_field_tag :button, :payment + .actions.skip + = button_tag :skip, :name => :amount, :value => '0.0' = columns(large: 2) diff --git a/config/locales/data/html_records/Broadcast-message--.html b/config/locales/data/html_records/Broadcast-message--.html index eb36f42..ff1f60d 100644 --- a/config/locales/data/html_records/Broadcast-message--.html +++ b/config/locales/data/html_records/Broadcast-message--.html @@ -13,59 +13,53 @@ - +
-
-

Please confirm your email address

-
- - - -
+
+
+
+ +
-
+ +
+
+

My Bike!Bike!

+Curabitur non nulla sit amet nisl tempus convallis quis ac lectus.
@@ -94,7 +88,7 @@ EN
-
-
- -
-

You're Done!

-

Thank you for registering for Bike!Bike!

-

You can now take a look at proposed workshops and even propose one yourself if you like.

-
-View Workshops -
-

Your Registration

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
What is your name?John Doe
Where are you coming from?Mushaboom, NS
Arrival12am, January 1, 2016
Departure12am, January 4, 2016
Which languages do you speak?English
Do you need a place to stay?I'll take care of it
Do you need a bike?Small
What are your eating habits?Vegan
Do you have any allergies? -(none) -
Is there anything else you'd like to tell us?
Fees paid$50.00
-
-
- +
+

Please confirm your email address

+
+ + + -
-
+
+
@@ -141,7 +94,7 @@ EN