From c979faba78d317caf140debe43f568c172e01ed8 Mon Sep 17 00:00:00 2001 From: Godwin Date: Mon, 14 Aug 2017 19:40:43 -0700 Subject: [PATCH] Guest details for hosts --- app/assets/stylesheets/_application.scss | 5 +++++ app/views/layouts/application.html.haml | 1 - .../registration_steps/_review.html.haml | 22 ++++++++++++++++++- config/locales/en.yml | 5 +++++ config/locales/es.yml | 5 +++++ config/locales/fr.yml | 5 +++++ 6 files changed, 41 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss index a1e242f..f9d74b8 100644 --- a/app/assets/stylesheets/_application.scss +++ b/app/assets/stylesheets/_application.scss @@ -326,6 +326,10 @@ table, .table { overflow: auto !important; } } + + &.full { + width: 100%; + } } .table-scroller { @@ -462,6 +466,7 @@ body.expanded-element { .responsive-table { display: block; + width: 100%; .table-td { padding: 1em; diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 4b01c7e..8ac3abf 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -91,4 +91,3 @@ = javascripts = inline_scripts = emit_js_translations - =# javascript_include_tag :jsreader diff --git a/app/views/registration_steps/_review.html.haml b/app/views/registration_steps/_review.html.haml index e9efc23..0d82808 100644 --- a/app/views/registration_steps/_review.html.haml +++ b/app/views/registration_steps/_review.html.haml @@ -47,7 +47,27 @@ = row do = columns(medium: 12) do %h4=_'articles.conference_registration.headings.hosting_info', :t - = richtext @host.housing_data['info'] + #house-rules{lang: @host.user.locale.to_s == I18n.locale.to_s ? nil : @host.user.locale} + = richtext @host.housing_data['info'] +- elsif @guests + = row do + = columns(medium: 12) do + %h3=_'articles.conference_registration.headings.Hosting', :t + %p=_'articles.conference_registration.paragraphs.Hosting', :p, vars: { count: @guests.sum { |s| s.size } } + = row do + = columns(medium: 12) do + %h4=_'articles.conference_registration.headings.guests', :t + - @guests.each do |space, guests| + %h5=_"forms.labels.generic.#{space}" + %table.full + - guests.each do |guest| + %tr + %th=guest.user.name + %th=guest.from + %tr + - if guest.housing_data['other'].present? + %td{colspan: 2, 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 diff --git a/config/locales/en.yml b/config/locales/en.yml index 6240dc9..b2cd482 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1725,6 +1725,7 @@ en: name: Name languages: Languages spoken headings: + guests: Guests pronoun: Pronoun (he/she/they) Back_to: 'Back to:' group_ride: Do you plan to attend the group ride? @@ -1838,6 +1839,10 @@ en: housing: Rules: House Rules paragraphs: + Hosting: + zero: You have not been selected to host any guests yet, please keep in mind that your guest list may change at any time. If you have any questions or issues about your guests, please reach out to the conference organizers. + one: You have been selected to host one guest, please keep in mind that your guest list may change at any time. If you have any questions or issues about your guests, please reach out to the conference organizers. + other: You have been selected to host %{count} guests, please keep in mind that your guest list may change at any time. If you have any questions or issues about your guests, please reach out to the conference organizers. Housing: You are staying at %{address}, your host's name is %{name}. You can contact them by email %{email} or by phone at %{phone}. Please take some time to read their house rules below. pronoun: It is important that communications with you and about you are as respectful as possible. If you do not provide a pronoun organizers may assume diff --git a/config/locales/es.yml b/config/locales/es.yml index d0f77c5..f18b82f 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1401,7 +1401,12 @@ es: pronoun: Pronombre con el que te identificas (él/ella/ellxs) review: Revisar your_location: Ciudad o localidad en la que vives? + guests: Invitados paragraphs: + Hosting: + zero: No ha sido seleccionado para recibir invitados todavía, tenga en cuenta que su lista de invitados puede cambiar en cualquier momento. Si tiene alguna pregunta o problema sobre sus invitados, favor de comunicarse con los organizadores de la conferencia. + one: Usted ha sido seleccionado para recibir un invitado, por favor tenga en cuenta que su lista de invitados puede cambiar en cualquier momento. Si tiene alguna pregunta o problema sobre sus invitados, favor de comunicarse con los organizadores de la conferencia. + other: Usted ha sido seleccionado para recibir %{count} invitados, por favor tenga en cuenta que su lista de invitados puede cambiar en cualquier momento. Si tiene alguna pregunta o problema sobre sus invitados, favor de comunicarse con los organizadores de la conferencia. Payment_Made: Usted ya ha realizado un pago de %{fees_paid}. Payment_Add: "¡Gracias! Abajo puedes agregar más dinero a esta cantidad si deseas realizar otro pago. " diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 48e8393..9f864e1 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1158,6 +1158,7 @@ fr: recycle_parts: Organismes de vélo à but non lucratif conference_registration: headings: + guests: Invités policy: Politique Policy_Agreement: Accord d’espace positif contact_info: Coordonnées @@ -1240,6 +1241,10 @@ fr: quiet: Maison calme not_attending: Je n’assisterai pas à la conférence paragraphs: + Hosting: + zero: Vous n'avez pas encore été sélectionné pour héberger des invités, n'oubliez pas que votre liste d'invités peut changer à tout moment. Si vous avez des questions ou des problèmes concernant vos invités, veuillez contacter les organisateurs de la conférence. + one: Vous avez été sélectionné pour héberger un invité, veuillez garder à l'esprit que votre liste d'invités peut changer à tout moment. Si vous avez des questions ou des problèmes concernant vos invités, veuillez contacter les organisateurs de la conférence. + other: Vous avez été sélectionné pour accueillir %{count} invités, n'oubliez pas que votre liste d'invités peut changer à tout moment. Si vous avez des questions ou des problèmes concernant vos invités, veuillez contacter les organisateurs de la conférence. Contact_Info: Parlez-nous un peu de vous Confirm_Agreement: En cliquant sur « J’accepte », vous vous engagez à faire votre possible pour appliquer l’Accord d’espace positif de Bike!Bike! Merci.