Update slide time for vehicle journey

3 files changed, 34 insertions, 16 deletions

diff --git a/app/assets/javascripts/vehicle_journey.js.coffee b/app/assets/javascripts/vehicle_journey.js.coffee
index b2f8b9ec7..02c0c9f3b 100644
--- a/app/assets/javascripts/vehicle_journey.js.coffee
+++ b/app/assets/javascripts/vehicle_journey.js.coffee
@@ -52,11 +52,12 @@ jQuery ->
 
   slide = (event) ->
     event.preventDefault()
-    hour = parseInt( $(".vehicle_journeys .date select#date_hour").val())
-    minute = parseInt( $(".vehicle_journeys .date select#date_minute").val())
+    hour = parseInt( $(".vehicle_journey_at_stops select#date_hour").val())
+    minute = parseInt( $(".vehicle_journey_at_stops select#date_minute").val())
+    departure_or_arrival = $(".departure_or_arrival").val()
 
     selector_prefix = ".vehicle_journey_at_stops .journey_pattern_dependent_list"
-    if $(this).hasClass("departure")
+    if (departure_or_arrival == "departure")
       vjas_hour_selector = selector_prefix + " .departure_time select.hour"
       vjas_minute_selector = selector_prefix + " .departure_time select.minute"
     else
diff --git a/app/assets/stylesheets/main/vehicle_journeys.css.scss b/app/assets/stylesheets/main/vehicle_journeys.css.scss
index 78e936ac3..c026923fb 100644
--- a/app/assets/stylesheets/main/vehicle_journeys.css.scss
+++ b/app/assets/stylesheets/main/vehicle_journeys.css.scss
@@ -18,7 +18,22 @@
     
     .vehicle_journey_at_stops {
         margin-left: 25%;
-    }
+
+        .title{
+            font-weight: bold;
+            margin-bottom: 20px;
+        }
+
+        span{
+            margin-left: 10px;
+            margin-right: 10px;
+        }
+
+        .slide{
+            margin-left: 30px;
+            
+        }
+    }    
 }
 
 #workspace.vehicle_journeys.index
diff --git a/app/views/vehicle_journeys/_form.html.erb b/app/views/vehicle_journeys/_form.html.erb
index 793304397..5713a61df 100644
--- a/app/views/vehicle_journeys/_form.html.erb
+++ b/app/views/vehicle_journeys/_form.html.erb
@@ -16,7 +16,20 @@
     <li class="input">
 	    <%= form.label @vehicle_journey.human_attribute_name(:vehicle_journey_at_stop_ids), :class => "label" %>
     </li>
-    <div class="vehicle_journey_at_stops">
+    <% unless @vehicle_journey.vehicle_journey_at_stops.empty? ||
+       @vehicle_journey.vehicle_journey_at_stops.any? { |vjas| vjas.departure_time.nil? } %>    <div class="vehicle_journey_at_stops">     
+      <div class="well">
+        <span class="title">Décaler tous les horaires de la course en fonction de ceux existants</span>
+        <div>
+          <span><%= t(".set") %></span> <%= select_tag "", options_for_select( [ [t('.slide_departure'), "departure"], [t('.slide_arrival'), "arrival"] ] ), :class => "departure_or_arrival" %> <span><%= t(".to") %></span>
+          <%= select_hour(@vehicle_journey.vehicle_journey_at_stops.first.departure_time.hour) %>
+          <%= select_minute(@vehicle_journey.vehicle_journey_at_stops.first.departure_time.min) %>
+          <a class="slide btn btn-default"><%= t("formtastic.slide") %></a>
+        </div>
+      </div>
+      
+      <% end %>
+    
 	    <table class="table table-hover table-striped">
 	      <thead>
 	        <tr>
@@ -24,17 +37,6 @@
 	          <th class="stop title" ><%= t('.stop_title') %></th>
 	          <th class="hour title"><%= t('.departure') %></th>
 	        </tr>
-          <% unless @vehicle_journey.vehicle_journey_at_stops.empty? ||
-             @vehicle_journey.vehicle_journey_at_stops.any? { |vjas| vjas.departure_time.nil? } %>
-          <tr>
-            <td class="title"> <a class="slide arrival"><%= t('.slide_arrival') %></a></td>
-            <td class="date">
-              <%= select_hour(@vehicle_journey.vehicle_journey_at_stops.first.departure_time.hour, :class => "hour") %>
-              <%= select_minute(@vehicle_journey.vehicle_journey_at_stops.first.departure_time.min, :class => "minute") %>
-            </td>
-            <td class="title"> <a class="slide departure"><%= t('.slide_departure') %></a></td>
-          </tr>
-          <% end %>
 	      </thead>
 	      <tfoot>
 	        <tr>