diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss index a1e242f2..f9d74b84 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 4b01c7e2..8ac3abfd 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 e9efc236..0d82808f 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/app/views/user_mailer/workshop_facilitator_request.html.haml b/app/views/user_mailer/workshop_facilitator_request.html.haml index 620baea1..34639b57 100644 --- a/app/views/user_mailer/workshop_facilitator_request.html.haml +++ b/app/views/user_mailer/workshop_facilitator_request.html.haml @@ -4,8 +4,8 @@ %p =_'email.workshop.paragraph.request_instructions',"You can approve or deny this request on your workshop page: " - - workshop_link = @host + view_workshop_url(@conference.slug, @workshop.id).html_safe + - workshop_link = view_workshop_url(@conference.slug, @workshop.id).html_safe %a{href: workshop_link}=_!(workshop_link) %p=_'email.workshop.paragraph.request_reply_instructions',"You can also reply directly to this email to ask follow-up questions." - \ No newline at end of file + diff --git a/app/views/user_mailer/workshop_facilitator_request_approved.html.haml b/app/views/user_mailer/workshop_facilitator_request_approved.html.haml index 1e979e0a..b1f8d1b2 100644 --- a/app/views/user_mailer/workshop_facilitator_request_approved.html.haml +++ b/app/views/user_mailer/workshop_facilitator_request_approved.html.haml @@ -1,4 +1,4 @@ %p - - workshop_link = link_to (_!@workshop.title), @host + view_workshop_url(@conference.slug, @workshop.id) + - workshop_link = link_to (_!@workshop.title), view_workshop_url(@conference.slug, @workshop.id) =_'email.workshop.paragraph.request_approved',"You have been added as a facilitator of #{workshop_link.html_safe}.", vars: {workshop_title: workshop_link.html_safe} diff --git a/app/views/user_mailer/workshop_facilitator_request_denied.html.haml b/app/views/user_mailer/workshop_facilitator_request_denied.html.haml index 6697f2b2..40282edd 100644 --- a/app/views/user_mailer/workshop_facilitator_request_denied.html.haml +++ b/app/views/user_mailer/workshop_facilitator_request_denied.html.haml @@ -1,3 +1,3 @@ %p - - workshop_link = link_to (_!@workshop.title), @host + view_workshop_url(@conference.slug, @workshop.id).html_safe + - workshop_link = link_to (_!@workshop.title), view_workshop_url(@conference.slug, @workshop.id).html_safe =_'email.workshop.paragraph.request_denied',"Your request to become a facilitator of #{workshop_link} has been denied. If you think this was in error, you may contact the current facilitators by making another request to facilitate.", vars: {workshop_title: workshop_link.html_safe} diff --git a/app/views/user_mailer/workshop_original_content_changed.html.haml b/app/views/user_mailer/workshop_original_content_changed.html.haml index d7a88ff2..c393c37b 100644 --- a/app/views/user_mailer/workshop_original_content_changed.html.haml +++ b/app/views/user_mailer/workshop_original_content_changed.html.haml @@ -10,5 +10,5 @@ %p =_'email.workshop.paragraph.view_workshop',"You can view the workshop here: " - - workshop_link = @host + view_workshop_path(@workshop.conference.slug, @workshop.id) + - workshop_link = view_workshop_path(@workshop.conference.slug, @workshop.id) %a{href: workshop_link}=workshop_link diff --git a/app/views/user_mailer/workshop_translated.html.haml b/app/views/user_mailer/workshop_translated.html.haml index 9b39b312..ecb0df2f 100644 --- a/app/views/user_mailer/workshop_translated.html.haml +++ b/app/views/user_mailer/workshop_translated.html.haml @@ -10,5 +10,5 @@ %p =_'email.workshop.paragraph.view_workshop',"You can view the workshop here: " - - workshop_link = @host + view_workshop_url(@workshop.conference.slug, @workshop.id) + - workshop_link = view_workshop_url(@workshop.conference.slug, @workshop.id) %a{href: workshop_link}=_!(workshop_link) diff --git a/config/locales/en.yml b/config/locales/en.yml index 6240dc91..b2cd4821 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 d0f77c54..f18b82fd 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 48e8393c..9f864e1f 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.