2016 design

app/views/shared/_donate_button.html.haml

@@ -5,4 +5,4 @@
 	%input{type: 'hidden', name: 'item_name', value: 'Bike!Bike!'}
 	%input{type: 'hidden', name: 'no_note', value: '0'}
 	%input{type: 'hidden', name: 'currency_code', value: 'USD'}
-	%button{type: 'submit', value: 'PP-DonationsBF:paypal_logo.png:NonHostedGuest'}=_'donate.button_label','Donate!'
+	%button{type: 'submit', value: 'PP-DonationsBF:paypal_logo.png:NonHostedGuest'}=_'donate.button_label','Donate'

app/views/shared/_footer.html.haml

@@ -1,26 +1,21 @@
+.facebook
+	=_'links.footer.help_text.facebook', 'Join our facebook group' do |title|
+		%a{href: 'https://www.facebook.com/groups/648758205249998/', target: :_blank, title: title}
+			=svg_sprite  'icons', 'bb-icon-fb', 'facebook logo'
 .github
 	=svg_sprite  'icons', 'bb-icon-github', 'github logo'
 	%a{href: 'https://github.com/bikebike/BikeBike/issues', target: :_blank}
 		=_'links.footer.text.File_an_Issue'
 	=_!'|'
-	%a{href: 'https://github.com/bikebike/BikeBike/contributing.md', target: :_blank}
+	%a{href: 'https://github.com/bikebike/BikeBike', target: :_blank}
 		=_'links.footer.text.Help_contribute'
-.facebook
-	=_'links.footer.help_text.facebook', 'Join our facebook group' do |title|
-		%a{href: 'https://www.facebook.com/groups/648758205249998/', target: :_blank, title: title}
-			=svg_sprite  'icons', 'bb-icon-fb', 'facebook logo'
-.locale
-	=_'links.footer.help_text.select_language', 'Select your language' do |title|
-		%input{type: :checkbox, id: 'select-language'}
-		%label.launch{title: title, for: 'select-language'}
-			=_!I18n.locale.upcase
-		.selector
-			%ul
-				-I18n.backend.enabled_locales.each do |locale|
-					%li
-						%a{href: home_url(url_params(locale))}
-							=_! locale.upcase
-						%span=I18n.t("languages.#{locale}", locale: locale, context: I18n.t("languages.#{locale}"))
+%ul.locales
+	-I18n.backend.enabled_locales.each do |locale|
+		- if locale.to_s != I18n.locale.to_s # don't show the current locale
+			%li
+				- locale_translation = I18n.t("languages.#{locale}", locale: locale, context: I18n.t("languages.#{locale}"))
+				%a{href: url_for(params.merge(url_params(locale)))}
+					=_'translate.content.change_locale', "Read in #{locale_translation}", vars: {locale: locale_translation}
 .copy
 	=_'links.footer.help_text.contributors', 'Who contributed to building this website' do |title|
 		=link_to :humans_txt, {title: title} do

app/views/shared/_navbar.html.haml

@@ -1,21 +1,14 @@
 %nav
 	#main-nav
-		.inner-nav
-			= link_to '/', :class => 'logo' do
-				= svg_sprite('icons', "bb-icon-logo", "Logo")
-				= svg_sprite('icons', "bb-icon-logo-text", "Logo Text")
-			.nav
-				= nav_link home_path, (@conference ? @conference.title : 'Bike!Bike!')
-				= nav_link about_path, (_'page_titles.About_BikeBike')
-				= nav_link policy_path, (_'page_titles.Safe_Space_Policy')
-			.actions
+		= row(class: 'inner-nav') do
+			= columns(medium: 4, class: 'inner-nav') do
+				= link_to '/', :class => 'logo' do
+					= svg_sprite('icons', "bb-icon-logo", "Logo")
+					= svg_sprite('icons', "bb-icon-logo-text", "Logo Text")
+			= columns(medium: 8, class: 'nav') do
+				= nav_link about_path, (_'page_titles.About'), 'about'
+				= nav_link policy_path, (_'page_titles.Policy'), 'policy'
 				- if @conference && @conference.registration_open
-					- if params[:action] != 'register' && !@registration
-						= link_to register_path(@conference.slug), class: [:button, :register] do
-							=_'conference.actions.Register'
-				- elsif @conference
+					= nav_link register_path(@conference.slug), (_'page_titles.Register')
+				- else
 					= render 'shared/donate_button', :email_address => (@conference.paypal_email_address || @conference.email_address)
-				- if current_user
-					= form_tag :logout, class: :logout do
-						=hidden_field_tag :url, request.fullpath
-						=button_tag :Log_out