Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2

2 files changed, 29 insertions, 0 deletions

diff --git a/app/assets/javascripts/public/vehicle_journey.js.coffee b/app/assets/javascripts/public/vehicle_journey.js.coffee
new file mode 100644
index 000000000..4b75bb7c4
--- /dev/null
+++ b/app/assets/javascripts/public/vehicle_journey.js.coffee
@@ -0,0 +1,14 @@
+jQuery ->
+  switch_vehicle_journey_at_stops = (event) -> 
+    event.preventDefault()
+    $('.vehicle_journeys.show .vehicle_journey_at_stops.content').toggle('slow')
+    $('a.vehicle_journey_at_stops .switcher').toggle()
+
+  $('.vehicle_journeys.show a.vehicle_journey_at_stops').click(switch_vehicle_journey_at_stops)
+
+  switch_time_tables = (event) -> 
+    event.preventDefault()
+    $('.vehicle_journeys.show .vehicle_journey_time_tables.content').toggle('slow')
+    $('a.vehicle_journey_time_tables .switcher').toggle()
+
+  $('.vehicle_journeys.show a.vehicle_journey_time_tables').click(switch_time_tables)
diff --git a/app/assets/javascripts/route.js.coffee b/app/assets/javascripts/route.js.coffee
new file mode 100644
index 000000000..a3dd304d3
--- /dev/null
+++ b/app/assets/javascripts/route.js.coffee
@@ -0,0 +1,15 @@
+jQuery ->
+  switch_journey_patterns = (event) -> 
+    event.preventDefault()
+    $('.routes.show .journey_patterns.content').toggle('slow')
+    $('a.journey_patterns .switcher').toggle()
+
+  $('.routes.show a.journey_patterns').click(switch_journey_patterns)
+
+  switch_stop_points = (event) -> 
+    event.preventDefault()
+    $('.routes.show .stop_points.content').toggle('slow')
+    $('a.stop_points .switcher').toggle()
+
+  $('.routes.show a.stop_points').click(switch_stop_points)
+