More fixes for BBSE2017

app/views/application/user_settings.html.haml

@@ -15,7 +15,7 @@
 
         = form_tag update_settings_path do
           = textfield :name, current_user.name, required: true, heading: 'articles.conference_registration.headings.name', big: true
-          = checkboxes :languages, User.AVAILABLE_LANGUAGES, current_user.languages || [I18n.locale], 'languages', heading: 'articles.conference_registration.headings.languages'
+          = checkboxes :languages, User.AVAILABLE_LANGUAGES, (current_user.languages || [I18n.locale]).map(&:to_sym), 'languages', heading: 'articles.conference_registration.headings.languages'
           = radiobuttons :preferred_language, I18n.backend.enabled_locales, current_user.locale || I18n.locale, 'languages', heading: 'articles.conference_registration.headings.preferred_language'
           = checkbox :email_subscribe, current_user.is_subscribed != false, 'articles.user_settings.email_subscribe', heading: 'articles.user_settings.headings.email_subscribe', help: 'articles.user_settings.paragraphs.email_subscribe', inline: true, right_help: true
           .actions

app/views/conferences/_contact_info.html.haml

@@ -1,9 +1,9 @@
 = columns(medium: 12) do
-	%p=_'articles.conference_registration.paragraphs.Contact_Info', :s, 2
+  %p=_'articles.conference_registration.paragraphs.Contact_Info', :s, 2
-	= form_tag register_path(@this_conference.slug) do
+  = form_tag register_path(@this_conference.slug) do
-		= textfield :name, @name, required: true, heading: 'articles.conference_registration.headings.name', big: true
+    = textfield :name, @name, required: true, heading: 'articles.conference_registration.headings.name', big: true
-		= textfield :location, (params[:location] || @registration.city || location(lookup_ip_location)), required: true, heading: 'articles.conference_registration.headings.location'
+    = textfield :location, (params[:location] || @registration.city || location(lookup_ip_location)), required: true, heading: 'articles.conference_registration.headings.location'
-		= checkboxes :languages, User.AVAILABLE_LANGUAGES, current_user.languages || [I18n.locale], 'languages', heading: 'articles.conference_registration.headings.languages'
+    = checkboxes :languages, User.AVAILABLE_LANGUAGES, (current_user.languages || [I18n.locale]).map(&:to_sym), 'languages', heading: 'articles.conference_registration.headings.languages'
-		.actions.next-prev
+    .actions.next-prev
-			= button_tag (params[:step] == :save ? :save : :next), value: :contact_info
+      = button_tag (params[:step] == :save ? :save : :next), value: :contact_info
-			= button_tag :previous, value: :prev_contact_info, class: :subdued, formnovalidate: true
+      = button_tag :previous, value: :prev_contact_info, class: :subdued, formnovalidate: true

app/views/conferences/register.html.haml

@@ -2,7 +2,7 @@
 - if @warnings.present?
   = row class: 'warnings', tag: :ul do
     - @warnings.each do | warning |
-      = columns tag: :li do
+      = columns tag: :li, class: 'warning-info' do
         = warning
 %article
   = row do