User settings page

app/views/application/user_settings.html.haml

@@ -0,0 +1,23 @@
+= render :partial => 'application/header', :locals => {:image_file => @banner_image || 'grafitti.jpg'}
+%article
+	= row do
+		= columns do
+			- if logged_in?
+				%h2=_'articles.user_settings.headings.Your_Account'
+				- if @conference.present? && (@conference.registration_status == :pre || @conference.registration_status == :open)
+					%p=_'articles.user_settings.paragraphs.conference_registration', :t
+					= link_to (_'actions.conference.edit_registration'), register_path(@conference.slug), class: :button
+
+				= form_tag update_settings_path do
+					= textfield :name, current_user.name, required: true, heading: 'articles.conference_registration.headings.name', big: true
+					= checkboxes :languages, [:en, :es, :fr], current_user.languages || [I18n.locale], 'languages', heading: 'articles.conference_registration.headings.languages'
+					= radiobuttons :preferred_language, [:en, :es, :fr], 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
+						= button_tag :save, value: :save
+			- else
+				%h2=_'forms.actions.generic.login'
+				= form_tag do_confirm_path, class: 'flex-form' do
+					= emailfield :email, nil, big: true
+					= button_tag :continue, :value => :confirm_email
+					= link_to (_'forms.actions.generic.facebook_sign_in','Facebook Sign In'), auth_at_provider_path(provider: :facebook), class: [:button, :facebook]

app/views/layouts/application.html.haml

@@ -27,8 +27,6 @@
 				- if content_for?(:side_bar)
 					%nav#side-bar
 						= yield :side_bar
-				-# - flash.each do |key, msg|
-				-# 	= content_tag :div, msg, :id => key
 				%header#banner=yield :banner
 				- if @submenu
 					=row do
@@ -42,7 +40,7 @@
 					= yield
 			#footer
 				%footer= render 'shared/footer'
-		- if @confirmation_dlg.present?	|| @info_dlg.present?
+		- if @confirmation_dlg.present?	|| @info_dlg.present? || @login_dlg.present?
 			#content-overlay
 				#overlay
 				- if @confirmation_dlg.present?
@@ -60,6 +58,18 @@
 							.dlg-inner
 								%p.message=''
 								%button.close=_'modals.done_button'
+				- if @login_dlg.present?
+					.dlg#login-dlg
+						.dlg-content
+							%h2.title=_'forms.actions.generic.login'
+							.dlg-inner
+								= form_tag do_confirm_path, class: 'flex-form' do
+									= hidden_field_tag :dest, settings_path
+									= emailfield :email, nil, big: true
+									= button_tag :continue, :value => :confirm_email
+								.flex-form
+									= link_to (_'forms.actions.generic.facebook_sign_in','Facebook Sign In'), auth_at_provider_path(provider: :facebook, dest: settings_path), class: [:button, :facebook]
+									%button.close.subdued=_'forms.actions.generic.cancel'
 		
 		= yield :footer_scripts if content_for?(:footer_scripts)
 		= inline_scripts

app/views/shared/_footer.html.haml

@@ -15,7 +15,15 @@
 			- locale_translation = language(locale, true)
 			%a{href: url, lang: locale}
 				=_'translate.content.change_locale', "Read in #{locale_translation}", vars: {language: locale_translation}, locale: locale if locale != I18n.locale.to_s
-.copy
-	=_'links.footer.help_text.contributors', 'Who contributed to building this website' do |title|
-		=link_to :humans_txt, {title: title} do
-			=((_!"©#{Date.today.strftime("%Y")} Bike!Bike!") || '').html_safe
+.site-info
+	.user-controls
+		- if logged_in?
+			= link_to (_!current_user.name), settings_path, class: 'my-account'
+			= _!' | '
+			= link_to (_'forms.actions.generic.Log_out'), logout_path
+		- else
+			= signin_link
+	.copy
+		=_'links.footer.help_text.contributors', 'Who contributed to building this website' do |title|
+			=link_to :humans_txt, {title: title} do
+				=((_!"©#{Date.today.strftime("%Y")} Bike!Bike!") || '').html_safe

app/views/shared/_navbar.html.haml

@@ -2,11 +2,6 @@
 	#main-nav
 		- begin
 			= row(class: 'inner-nav') do
-				- if logged_in?
-					= columns(medium: 12, class: 'user-nav') do
-						.user-nav-bar
-							=link_to (_!current_user.name), register_step_path(@conference.slug, :contact_info), class: 'my-account'
-							=link_to (_'forms.actions.generic.Log_out'), logout_path
 				= columns(medium: 4, class: 'inner-nav') do
 					= link_to home_path, :class => 'logo' do
 						= svg_sprite('icons', "bb-icon-logo", "Logo")