New logo and font and a few other minor things

2014-07-09 23:04:52 -06:00
parent 41165891b5
commit 623445411a
13 changed files with 68 additions and 24 deletions
@@ -11,7 +11,7 @@
 				%h1='Bike!Bike! '+@conference.start_date.year.to_s
 				%h2
 					- location = @conference.organizations.first.locations.first
-					= location.city + ', ' + (location.territory || location.country)
+					= location.city + ', ' + (location.territory ? Carmen::Country.coded(location.country).subregions.coded(location.territory).name : location.country)
 				%em
 					= (l @conference.start_date, format: :date) + ' - ' + (l @conference.end_date, format: :date)
 				- if params['controller'] != 'conferences'