Updates from the past fortnight

app/views/application/_translator_login.html.haml

@@ -0,0 +1,21 @@
+= row do
+	- if current_user
+		= columns(medium: 12) do
+			%h2=_'articles.permission_denied.headings.not_a_translator','Sorry you must be a translator to view this page'
+		= columns(medium: 6) do
+			%p=_'articles.permission_denied.paragraphs.translator_request', :p
+		= columns(medium: 6) do
+			= form_tag :translator_request do
+				=text_area_tag :comment, nil, placeholder: true
+				=button_tag :translator_request
+	- else
+		= columns(medium: 12) do
+			%h2=_'articles.permission_denied.headings.login_required','Sorry you must be logged in to view this page'
+		= columns(medium: 6) do
+			%p=_'articles.permission_denied.paragraphs.translator_not_logged_in', :p
+		= columns(medium: 6) do
+			= form_tag :do_confirm do
+				.email-field
+					=email_field_tag :email, nil, required: true
+					=label_tag :email
+				=button_tag :login

app/views/application/about.html.haml

@@ -6,9 +6,9 @@
 		%h1=_'page_titles.About_BikeBike'
 
 %article
-	%h2=_'page_titles.About_BikeBike', :t
-	%p=_'static_text.about.paragraph_1', :p
+	%h2=_'articles.about_bikebike.headings.About_BikeBike', :t
+	%p=_'articles.about_bikebike.paragraphs.paragraph_1', :p
 
-	%h2=_'page_titles.About_BikeBike_2', :t
+	%h2=_'articles.about_bikebike.headings.About_BikeBike_2', :t
 	%figure{style: "background-image: url(#{image_url('columbus_people.jpg')})"}
-	%p=_'static_text.about.paragraph_2', :p
+	%p=_'articles.about_bikebike.paragraphs.paragraph_2', :p

app/views/application/home.html.haml

@@ -1,3 +1,5 @@
+-# EmailConfirmation.create(user: User.find_by_email('goodgodwin@hotmail.com'), url: '/')
+
 - this_is_the_front_page
 - if @conference
 	= render 'conferences/header'

app/views/application/permission_denied.html.haml

@@ -1,9 +1,15 @@
-- page_title = _'error.403.page_title.Permission_Denied'
-- title page_title
-- banner_title page_title
+- content_for :banner do
+	- image = image_url('403.jpg')
+	#header-title.short{style: capable_of(:svg) ? nil : "background-image: url(#{image})"}
+		- if capable_of(:svg)
+			= render 'application/banner_image.svg', {:image => image}
+		%h1=_'page_titles.Permission_Denied'
 
-.row
-	%h1
-		=_'error.403.title','This page is inaccessible to you'
-	%p
-		=_'error.403.description', :p
+%article
+	- if @template
+		=render @template
+	- else
+		%h2
+			=_'articles.permission_denied.headings.main','Sorry, you currently don\'t have access to this page'
+		%p
+			=_'articles.permission_denied.paragraphs.main', :p

app/views/layouts/application.html.haml

@@ -3,7 +3,7 @@
 	%head
 		%meta{ charset: 'utf-8' }
 		%meta{ name: 'viewport', content: 'width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0' }
-		%title= (yield :title) + (content_for?(:title) ? _!' | ' : '') + _!'Bike!Bike!'
+		%title= (yield :title) + (content_for?(:title) ? (_!' | ') : '') + (_!'Bike!Bike!')
 		%meta{ name: 'description', content: (yield_or_default :description, I18n.t('page_descriptions.home')) }
 		= csrf_meta_tags
 		= inject_css!

app/views/shared/_footer.html.haml

@@ -9,7 +9,19 @@
 	=_'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.available_locales.each do |locale|
+					%li
+						%a{href: request.original_url.gsub(/^(https?:\/\/)(..\.)?(.*)$/, '\1' + locale + '.\3')}
+							=_! locale.upcase
+						%span=I18n.t("languages.#{locale}", locale: locale, context: I18n.t("languages.#{locale}"))
 .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!"
+			=(_!"©#{Date.today.strftime("%Y")} Bike!Bike!").html_safe

app/views/user_mailer/test_email.text.haml

@@ -0,0 +1 @@
+Hi, this is a test. Did you get it?