Browse Source

Updates views

master
Jonathan Rosenbaum 1 year ago
parent
commit
58c21b5e4a
  1. 5
      app/views/application/contact.html.haml
  2. 2
      app/views/conferences/_conference.html.haml
  3. 4
      app/views/registration_steps/_payment_form.html.haml
  4. 7
      app/views/registration_steps/_review.html.haml
  5. 4
      app/views/shared/_footer.html.haml
  6. 1
      app/views/workshops/new.html.haml

5
app/views/application/contact.html.haml

@ -6,5 +6,6 @@
%h2=_'articles.contact.headings.sent', :t %h2=_'articles.contact.headings.sent', :t
%p=_'articles.contact.paragraphs.sent', :p %p=_'articles.contact.paragraphs.sent', :p
- else - else
%h2=_'articles.contact.headings.contact' %h2=_'Email info@bikebike.org & bikebikeeverywhere@gmail.coom'
= render 'contact', cancel_btn: false -#%h2=_'articles.contact.headings.contact'
-# = render 'contact', cancel_btn: false

2
app/views/conferences/_conference.html.haml

@ -6,7 +6,7 @@
.title .title
%h1=_!conference.title %h1=_!conference.title
.details .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? - if conference.start_date.present? && conference.end_date.present?
.secondary .secondary
= date_span(conference.start_date.to_date, conference.end_date.to_date) = date_span(conference.start_date.to_date, conference.end_date.to_date)

4
app/views/registration_steps/_payment_form.html.haml

@ -10,6 +10,10 @@
- unless @currencies.present? && @currencies.length > 1 - unless @currencies.present? && @currencies.length > 1
%p.center=_"articles.conference_registration.paragraphs.currency_details", :p, vars: { currency: (_"currencies.#{(@currencies || [@currency]).first}.displayName-count-other") } %p.center=_"articles.conference_registration.paragraphs.currency_details", :p, vars: { currency: (_"currencies.#{(@currencies || [@currency]).first}.displayName-count-other") }
= save_registration_step do = save_registration_step do
- 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 .registration-step-options
.options.graded-options{class: "option-count-#{@amounts.size}"} .options.graded-options{class: "option-count-#{@amounts.size}"}
- @amounts.each_with_index do |option, i| - @amounts.each_with_index do |option, i|

7
app/views/registration_steps/_review.html.haml

@ -77,6 +77,13 @@
%td{colspan: 3, lang: guest.user.locale.to_s == I18n.locale.to_s ? nil : guest.user.locale} %td{colspan: 3, lang: guest.user.locale.to_s == I18n.locale.to_s ? nil : guest.user.locale}
= paragraph guest.housing_data['other'] = 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 - if @this_conference.registration_open
= row do = row do
= columns(medium: 12) do = columns(medium: 12) do

4
app/views/shared/_footer.html.haml

@ -17,7 +17,9 @@
= signin_link = signin_link
%ul.locales %ul.locales
.site-info .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 .copy
=_'links.footer.help_text.contributors', 'Who contributed to building this website' do |title| =_'links.footer.help_text.contributors', 'Who contributed to building this website' do |title|
=link_to :humans_txt, {title: title} do =link_to :humans_txt, {title: title} do

1
app/views/workshops/new.html.haml

@ -23,6 +23,7 @@
= checkboxes :languages, User.AVAILABLE_LANGUAGES, @languages, 'languages', vertical: true, heading: 'articles.workshops.headings.languages', help: 'articles.workshops.paragraphs.languages' = 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 = 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 = columns(medium: 6) do
- 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' = 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' = radiobuttons :space, Workshop.all_spaces, @workshop.space, 'workshop.options.space', vertical: true, heading: 'articles.workshops.headings.space', help: 'articles.workshops.paragraphs.space'

Loading…
Cancel
Save