diff --git a/app/views/application/contact.html.haml b/app/views/application/contact.html.haml index 5df755a..90d7fb5 100644 --- a/app/views/application/contact.html.haml +++ b/app/views/application/contact.html.haml @@ -6,5 +6,6 @@ %h2=_'articles.contact.headings.sent', :t %p=_'articles.contact.paragraphs.sent', :p - else - %h2=_'articles.contact.headings.contact' - = render 'contact', cancel_btn: false \ No newline at end of file + %h2=_'Email info@bikebike.org & bikebikeeverywhere@gmail.coom' + -#%h2=_'articles.contact.headings.contact' + -# = render 'contact', cancel_btn: false \ No newline at end of file diff --git a/app/views/conferences/_conference.html.haml b/app/views/conferences/_conference.html.haml index 5732206..fdf7880 100644 --- a/app/views/conferences/_conference.html.haml +++ b/app/views/conferences/_conference.html.haml @@ -6,7 +6,7 @@ .title %h1=_!conference.title .details - %h2.primary=location(conference.city || conference.location) if conference.city_name.present? + %h2.primary=location(conference.city || conference.location) if conference.city_name.present? && conference.city_id != 433 - if conference.start_date.present? && conference.end_date.present? .secondary = date_span(conference.start_date.to_date, conference.end_date.to_date) diff --git a/app/views/registration_steps/_payment_form.html.haml b/app/views/registration_steps/_payment_form.html.haml index 2d0d7c3..14eb429 100644 --- a/app/views/registration_steps/_payment_form.html.haml +++ b/app/views/registration_steps/_payment_form.html.haml @@ -10,17 +10,21 @@ - unless @currencies.present? && @currencies.length > 1 %p.center=_"articles.conference_registration.paragraphs.currency_details", :p, vars: { currency: (_"currencies.#{(@currencies || [@currency]).first}.displayName-count-other") } = save_registration_step do - .registration-step-options - .options.graded-options{class: "option-count-#{@amounts.size}"} - - @amounts.each_with_index do |option, i| - = button "#{number_to_currency option, unit: '$'} #{_!@currency}".html_safe, value: option, name: :value, class: [:unstyled, "option-#{i + 1}"] - .option-space - .custom-option - = number_field_tag :custom_value, 50.0, step: 0.05, min: 0.05 - = button :custom_amount, name: :custom_amount, value: :custom, class: :unstyled - - if @currencies.present? && @currencies.length > 1 + - if @conference.slug == "South2022" + %iframe{:src => "https://opencollective.com/embed/bikebike-everywhere/donate?email=#{current_user.email}&name=#{current_user.firstname} #{current_user.lastname}", :style => "width: 100%; min-height: 100vh;"} + = textfield :notes, @notes, required: true + - else + .registration-step-options + .options.graded-options{class: "option-count-#{@amounts.size}"} + - @amounts.each_with_index do |option, i| + = button "#{number_to_currency option, unit: '$'} #{_!@currency}".html_safe, value: option, name: :value, class: [:unstyled, "option-#{i + 1}"] .option-space - .setting-option - %p Change currency to: - - (@currencies - [@currency]).each do |c| - = button (_"currencies.#{c}.displayName-count-other"), name: :currency, value: c, class: :unstyled + .custom-option + = number_field_tag :custom_value, 50.0, step: 0.05, min: 0.05 + = button :custom_amount, name: :custom_amount, value: :custom, class: :unstyled + - if @currencies.present? && @currencies.length > 1 + .option-space + .setting-option + %p Change currency to: + - (@currencies - [@currency]).each do |c| + = button (_"currencies.#{c}.displayName-count-other"), name: :currency, value: c, class: :unstyled diff --git a/app/views/registration_steps/_review.html.haml b/app/views/registration_steps/_review.html.haml index 8168a3f..a3230e5 100644 --- a/app/views/registration_steps/_review.html.haml +++ b/app/views/registration_steps/_review.html.haml @@ -76,7 +76,14 @@ - if guest.housing_data['other'].present? %td{colspan: 3, lang: guest.user.locale.to_s == I18n.locale.to_s ? nil : guest.user.locale} = paragraph guest.housing_data['other'] - + += row do + = columns(medium: 12) do + - if @this_conference.city_name.present? && @this_conference.city_id == 433 + - if @this_conference.payment_message.present? + = richtext @this_conference.payment_message + %iframe{:src => "https://opencollective.com/embed/bikebike-everywhere/donate?amount=30&email=#{current_user.email}&name=#{current_user.firstname} #{current_user.lastname}", :style => "width: 100%; min-height: 100vh;"} + - if @this_conference.registration_open = row do = columns(medium: 12) do diff --git a/app/views/shared/_footer.html.haml b/app/views/shared/_footer.html.haml index 7940b67..77fc306 100644 --- a/app/views/shared/_footer.html.haml +++ b/app/views/shared/_footer.html.haml @@ -17,7 +17,9 @@ = signin_link %ul.locales .site-info - .contact-us=link_to (_'links.footer.help_text.contact'), contact_path, id: 'contact-link' + -# Commented the line below because the contact form was getting so much spam it was overwhelming the gmail smtp service + -#.contact-us=link_to (_'links.footer.help_text.contact'), contact_path, id: 'contact-link' + .contact-us=link_to 'bikebikeeverywhere@gmail.com', 'mailto:bikebikeeverywhere@gmail.com', id: 'contact-link' .copy =_'links.footer.help_text.contributors', 'Who contributed to building this website' do |title| =link_to :humans_txt, {title: title} do diff --git a/app/views/workshops/new.html.haml b/app/views/workshops/new.html.haml index 6f3f38d..3d9ecc8 100644 --- a/app/views/workshops/new.html.haml +++ b/app/views/workshops/new.html.haml @@ -23,8 +23,9 @@ = checkboxes :languages, User.AVAILABLE_LANGUAGES, @languages, 'languages', vertical: true, heading: 'articles.workshops.headings.languages', help: 'articles.workshops.paragraphs.languages' = radiobuttons :theme, Workshop.all_themes, @workshop.theme, 'workshop.options.theme', vertical: true, heading: 'articles.workshops.headings.theme', help: 'articles.workshops.paragraphs.theme', other: true = columns(medium: 6) do - = checkboxes :needs, Workshop.all_needs, JSON.parse(@workshop.needs || '[]'), 'workshop.options.needs', vertical: true, heading: 'articles.workshops.headings.needs', help: 'articles.workshops.paragraphs.needs' - = radiobuttons :space, Workshop.all_spaces, @workshop.space, 'workshop.options.space', vertical: true, heading: 'articles.workshops.headings.space', help: 'articles.workshops.paragraphs.space' + - if @this_conference.city_name.present? && @this_conference.city_id != 433 + = checkboxes :needs, Workshop.all_needs, JSON.parse(@workshop.needs || '[]'), 'workshop.options.needs', vertical: true, heading: 'articles.workshops.headings.needs', help: 'articles.workshops.paragraphs.needs' + = radiobuttons :space, Workshop.all_spaces, @workshop.space, 'workshop.options.space', vertical: true, heading: 'articles.workshops.headings.space', help: 'articles.workshops.paragraphs.space' %h3#needs_facilitators-label=_'articles.workshops.headings.needs_facilitators','Looking for help?' .input-field-help#needs_facilitators-desc=_'articles.workshops.paragraphs.needs_facilitators', :s, 2