From a6002d6c9a8426c32d0763dffff8c03e28a837f3 Mon Sep 17 00:00:00 2001 From: Godwin Date: Sat, 12 Aug 2017 11:25:59 -0700 Subject: [PATCH] Development (#251) * Fixed fonts * Fixed assets * Fixed logo in emails * Switched to immediate email delivery * Fixed prod emails and added deployment tasks * Fixed deployments * Updated README * Added Bike Collectives Core to README * Fixed issue with map loading * Fixed issue with map loading * Added map JSON data to assets precompilation * Fixed error sending to conference administrators * Let error report signature wrap * Fixed backtrace in error reports * Fixed backtrace in error reports * Moved pronoun heading to make it more obvoius I moved the "Pronoun" heading directly above the input field. It turned out that a lot of users were entering "He or "She" in the name field, I believe that was because of the placement of the "Pronoun" heading. I also needed to remove the optional warning but I'm hoping that won't cause problems. * Added an error message when no email address is used on login * Fixed select guest table * Added house rules to housing admin and review * Edit workshop locale warning * Fixed workshop translation saving + ordered guests --- app/assets/stylesheets/bumbleberry-settings.json | 4 ++-- app/controllers/conference_administration_controller.rb | 2 ++ app/controllers/workshops_controller.rb | 9 +++++++-- app/helpers/registration_helper.rb | 2 +- app/views/layouts/application.html.haml | 1 + app/views/shared/_navbar.html.haml | 3 +-- config/locales/fr.yml | 2 +- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/bumbleberry-settings.json b/app/assets/stylesheets/bumbleberry-settings.json index 5846329..e134286 100644 --- a/app/assets/stylesheets/bumbleberry-settings.json +++ b/app/assets/stylesheets/bumbleberry-settings.json @@ -7,8 +7,8 @@ }, "development": { "safari": ["5", "5.1"], - "and_chr": ["59"], - "chrome": ["59"], + "and_chr": ["60"], + "chrome": ["60"], "edge": ["13"], "firefox": ["54"], "ie": ["11"], diff --git a/app/controllers/conference_administration_controller.rb b/app/controllers/conference_administration_controller.rb index a84416c..48c46ae 100644 --- a/app/controllers/conference_administration_controller.rb +++ b/app/controllers/conference_administration_controller.rb @@ -884,6 +884,8 @@ class ConferenceAdministrationController < ApplicationController end end + @guests = @guests.sort_by { |k,v| v.user.firstname } + return @hosts_affected_by_guests end diff --git a/app/controllers/workshops_controller.rb b/app/controllers/workshops_controller.rb index 6aedb28..c1d5fc4 100644 --- a/app/controllers/workshops_controller.rb +++ b/app/controllers/workshops_controller.rb @@ -147,8 +147,13 @@ class WorkshopsController < ApplicationController # only save if the text has changed, if we want to make sure only to update the translator id if necessary workshop.save_translations if do_save elsif can_edit - workshop.title = title - workshop.info = info + if workshop.locale.nil? || workshop.locale.to_s == I18n.locale.to_s + workshop.title = title + workshop.info = info + else + workshop.set_column_for_locale(:title, workshop.locale, title) + workshop.set_column_for_locale(:info, workshop.locale, info) + end workshop.languages = (params[:languages] || {}).keys.to_json workshop.needs = (params[:needs] || {}).keys.to_json workshop.theme = params[:theme] == 'other' ? params[:other_theme] : params[:theme] diff --git a/app/helpers/registration_helper.rb b/app/helpers/registration_helper.rb index 2589274..a377609 100644 --- a/app/helpers/registration_helper.rb +++ b/app/helpers/registration_helper.rb @@ -8,7 +8,7 @@ module RegistrationHelper def registration_status(registration) return :unregistered if registration.nil? - return :cancelled if registration.is_attending == 'n' + return :cancelled if registration.is_attending == 'n' && !registration.can_provide_housing return registration.status end diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 8ac3abf..4b01c7e 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -91,3 +91,4 @@ = javascripts = inline_scripts = emit_js_translations + =# javascript_include_tag :jsreader diff --git a/app/views/shared/_navbar.html.haml b/app/views/shared/_navbar.html.haml index 1a45d77..85da687 100644 --- a/app/views/shared/_navbar.html.haml +++ b/app/views/shared/_navbar.html.haml @@ -3,7 +3,7 @@ = row(class: 'inner-nav') do = columns(medium: 3) do - protect do - = link_to home_path, :class => 'logo' do + = link_to home_path, class: :logo do = svg 'logo', (_!'Bike Bike') = svg 'logo-text', (_!'Bike Bike') = off_screen _!'Bike Bike' @@ -22,4 +22,3 @@ %a{href: url, lang: locale, title: translation_text} %span{aria: {hidden: :true}}=_!locale = off_screen translation_text - \ No newline at end of file diff --git a/config/locales/fr.yml b/config/locales/fr.yml index f720c5b..48e8393 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1333,7 +1333,7 @@ fr: d’avis à nouveau,veuillez cliquer sur le boutonci-dessous,maissouvenez-vousquesi vous attendez trop longtemps,votre hébergement et votre bicyclette pourraient être attribués à quelqu’un d’autre. - Housing: Vous restez à %{address}, le nom de votre hôte est %{name}. Vous pouvez les contacter par email %{email} ou par téléphone à %{phone}. Prenez le temps de lire les règles de leur maison ci-dessous. + Housing: Vous serez hébergé(e) au %{address}, chez %{name}. Vous pouvez contacter cette personne à %{email} ou au %{phone}. Veuillez prendre la peine de lire les conditions d'hébergement ci-dessous. pronoun_optional: Il n’y a aucune obligation de choisir un pronom. pronoun: Il importe que lorsqu'on communique avec vous ou au sujet de vous, ce soit avec respect. Si vous ne précisez pas votre pronom, les organisateurs