4 files changed, 32 insertions, 2 deletions
diff --git a/app/assets/stylesheets/routes.css.scss b/app/assets/stylesheets/routes.css.scss
index 72670197b..2ecfef0a5 100644
--- a/app/assets/stylesheets/routes.css.scss
+++ b/app/assets/stylesheets/routes.css.scss
@@ -74,10 +74,15 @@
         @include content_to_clear;
     }
     
+    .route_journey_patterns {
+        cursor: pointer;
+    }
+    
     .route_stop_points {
         clear: both;
         margin: 0px;
         padding: 0px;
+        cursor: pointer;
     }
 
     .stop_point {
diff --git a/app/assets/stylesheets/vehicle_journeys.css.scss b/app/assets/stylesheets/vehicle_journeys.css.scss
index 3843f15d0..76d78dd39 100644
--- a/app/assets/stylesheets/vehicle_journeys.css.scss
+++ b/app/assets/stylesheets/vehicle_journeys.css.scss
@@ -65,6 +65,21 @@
 }
 
 #workspace.vehicle_journeys.show, #workspace.vehicle_journeys.edit, #workspace.vehicle_journeys.update, #workspace.vehicle_journeys.create, #workspace.vehicle_journeys.new {
+
+    h3 {
+      .vehicle_journey_at_stops {
+      cursor: pointer;
+      }
+    }
+    
+      .to_departures {
+      cursor: pointer;
+      }
+      
+      .to_arrivals {
+      cursor: pointer;
+      }
+    
     .vehicle_journey_at_stops {
         thead {
             th { text-align: center; }
@@ -117,6 +132,11 @@
         @include content_to_clear;
     }
     
+    h3 {
+      .vehicle_journey_time_tables {
+      cursor: pointer;
+      }
+    }
     .vehicle_journey_time_tables {
         clear: both;
         margin: 0px;
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3cb217b9c..64a706557 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,7 +1,12 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
   before_filter :authenticate_user!
-
+  before_filter :set_locale
+ 
+  def set_locale
+    I18n.locale = session[:language] || I18n.default_locale
+  end
+  
   protected
 
   def current_organisation
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index ad45433c1..e08689307 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -5,7 +5,7 @@ module UsersHelper
   end
 
   def user_default_avatar
-    "#{root_url}#{image_path('icons/user.png')}"
+    "#{root_url}assets/icons/user.png"
   end
 
 end