Removed font awesome

app/views/conferences/_header.html.haml

@@ -1,12 +1,12 @@
-- banner_image @conference.cover_url, id: 532693, name: 'phil', user_id: 1429589, src: 'panoramio'
-- page_style 'emphasize-banner'
+- banner_image @conference.cover_url, id: @conference.cover_attribution_id, name: @conference.cover_attribution_name, user_id: @conference.cover_attribution_user_id, src: @conference.cover_attribution_src
+- page_style (params['controller'] == 'conferences' ? 'article' : 'emphasize-banner')
 
 - content_for :banner do
 	.row
 		.columns.small-12.banner
 			%figure
 				%img{src: @conference.poster_url}
-		.columns.medium-6.align-bottom
+		.columns.medium-8.align-bottom
 			%div
 				%h1='Bike!Bike! '+@conference.start_date.year.to_s
 				%h2
@@ -16,7 +16,7 @@
 					= (l @conference.start_date, format: :date) + ' - ' + (l @conference.end_date, format: :date)
 				- if params['controller'] != 'conferences'
 					%p= ActionView::Base.full_sanitizer.sanitize(@conference.info).gsub(/^(.{300,350}\.)(.*)$/m, '\1...')
-		.columns.medium-6.centered.align-bottom
+		.columns.medium-4.centered.align-bottom
 			%div
 				- if @conference.registration_open
 					%a.button{href: @conference.url(:register)}
@@ -24,4 +24,3 @@
 				- if params['controller'] != 'conferences'
 					%a.button.more{href: @conference.url}
 						=_'conference.More_Info'
-	= banner_attribution

app/views/conferences/index.html.haml

@@ -1,6 +1,6 @@
-- page_style :list
 - title _'page.Conferences'
 - banner_image '/assets/conference.jpg'
+- page_style :list
 - content_for :banner do
 	.row
 		.columns

app/views/layouts/application.html.haml

@@ -42,6 +42,7 @@
 			- if has_banner?
 				%header#banner{banner_attrs(yield_or_default :banner_image)}
 					= yield :banner
+				= banner_attribution
 			- if has_content?
 				#content=yield
 			- else

app/views/organizations/index.html.haml

@@ -1,6 +1,6 @@
-- page_style :list
 - title _'page.Organizations'
 - banner_image '/assets/orgs.jpg'
+- page_style :list
 - content_for :banner do
 	.row
 		.columns

app/views/organizations/show.html.haml

@@ -1,5 +1,5 @@
-- page_style 'organization'
 - banner_image @organization.cover_url
+- page_style 'article'
 - content_for :banner do
 	.row{:class => (@organization.avatar.is_landscape? ? 'landscape' : 'portrait')}
 		.columns{:class => (@organization.avatar.is_landscape? ? nil : ['medium-6', 'medium-push-6'])}

app/views/pages/translation_list.html.haml

@@ -1,3 +1,5 @@
+- banner_title 'Translations'
+
 .row
 	%h1
 		= _ 'languages.list'

app/views/pages/translations.html.haml

@@ -1,8 +1,7 @@
+- banner_title (_ 'language_translations', vars: {:language => (_ ('languages.' + @lang))})
 - page_style :form
 
 .row
-	%h1
-		= _ 'language_translations', vars: {:language => (_ ('languages.' + @lang))}
 	%table.columns#translations{data: {token: form_authenticity_token}}
 		%thead
 			%tr

app/views/shared/_footer.html.haml

@@ -1,9 +1,9 @@
 %footer.row
-	.columns.medium-8.medium-push-1.large-6.large-push-3.text-center
+	.columns.medium-8.medium-push-1.large-6.large-push-2.text-center
 		%a{href: '/conferences/'}='Conferences'
-		\/
+		%i
 		%a{href: '/conferences/'}='Organizations'
-		\/
+		%i
 		%a{href: '/conferences/'}='Zine'
 	.columns.medium-3.large-3.text-right
 		©2014 Bike!Bike!