Sidebar content

app/views/conferences/show.html.haml

@@ -7,3 +7,9 @@
 	.columns.large-10
 		%h2=('About '+@conference.title)
 		%p=@conference.info.html_safe
+
+- content_for :side_bar do
+	%h5= @conference.title+' is hosted by:'
+	%ul.preview-list.org-list.small-block-grid-2.large-block-grid-1
+		- @conference.organizations.each do |organization|
+			%li=render 'organizations/preview', :organization => organization

app/views/layouts/application.html.haml

@@ -41,7 +41,10 @@
 			- if has_banner?
 				%header#banner{banner_attrs(yield_or_default :banner_image)}
 					= yield :banner
-				= banner_attribution
+					= banner_attribution
+			- if content_for?(:side_bar)
+				%aside#side-bar
+					= yield :side_bar
 			- if has_content?
 				#content=yield
 			- else

app/views/organizations/show.html.haml

@@ -1,4 +1,4 @@
-- banner_image @organization.cover_url
+- banner_image @organization.cover_url, id: @organization.cover_attribution_id, name: @organization.cover_attribution_name, user_id: @organization.cover_attribution_user_id, src: @organization.cover_attribution_src
 - page_style 'article'
 - content_for :banner do
 	.row{:class => (@organization.avatar.is_landscape? ? 'landscape' : 'portrait')}

app/views/pages/home.html.haml

@@ -4,11 +4,6 @@
 - if @conference
 	= render 'conferences/header'
 
--#%section
--#	.row
--#		.columns.medium-6
--#			%h1
--#				Welcome to Bike!Bike!
--#			%p
--#				= _ 'home.its_awesome', 'paragraph'
--#		.columns.medium-6
+- content_for :side_bar do
+	%p
+		Bike!Bike! is an international annual gathering organized by and for community bicycle projects. The conference is a space for participants from shops and related advocacy groups to converge in a different city each year over a 4 day period to have workshops and strengthen our social network.

app/views/shared/_navbar.html.haml

@@ -8,21 +8,3 @@
 		= link_to (_'Conferences'), :conferences, {:class => ['button', 'conference']}
 		= link_to (_'Organizations'), {:controller => :organizations}, {:class => ['button', 'organization']}
 		= link_to (_'Zine'), 'http://zinezine.bikebike.org', :class => ['button', 'article']
-	- if is_this_the_front_page?
-		%p
-			Bike!Bike! is an international annual gathering organized by and for community bicycle projects. The conference is a space for participants from shops and related advocacy groups to converge in a different city each year over a 4 day period to have workshops and strengthen our social network.
-		-#%iframe{:src => "//player.vimeo.com/video/76149097", :width => "500", :height => "281", :frameborder => "0", :webkitallowfullscreen => true, :mozallowfullscreen => true, :allowfullscreen => true}
-	-#- if current_user
-	-#	%li.has-form.sign-out.hide-for-small
-	-#		= link_to (_"Sign_Out"), :logout, method: :post, :class => 'button'
-	-#	%li.user-profile.has-dropdown
-	-#		= link_to current_user do
-	-#			= image_tag(current_user.avatar_url(:icon))
-	-#			%span
-	-#				%span.show-for-small=current_user.username
-	-#		%ul.dropdown
-	-#			%li= link_to 'View Profile', current_user
-	-#			%li= link_to 'Edit Profile', edit_user_path(current_user.id)
-	-#- else
-	-#	%li.has-form.sign-in
-	-#		= link_to (_"Sign_In"), :login, :class => 'button'