Merge branch 'sismo' of github.com:afimb/chouette2 into sismo

5 files changed, 21 insertions, 21 deletions

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 5ff860a54..418b90e72 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -25,6 +25,7 @@
         <div class="col-md-9">
           <div id="workspace" class="<%= controller_name %> <%= action_name %>">
             <%= render partial: "shared/flash_messages", flash: flash %>
+            <%= render partial: "shared/breadcrumb" %>
             <%= yield %>
           </div>
         </div>
diff --git a/app/views/layouts/without_sidebar.html.erb b/app/views/layouts/without_sidebar.html.erb
index d07139c2f..c61dc6b25 100644
--- a/app/views/layouts/without_sidebar.html.erb
+++ b/app/views/layouts/without_sidebar.html.erb
@@ -25,6 +25,7 @@
         <div class="col-md-12">
           <div id="workspace" class="<%= controller_name %> <%= action_name %>">
             <%= render partial: "shared/flash_messages", flash: flash %>
+            <%= render partial: "shared/breadcrumb" %>
             <%= yield %>
           </div>
         </div>
diff --git a/app/views/time_tables/show.html.erb b/app/views/time_tables/show.html.erb
index b5c5c9dfe..e02d96a58 100644
--- a/app/views/time_tables/show.html.erb
+++ b/app/views/time_tables/show.html.erb
@@ -1,7 +1,4 @@
 <% require 'calendar_helper' %>
-<ol class="breadcrumb">
-  <li><%= link_to Referential.human_attribute_name("time_tables"), referential_time_tables_path(@referential) %></li>
-</ol>
 
 <%= title_tag t('time_tables.show.title', :time_table => @time_table.comment )%>
 
diff --git a/app/views/vehicle_journeys/_form.html.erb b/app/views/vehicle_journeys/_form.html.erb
index 934e76066..e785c70dc 100644
--- a/app/views/vehicle_journeys/_form.html.erb
+++ b/app/views/vehicle_journeys/_form.html.erb
@@ -11,26 +11,29 @@
     <%= form.input :facility %>
     <%= form.input :vehicle_type_identifier%>
     <%= form.input :objectid, :required => !@vehicle_journey.new_record? %>
-
-	  <%= form.inputs :class => "stop_times", :name => @vehicle_journey.human_attribute_name(:vehicle_journey_at_stop_ids) do %>
-	    <table border="0" class="vehicle_journey_at_stops">
+    <%= form.input :time_table_tokens, :label => t('.time_tables'), :as => :text,  :input_html => { :"data-pre" => ( @vehicle_journey.time_tables.map { |time_table| { :id => time_table.id, :name => time_table_description(time_table) } } ).to_json }  %>
+    <li class="input">
+	    <%= form.label @vehicle_journey.human_attribute_name(:vehicle_journey_at_stop_ids), :class => "label" %>
+    </li>
+    <div class="vehicle_journey_at_stops">
+	    <table class="table table-hover table-striped">
 	      <thead>
 	        <tr>
 	          <th class="hour title"><%= t('.arrival') %></th>
 	          <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 %>
+          <% 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>
@@ -44,9 +47,7 @@
 	        :collection => @vehicle_journey.vehicle_journey_at_stops, :as => :vehicle_journey_at_stop %>
 	      </tbody>
 	    </table>
-	  <% end %>
-    <%= form.input :time_table_tokens, :label => t('.time_tables'), :as => :text,  :input_html => { :"data-pre" => ( @vehicle_journey.time_tables.map { |time_table| { :id => time_table.id, :name => time_table_description(time_table) } } ).to_json }  %>
-
+    </div>
   <% end %>
 
   <%= form.actions do %>
diff --git a/app/views/vehicle_journeys/show.html.erb b/app/views/vehicle_journeys/show.html.erb
index 235268575..01f44c7b0 100644
--- a/app/views/vehicle_journeys/show.html.erb
+++ b/app/views/vehicle_journeys/show.html.erb
@@ -68,7 +68,7 @@
 </div>
 <h3><%= @vehicle_journey.human_attribute_name(:vehicle_journey_at_stop_ids) %></h3>
 <div class="vehicle_journey_at_stops content">
-  <table class="table table-hover">
+  <table class="table table-hover table-striped">
     <thead>
       <tr>
         <th class="hour title"><%= t('.arrival') %></th>