User settings page

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")