Refs #1295: convert erb to slim (vehicle_journeys)

38 files changed, 391 insertions, 453 deletions

diff --git a/app/views/vehicle_journeys/_form.html.erb b/app/views/vehicle_journeys/_form.html.erb
deleted file mode 100644
index 71f653b5c..000000000
--- a/app/views/vehicle_journeys/_form.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-<%= semantic_form_for vehicle_journey, url: form_url do |form| %>
-  <%= render 'shared/form_messages', { errors: vehicle_journey.errors } %>
-  <%= form.inputs do %>
-    <%= form.input :journey_pattern, :as => :select, :collection => @route.journey_patterns, :member_label => Proc.new { |jp| journey_name(jp) }  %>
-    <%= form.input :number %>
-    <%= form.input :published_journey_name %>
-    <%= form.input :published_journey_identifier %>
-    <%= form.input :comment %>
-    <%= form.input :transport_mode_name, :as => :select, :collection => Chouette::Line.transport_modes, :include_blank => true, :member_label => Proc.new { |mode| t("transport_modes.label.#{mode}") }  %>
-    <%= form.input :mobility_restricted_suitability, :as => :select, :collection => [[vehicle_journey.human_attribute_name("accessible"), true], [vehicle_journey.human_attribute_name("not_accessible"), false]], :include_blank => true %>
-    <%= form.input :flexible_service, :as => :select, :collection => [[vehicle_journey.human_attribute_name("on_demand_fs"), true], [vehicle_journey.human_attribute_name("regular_fs"), false]], :include_blank => true %>
-    <%= form.input :status_value %>
-    <%= form.input :facility %>
-    <%= form.input :vehicle_type_identifier%>
-    <%= form.input :objectid, :required => !vehicle_journey.new_record?, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.vehicle_journey.objectid")} %>
-    <%= form.input :time_table_tokens, :label => t('.time_tables'), :as => :search_time_table, :json => referential_autocomplete_time_tables_path(@referential, :format => :json), :hint_text => t('search_hint'), :no_result_text => t('no_result_text'),:searching_text => t('searching_term'),  :input_html => { :"data-pre" => Rabl::Renderer.new( 'autocomplete_time_tables/index', vehicle_journey.time_tables, :view_path => 'app/views', :format => :json, :scope => :self ).render }  %>
-    <%= form.input :footnote_ids, :as => :check_boxes, :collection => @line.footnotes.map { |f| [ "#{f.code}: #{f.label}", f.id.to_s]} %>
-
-    <%= render 'form_vehicle_journey_at_stops', vehicle_journey: vehicle_journey, form: form %>
-
-  <% end %>
-
-  <%= form.actions do %>
-    <%= form.action :submit, as: :button, label: t(".submit_#{vehicle_journey.journey_category}#{'_edit' unless form.object.new_record?}"), button_html: { class: 'btn btn-primary' } %>
-    <%= form.action :cancel, as: :link %>
-  <% end %>
-<% end %>
-
-<%= render 'form_footer', vehicle_journey: vehicle_journey %>
diff --git a/app/views/vehicle_journeys/_form.html.slim b/app/views/vehicle_journeys/_form.html.slim
new file mode 100644
index 000000000..bc26e1ac5
--- /dev/null
+++ b/app/views/vehicle_journeys/_form.html.slim
@@ -0,0 +1,26 @@
+= semantic_form_for vehicle_journey, url: form_url do |form|
+  == render 'shared/form_messages', { errors: vehicle_journey.errors }
+
+  = form.inputs do
+    = form.input :journey_pattern, as: :select, :collection => @route.journey_patterns, :member_label => Proc.new { |jp| journey_name(jp) }
+    = form.input :number
+    = form.input :published_journey_name
+    = form.input :published_journey_identifier
+    = form.input :comment
+    = form.input :transport_mode_name, as: :select, :collection => Chouette::Line.transport_modes, :include_blank => true, :member_label => Proc.new { |mode| t("transport_modes.label.#{mode}") }
+    = form.input :mobility_restricted_suitability, as: :select, :collection => [[vehicle_journey.human_attribute_name("accessible"), true], [vehicle_journey.human_attribute_name("not_accessible"), false]], :include_blank => true
+    = form.input :flexible_service, as: :select, :collection => [[vehicle_journey.human_attribute_name("on_demand_fs"), true], [vehicle_journey.human_attribute_name("regular_fs"), false]], :include_blank => true
+    = form.input :status_value
+    = form.input :facility
+    = form.input :vehicle_type_identifier
+    = form.input :objectid, :required => !vehicle_journey.new_record?, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.vehicle_journey.objectid")}
+    = form.input :time_table_tokens, :label => t('.time_tables'), as: :search_time_table, :json => referential_autocomplete_time_tables_path(@referential, :format => :json), :hint_text => t('search_hint'), :no_result_text => t('no_result_text'),:searching_text => t('searching_term'),  :input_html => { :"data-pre" => Rabl::Renderer.new( 'autocomplete_time_tables/index', vehicle_journey.time_tables, :view_path => 'app/views', :format => :json, :scope => :self ).render }
+    = form.input :footnote_ids, as: :check_boxes, :collection => @line.footnotes.map { |f| [ "#{f.code}: #{f.label}", f.id.to_s]}
+
+    == render 'form_vehicle_journey_at_stops', vehicle_journey: vehicle_journey, form: form
+
+  = form.actions do
+    = form.action :submit, as: :button, label: t(".submit_#{vehicle_journey.journey_category}#{'_edit' unless form.object.new_record?}"), button_html: { class: 'btn btn-primary' }
+    = form.action :cancel, as: :link
+
+== render 'form_footer', vehicle_journey: vehicle_journey
\ No newline at end of file
diff --git a/app/views/vehicle_journeys/_form_footer.html.erb b/app/views/vehicle_journeys/_form_footer.html.erb
deleted file mode 100644
index c4c51b2b3..000000000
--- a/app/views/vehicle_journeys/_form_footer.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% if vehicle_journey.new_record? %>
-  <%= javascript_include_tag new_referential_line_route_vehicle_journey_path(@referential, @line, @route, :format => :js) %>
-<% else %>
-  <%= javascript_include_tag edit_referential_line_route_vehicle_journey_path(@referential, @line, @route, vehicle_journey, :format => :js) %>
-<% end %>
diff --git a/app/views/vehicle_journeys/_form_footer.html.slim b/app/views/vehicle_journeys/_form_footer.html.slim
new file mode 100644
index 000000000..d6f62fefe
--- /dev/null
+++ b/app/views/vehicle_journeys/_form_footer.html.slim
@@ -0,0 +1,4 @@
+- if vehicle_journey.new_record?
+  = javascript_include_tag new_referential_line_route_vehicle_journey_path(@referential, @line, @route, format: :js)
+- else
+  = javascript_include_tag edit_referential_line_route_vehicle_journey_path(@referential, @line, @route, vehicle_journey, format: :js)
\ No newline at end of file
diff --git a/app/views/vehicle_journeys/_form_vehicle_journey_at_stops.html.erb b/app/views/vehicle_journeys/_form_vehicle_journey_at_stops.html.erb
deleted file mode 100644
index 7e9bc1b38..000000000
--- a/app/views/vehicle_journeys/_form_vehicle_journey_at_stops.html.erb
+++ /dev/null
@@ -1,49 +0,0 @@
-<li class="input">
-  <%= form.label vehicle_journey.human_attribute_name(:vehicle_journey_at_stop_ids), :class => "label" %>
-</li>
-<% 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"><%= t('vehicle_journeys.form.slide_title') %></span>
-      <div>
-        <span><%= t('vehicle_journeys.form.set') %></span>
-        <%= select_tag '', options_for_select( [ [t('vehicle_journeys.form.slide_departure'), "departure"], [t('vehicle_journeys.form.slide_arrival'), "arrival"] ] ), :class => "departure_or_arrival" %>
-        <span><%= t('vehicle_journeys.form.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('vehicle_journeys.form.slide') %></a>
-      </div>
-    </div>
-  </div>
-<% end %>
-
-<table class="table table-hover table-striped">
-  <thead>
-    <tr>
-      <th class="hour title"><%= t('vehicle_journeys.form.arrival') %></th>
-      <th class="stop title"><%= t('vehicle_journeys.form.stop_title') %></th>
-      <th class="hour title"><%= t('vehicle_journeys.form.departure') %></th>
-    </tr>
-  </thead>
-  <tfoot>
-    <tr>
-      <td class="title">
-        <%= button_tag 'data-ce-action' => 'to_departures', class: 'ce-hide btn btn-primary' do %>
-          <%= t('vehicle_journeys.form.to_departures').html_safe %>
-          <i class="fa fa-angle-double-right"></i>
-        <% end %>
-      <td class="title"></td>
-      <td class="title">
-        <%= button_tag 'data-ce-action' => 'to_arrivals', class: 'ce-hide btn btn-primary' do %>
-          <i class="fa fa-angle-double-left"></i>
-          <%= t('vehicle_journeys.form.to_arrivals').html_safe %>
-        <% end %>
-      </td>
-    </tr>
-  </tfoot>
-  <tbody class="journey_pattern_dependent_list">
-    <%= render :partial => "vehicle_journeys/vehicle_journey_at_stop_fields",
-               :collection => vehicle_journey.vehicle_journey_at_stops, :as => :vehicle_journey_at_stop,
-               :locals => { :vehicle_journey_at_stops_size => vehicle_journey.vehicle_journey_at_stops.size } %>
-  </tbody>
-</table>
diff --git a/app/views/vehicle_journeys/_form_vehicle_journey_at_stops.html.slim b/app/views/vehicle_journeys/_form_vehicle_journey_at_stops.html.slim
new file mode 100644
index 000000000..3ca636db8
--- /dev/null
+++ b/app/views/vehicle_journeys/_form_vehicle_journey_at_stops.html.slim
@@ -0,0 +1,39 @@
+li.input
+  = form.label vehicle_journey.human_attribute_name(:vehicle_journey_at_stop_ids), class: "label"
+
+- unless vehicle_journey.vehicle_journey_at_stops.empty? || vehicle_journey.vehicle_journey_at_stops.any? { |vjas| vjas.departure_time.nil? }
+  .vehicle_journey_at_stops
+    .well
+      span.title = t('vehicle_journeys.form.slide_title')
+      div
+        span = t('vehicle_journeys.form.set')
+        = select_tag '', options_for_select( [ [t('vehicle_journeys.form.slide_departure'), "departure"], [t('vehicle_journeys.form.slide_arrival'), "arrival"] ] ), class: "departure_or_arrival"
+        
+        span = t('vehicle_journeys.form.to')
+        = 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.slide.btn.btn-default = t('vehicle_journeys.form.slide')
+
+table.table.table-hover.table-striped
+  thead
+    tr
+      th.hour.title = t('vehicle_journeys.form.arrival')
+      th.stop.title = t('vehicle_journeys.form.stop_title')
+      th.hour.title = t('vehicle_journeys.form.departure')
+
+  tfoot
+    tr
+      td.title
+        = button_tag 'data-ce-action' => 'to_departures', class: 'ce-hide btn btn-primary' do
+          = t('vehicle_journeys.form.to_departures').html_safe
+          i.fa.fa-angle-double-right
+
+      td.title
+      td.title
+        = button_tag 'data-ce-action' => 'to_arrivals', class: 'ce-hide btn btn-primary' do
+          i.fa.fa-angle-double-left
+          = t('vehicle_journeys.form.to_arrivals').html_safe
+
+  tbody.journey_pattern_dependent_list
+    == render partial: "vehicle_journeys/vehicle_journey_at_stop_fields", collection: vehicle_journey.vehicle_journey_at_stops, as: :vehicle_journey_at_stop, locals: { :vehicle_journey_at_stops_size => vehicle_journey.vehicle_journey_at_stops.size }
\ No newline at end of file
diff --git a/app/views/vehicle_journeys/_route_popover.html.erb b/app/views/vehicle_journeys/_route_popover.html.erb
deleted file mode 100644
index 7a8ad5730..000000000
--- a/app/views/vehicle_journeys/_route_popover.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<ul>
-<% (selected_route.line.routes.limit(10).reject{ |route| route == selected_route}).each do |route| %>
-  <li><%= link_to (route.name ? route.name.truncate(30) : '-' ), [@referential, route.line, route, controller_name] %></li>
-<% end %>
-</ul>
diff --git a/app/views/vehicle_journeys/_route_popover.html.slim b/app/views/vehicle_journeys/_route_popover.html.slim
new file mode 100644
index 000000000..068ea673e
--- /dev/null
+++ b/app/views/vehicle_journeys/_route_popover.html.slim
@@ -0,0 +1,3 @@
+ul
+  - (selected_route.line.routes.limit(10).reject{ |route| route == selected_route}).each do |route|
+    li = link_to (route.name ? route.name.truncate(30) : '-' ), [@referential, route.line, route, controller_name]
\ No newline at end of file
diff --git a/app/views/vehicle_journeys/_show_details.html.erb b/app/views/vehicle_journeys/_show_details.html.erb
deleted file mode 100644
index fccf3d210..000000000
--- a/app/views/vehicle_journeys/_show_details.html.erb
+++ /dev/null
@@ -1,87 +0,0 @@
-<%= title_tag vehicle_title(vehicle_journey) %>
-
-<div id="modal_translation" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-        <h4 class="modal-title" id="myModalLabel"><%= t('vehicle_journeys.show.translation_form') %></h4>
-        <div id="translate_form"></div>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div class="vehicle_journey">
-  <div class="summary">
-    <p>
-      <label><%= vehicle_journey.human_attribute_name(:journey_pattern) %>: </label>
-      <%= link_to journey_name(vehicle_journey.journey_pattern), [@referential, @line, @route, vehicle_journey.journey_pattern] %>
-    </p>
-    <p>
-      <label><%= vehicle_journey.human_attribute_name("number") %>: </label>
-      <%= vehicle_journey.number %>
-    </p>
-    <p>
-      <label><%= vehicle_journey.human_attribute_name("published_journey_name") %>: </label>
-      <%= vehicle_journey.published_journey_name %>
-    </p>
-    <p>
-      <label><%= vehicle_journey.human_attribute_name("published_journey_identifier") %>: </label>
-      <%= vehicle_journey.published_journey_identifier %>
-    </p>
-
-    <p>
-      <label><%= vehicle_journey.human_attribute_name("mobility_restricted_suitability") %>: </label>
-      <% if vehicle_journey.mobility_restricted_suitability.nil? %>
-        <%= vehicle_journey.human_attribute_name("unspecified_mrs") %>
-      <% elsif vehicle_journey.mobility_restricted_suitability? %>
-        <%= vehicle_journey.human_attribute_name("accessible") %>
-      <% else %>
-        <%= vehicle_journey.human_attribute_name("not_accessible") %>
-      <% end %>
-    </p>
-    <p>
-      <label><%= vehicle_journey.human_attribute_name("flexible_service") %>: </label>
-      <% if vehicle_journey.flexible_service.nil? %>
-        <%= vehicle_journey.human_attribute_name("unspecified_fs") %>
-      <% elsif vehicle_journey.flexible_service? %>
-        <%= vehicle_journey.human_attribute_name("on_demand_fs") %>
-      <% else %>
-        <%= vehicle_journey.human_attribute_name("regular_fs") %>
-      <% end %>
-    </p>
-
-    <p>
-      <label><%= vehicle_journey.human_attribute_name("comment") %>: </label>
-      <%= vehicle_journey.comment %>
-    </p>
-    <p>
-      <label><%= vehicle_journey.human_attribute_name("status_value") %>: </label>
-      <%= vehicle_journey.status_value %>
-    </p>
-    <p>
-      <label><%= vehicle_journey.human_attribute_name("facility") %>: </label>
-      <%= vehicle_journey.facility %>
-    </p>
-    <p>
-      <label><%= vehicle_journey.human_attribute_name("vehicle_type_identifier") %>: </label>
-      <%= vehicle_journey.vehicle_type_identifier %>
-    </p>
-    <p>
-      <label><%= vehicle_journey.human_attribute_name("footnote_ids") %>: </label>
-    <ul>
-      <% vehicle_journey.footnotes.each do |footnote| %>
-        <li><%= footnote.code %> : <%= footnote.label %></li>
-      <% end %>
-    </ul>
-    </p>
-  </div>
-</div>
-<h3><%= vehicle_journey.human_attribute_name(:vehicle_journey_at_stop_ids) %></h3>
-<%= render 'show_vehicle_journey_at_stops' %>
-
-<h3><%= t('vehicle_journeys.show.time_tables') %></h3>
-<div class="time_tables paginated_content">
-  <%= paginated_content vehicle_journey.time_tables, "time_tables/time_table", :delete => false %>
-</div>
diff --git a/app/views/vehicle_journeys/_show_details.html.slim b/app/views/vehicle_journeys/_show_details.html.slim
new file mode 100644
index 000000000..d9e4110c9
--- /dev/null
+++ b/app/views/vehicle_journeys/_show_details.html.slim
@@ -0,0 +1,82 @@
+= title_tag vehicle_title(vehicle_journey)
+
+#modal_translation.modal.fade tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
+  .modal-dialog
+    .modal-content
+      .modal-header
+        button.close type="button" data-dismiss="modal"
+          span aria-hidden="true" &times;
+          span.sr-only Close
+
+        h4.modal-title id="myModalLabel"
+          = t('vehicle_journeys.show.translation_form')
+        
+        #translate_form
+
+.vehicle_journey
+  .summary
+    p
+      label = "#{vehicle_journey.human_attribute_name(:journey_pattern)} : "
+      = link_to journey_name(vehicle_journey.journey_pattern), [@referential, @line, @route, vehicle_journey.journey_pattern]
+
+    p
+      label = "#{vehicle_journey.human_attribute_name('number')} : "
+      = vehicle_journey.number
+
+    p
+      label = "#{vehicle_journey.human_attribute_name('published_journey_name')} : "
+      = vehicle_journey.published_journey_name
+
+    p
+      label = "#{vehicle_journey.human_attribute_name('published_journey_identifier')} : "
+      = vehicle_journey.published_journey_identifier
+
+    p
+      label = "#{vehicle_journey.human_attribute_name('mobility_restricted_suitability')} : "
+      - if vehicle_journey.mobility_restricted_suitability.nil?
+        = vehicle_journey.human_attribute_name("unspecified_mrs")
+      - elsif vehicle_journey.mobility_restricted_suitability?
+        = vehicle_journey.human_attribute_name("accessible")
+      - else
+        = vehicle_journey.human_attribute_name("not_accessible")
+
+    p
+      label = "#{vehicle_journey.human_attribute_name('flexible_service')} : "
+      - if vehicle_journey.flexible_service.nil?
+        = vehicle_journey.human_attribute_name("unspecified_fs")
+      - elsif vehicle_journey.flexible_service?
+        = vehicle_journey.human_attribute_name("on_demand_fs")
+      - else
+        = vehicle_journey.human_attribute_name("regular_fs")
+
+    p
+      label = "#{vehicle_journey.human_attribute_name('comment')} : "
+      = vehicle_journey.comment
+
+    p
+      label = "#{vehicle_journey.human_attribute_name('status_value')} : "
+      = vehicle_journey.status_value
+
+    p
+      label = "#{vehicle_journey.human_attribute_name('facility')} : "
+      = vehicle_journey.facility
+
+    p
+      label = "#{vehicle_journey.human_attribute_name('vehicle_type_identifier')} : "
+      = vehicle_journey.vehicle_type_identifier
+
+    p
+      label = "#{vehicle_journey.human_attribute_name('footnote_ids')} : "
+    
+    ul
+      - vehicle_journey.footnotes.each do |footnote|
+        li = "#{footnote.code} : #{footnote.label}"
+
+h3 = vehicle_journey.human_attribute_name(:vehicle_journey_at_stop_ids)
+
+== render 'show_vehicle_journey_at_stops'
+
+h3 = t('vehicle_journeys.show.time_tables')
+
+.time_tables.paginated_content
+  = paginated_content vehicle_journey.time_tables, "time_tables/time_table", :delete => false
\ No newline at end of file
diff --git a/app/views/vehicle_journeys/_show_popover.html.erb b/app/views/vehicle_journeys/_show_popover.html.erb
deleted file mode 100644
index 40a44e805..000000000
--- a/app/views/vehicle_journeys/_show_popover.html.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<p>
-  <%= Chouette::JourneyPattern.model_name.human %> : <%= link_to journey_name( vehicle_journey.journey_pattern ), [@referential, @line, @route, vehicle_journey.journey_pattern] %>
-</p>
-<p>
-  <%= vehicle_journey.time_tables.size %> <%= Chouette::TimeTable.model_name.human.pluralize %> <small><%= vehicle_journey.presenter.time_tables_shortest_info %></small> :
-  <ul>
-    <% vehicle_journey.time_tables.limit(4).each do |time_table| %>
-    <li>
-      <%= link_to [@referential, time_table]  do %>
-      <span class="state-code <%= time_table.presenter.time_table_state_code %>"><i class="fa fa-certificate"></i></span> <%= time_table.comment %>
-      <% end %>
-      <% if time_table.tag_list.present? %>
-      <br>
-      <span class="time_table_info"><%= truncate(time_table.tag_list.to_s, :length => 35) %></span>
-      <% end %>
-      <br>
-      <% %w(monday tuesday wednesday thursday friday saturday sunday).each do |day_type| %>
-        <span class="<%= time_table.send( day_type) ? "included_day_type" : "excluded_day_type"%> time_table_info">
-          <%= time_table.human_attribute_name(day_type).first(2) %>
-        </span>
-        <% end %>
-        <span class="bounding"><%= time_table.presenter.time_table_bounding %></span>
-    </li>
-    <% end %>
-  </ul>
-</p>
diff --git a/app/views/vehicle_journeys/_show_popover.html.slim b/app/views/vehicle_journeys/_show_popover.html.slim
new file mode 100644
index 000000000..bf36915e8
--- /dev/null
+++ b/app/views/vehicle_journeys/_show_popover.html.slim
@@ -0,0 +1,25 @@
+p
+  = "#{Chouette::JourneyPattern.model_name.human} : #{link_to journey_name( vehicle_journey.journey_pattern ), [@referential, @line, @route, vehicle_journey.journey_pattern]}"
+
+p
+  = "#{vehicle_journey.time_tables.size} #{Chouette::TimeTable.model_name.human.pluralize}"
+  small = "#{vehicle_journey.presenter.time_tables_shortest_info} : "
+  
+  ul
+    - vehicle_journey.time_tables.limit(4).each do |time_table|
+      li
+        = link_to [@referential, time_table] do
+          span class="state-code #{time_table.presenter.time_table_state_code}"
+            i.fa.fa-certificate
+          = time_table.comment
+
+        - if time_table.tag_list.present?
+          br
+          span.time_table_info = truncate(time_table.tag_list.to_s, :length => 35)
+
+        br
+        - %w(monday tuesday wednesday thursday friday saturday sunday).each do |day_type|
+          span class="#{time_table.send( day_type) ? 'included_day_type' : 'excluded_day_type'} time_table_info"
+            = time_table.human_attribute_name(day_type).first(2)
+
+        span.bounding = time_table.presenter.time_table_bounding
\ No newline at end of file
diff --git a/app/views/vehicle_journeys/_show_sidebar.html.erb b/app/views/vehicle_journeys/_show_sidebar.html.erb
deleted file mode 100644
index 5ab7d449a..000000000
--- a/app/views/vehicle_journeys/_show_sidebar.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% content_for :sidebar do %>
-  <ul class="actions">
-    <li><%= link_to t('vehicle_journeys.actions.new'), new_referential_line_route_vehicle_journey_path(@referential, @line, @route), :class => "add" %></li>
-    <li><%= link_to t('vehicle_journeys.actions.new_frequency'), new_referential_line_route_vehicle_journey_frequency_path(@referential, @line, @route), :class => "add" %></li>
-    <li><%= link_to t('vehicle_journeys.actions.edit'), edit_referential_line_route_vehicle_journey_path(@referential, @line, @route, @vehicle_journey), :class => "edit" %></li>
-    <li><%= link_to t('vehicle_journeys.actions.destroy'), referential_line_route_vehicle_journey_path(@referential, @line, @route, @vehicle_journey), :method => :delete, :data => {:confirm =>  t('vehicle_journeys.actions.destroy_confirm')}, :class => "remove" %></li>
-    <% unless @vehicle_journey.vehicle_journey_at_stops.empty? %>
-      <li>
-        <i class="fa fa-cubes fa-fw" style="color:#D98F3B;"></i>
-        <%= link_to t('vehicle_journeys.show.translation_form'), new_referential_line_route_vehicle_journey_vehicle_translation_path(@referential, @line, @route, @vehicle_journey), {:remote => true, 'data-toggle' =>  "modal", 'data-target' => '#modal_translation', :class => "with_fa" } %>
-      </li>
-    <% end %>
-  </ul>
-  <%= creation_tag(@vehicle_journey) %>
-<% end %>
diff --git a/app/views/vehicle_journeys/_show_sidebar.html.slim b/app/views/vehicle_journeys/_show_sidebar.html.slim
new file mode 100644
index 000000000..8117dd23b
--- /dev/null
+++ b/app/views/vehicle_journeys/_show_sidebar.html.slim
@@ -0,0 +1,13 @@
+- content_for :sidebar do
+  ul.actions
+    li = link_to t('vehicle_journeys.actions.new'), new_referential_line_route_vehicle_journey_path(@referential, @line, @route), class: "add"
+    li = link_to t('vehicle_journeys.actions.new_frequency'), new_referential_line_route_vehicle_journey_frequency_path(@referential, @line, @route), class: "add"
+    li = link_to t('vehicle_journeys.actions.edit'), edit_referential_line_route_vehicle_journey_path(@referential, @line, @route, @vehicle_journey), class: "edit"
+    li = link_to t('vehicle_journeys.actions.destroy'), referential_line_route_vehicle_journey_path(@referential, @line, @route, @vehicle_journey), :method => :delete, :data => {:confirm =>  t('vehicle_journeys.actions.destroy_confirm')}, class: "remove"
+    
+    - unless @vehicle_journey.vehicle_journey_at_stops.empty?
+      li
+        i.fa.fa-cubes.fa-fw style="color:#D98F3B;"
+        = link_to t('vehicle_journeys.show.translation_form'), new_referential_line_route_vehicle_journey_vehicle_translation_path(@referential, @line, @route, @vehicle_journey), {:remote => true, 'data-toggle' =>  "modal", 'data-target' => '#modal_translation', class: "with_fa" }
+
+  = creation_tag(@vehicle_journey)
\ No newline at end of file
diff --git a/app/views/vehicle_journeys/_show_vehicle_journey_at_stops.html.erb b/app/views/vehicle_journeys/_show_vehicle_journey_at_stops.html.erb
deleted file mode 100644
index cb4a95263..000000000
--- a/app/views/vehicle_journeys/_show_vehicle_journey_at_stops.html.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="vehicle_journey_at_stops content">
-  <table class="table table-hover table-striped">
-    <thead>
-    <tr>
-      <th class="hour title"><%= t('vehicle_journeys.show.arrival') %></th>
-      <th class="stop title" ><%= t('vehicle_journeys.show.stop_title') %></th>
-      <th class="hour title"><%= t('vehicle_journeys.show.departure') %></th>
-    </tr>
-    <thead>
-    <tbody>
-    <% @vehicle_journey.vehicle_journey_at_stops.each_with_index do |vjas, index| %>
-      <tr class="<%= index%2==0 ? "odd" : "even" %>">
-        <td class="hour <%= vjas.arrival_time.nil? ? "missing" : "" %>"><%= vjas.arrival_time ? l( vjas.arrival_time, :format => :hour) : "" %></td>
-        <td><%= link_to vjas.stop_point.stop_area.name, [@referential, vjas.stop_point.stop_area] %></td>
-        <td class="hour <%= vjas.departure_time.nil? ? "missing" : "" %>"><%= vjas.departure_time ? l( vjas.departure_time, :format => :hour) : "" %></td>
-      </tr>
-    <% end %>
-    </tbody>
-  </table>
-</div>
diff --git a/app/views/vehicle_journeys/_show_vehicle_journey_at_stops.html.slim b/app/views/vehicle_journeys/_show_vehicle_journey_at_stops.html.slim
new file mode 100644
index 000000000..245227054
--- /dev/null
+++ b/app/views/vehicle_journeys/_show_vehicle_journey_at_stops.html.slim
@@ -0,0 +1,17 @@
+.vehicle_journey_at_stops.content
+  table.table.table-hover.table-striped
+    thead
+      tr
+        th.hour.title = t('vehicle_journeys.show.arrival')
+        th.stop.title = t('vehicle_journeys.show.stop_title')
+        th.hour.title = t('vehicle_journeys.show.departure')
+
+    tbody
+      - @vehicle_journey.vehicle_journey_at_stops.each_with_index do |vjas, index|
+        tr class="#{index%2==0 ? 'odd' : 'even'}"
+          td class="hour #{vjas.arrival_time.nil? ? 'missing' : '' }"
+            = vjas.arrival_time ? l( vjas.arrival_time, :format => :hour) : ""
+
+          td = link_to vjas.stop_point.stop_area.name, [@referential, vjas.stop_point.stop_area]
+          td class="hour #{vjas.departure_time.nil? ? 'missing' : '' }"
+            = vjas.departure_time ? l( vjas.departure_time, :format => :hour) : ""
\ No newline at end of file
diff --git a/app/views/vehicle_journeys/_sidebar.html.erb b/app/views/vehicle_journeys/_sidebar.html.erb
deleted file mode 100644
index 11260cd7b..000000000
--- a/app/views/vehicle_journeys/_sidebar.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<ul class="actions">
-  <li><%= link_to t('vehicle_journeys.actions.new'), new_referential_line_route_vehicle_journey_path(@referential, @line, @route), :class => "add" %></li>
-  <li><%= link_to t('vehicle_journeys.actions.new_frequency'), new_referential_line_route_vehicle_journey_frequency_path(@referential, @line, @route), :class => "add" %></li>
-  <li><%= link_to t('vehicle_journey_imports.new.title'), new_referential_line_route_vehicle_journey_import_path( @referential, @line, @route ), :class => "import" %></li>
-  <li><%= link_to t('vehicle_journey_exports.new.title'), referential_line_route_vehicle_journey_exports_path(@referential, @line, @route, :format => :zip), :class => "export" %></li>
-</ul>
-
diff --git a/app/views/vehicle_journeys/_sidebar.html.slim b/app/views/vehicle_journeys/_sidebar.html.slim
new file mode 100644
index 000000000..8d9627ba0
--- /dev/null
+++ b/app/views/vehicle_journeys/_sidebar.html.slim
@@ -0,0 +1,9 @@
+ul.actions
+  li
+    = link_to t('vehicle_journeys.actions.new'), new_referential_line_route_vehicle_journey_path(@referential, @line, @route), class: "add"
+  li
+    = link_to t('vehicle_journeys.actions.new_frequency'), new_referential_line_route_vehicle_journey_frequency_path(@referential, @line, @route), class: "add"
+  li
+    = link_to t('vehicle_journey_imports.new.title'), new_referential_line_route_vehicle_journey_import_path( @referential, @line, @route ), class: "import"
+  li
+    = link_to t('vehicle_journey_exports.new.title'), referential_line_route_vehicle_journey_exports_path(@referential, @line, @route, :format => :zip), class: "export"
\ No newline at end of file
diff --git a/app/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb b/app/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb
deleted file mode 100644
index fbd4e733a..000000000
--- a/app/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<% vjas = vehicle_journey_at_stop
-   tab_counter_arrival = 2 * vehicle_journey_at_stop_counter + 100
-   tab_counter_departure = (vehicle_journey_at_stops_size * 2) + 2 * vehicle_journey_at_stop_counter + 100
-   %>
-<tr class="time input optional <%= vjas._destroy ? "no_stop" : "" %> <%= (vehicle_journey_at_stop_counter%2==0) ? "odd" : "even" %>" >
-  <td class="arrival_time <%= vjas.arrival_time.nil? ? "missing" : "" %> <%= vjas.errors[:arrival_time].blank? ? "" : "invalid_position" %>">
-    <%= select_hour(vjas.arrival_time ? vjas.arrival_time.hour : 0, { :prefix => "vehicle_journey", :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][arrival_time(4i)]"}, :class => "hour", :tabindex => tab_counter_arrival + 1 ) %>
-    <%= select_minute(vjas.arrival_time ? vjas.arrival_time.min : 0, { :prefix => "vehicle_journey", :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][arrival_time(5i)]"}, :class => "minute", :tabindex => tab_counter_arrival + 2) %>
-  </td>
-  <td>
-    <input name=<%= "vehicle_journey[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][id]" %> type="hidden" value="<%= vjas.id %>">
-    <input name=<%= "vehicle_journey[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][_destroy]" %> type="hidden" value="<%= vjas._destroy ? "1" : "0" %>">
-    <input name=<%= "vehicle_journey[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][stop_point_id]" %> type="hidden" value="<%= vjas.stop_point_id %>">
-    <input name=<%= "vehicle_journey[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][departure_time(3i)]" %> type="hidden" value="1">
-    <input name=<%= "vehicle_journey[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][departure_time(2i)]" %> type="hidden" value="1">
-    <input name=<%= "vehicle_journey[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][departure_time(1i)]" %> type="hidden" value="2000">
-    <input name=<%= "vehicle_journey[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][arrival_time(3i)]" %> type="hidden" value="1">
-    <input name=<%= "vehicle_journey[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][arrival_time(2i)]" %> type="hidden" value="1">
-    <input name=<%= "vehicle_journey[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][arrival_time(1i)]" %> type="hidden" value="2000">
-    <label for=<%= "vehicle_journey_vehicle_journey_at_stops_attributes_#{vehicle_journey_at_stop_counter}_departure_time_5i" %>><%= vjas.stop_point.stop_area.name %></label>
-  </td>
-  <td class="departure_time <%= vjas.departure_time.nil? ? "missing" : "" %> <%= vjas.errors[:departure_time].blank? ? "" : "invalid_position" %>">
-    <%= select_hour(vjas.departure_time ? vjas.departure_time.hour : 0, { :prefix => "vehicle_journey", :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][departure_time(4i)]"}, :class => "hour", :tabindex => tab_counter_departure + 1 ) %>
-    <%= select_minute(vjas.departure_time ? vjas.departure_time.min : 0, { :prefix => "vehicle_journey", :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][departure_time(5i)]"}, :class => "minute", :tabindex => tab_counter_departure + 2) %>
-  </td>
-</tr>
-
diff --git a/app/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.slim b/app/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.slim
new file mode 100644
index 000000000..59401728a
--- /dev/null
+++ b/app/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.slim
@@ -0,0 +1,26 @@
+- vjas = vehicle_journey_at_stop
+- tab_counter_arrival = 2 * vehicle_journey_at_stop_counter + 100
+- tab_counter_departure = (vehicle_journey_at_stops_size * 2) + 2 * vehicle_journey_at_stop_counter + 100
+
+tr class="time input optional #{vjas._destroy ? 'no_stop' : ''} #{(vehicle_journey_at_stop_counter%2==0) ? 'odd' : 'even'}"
+  td class="arrival_time #{vjas.arrival_time.nil? ? 'missing' : ''}" #{vjas.errors[:arrival_time].blank? ? '' : 'invalid_position'}"
+    = select_hour(vjas.arrival_time ? vjas.arrival_time.hour : 0, { :prefix => "vehicle_journey", :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][arrival_time(4i)]"}, class: "hour", :tabindex => tab_counter_arrival + 1 )
+    = select_minute(vjas.arrival_time ? vjas.arrival_time.min : 0, { :prefix => "vehicle_journey", :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][arrival_time(5i)]"}, class: "minute", :tabindex => tab_counter_arrival + 2)
+
+  td
+    input name="vehicle_journey[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][id]" type="hidden" value="#{vjas.id}"
+    input name="vehicle_journey[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][_destroy]" type="hidden" value="#{vjas._destroy ? '1' : '0' }"
+    input name="vehicle_journey[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][stop_point_id]" type="hidden" value="#{vjas.stop_point_id}"
+    input name="vehicle_journey[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][departure_time(3i)]" type="hidden" value="1"
+    input name="vehicle_journey[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][departure_time(2i)]" type="hidden" value="1"
+    input name="vehicle_journey[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][departure_time(1i)]" type="hidden" value="2000"
+    input name="vehicle_journey[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][arrival_time(3i)]" type="hidden" value="1"
+    input name="vehicle_journey[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][arrival_time(2i)]" type="hidden" value="1"
+    input name="vehicle_journey[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][arrival_time(1i)]" type="hidden" value="2000"
+
+    label for="vehicle_journey_vehicle_journey_at_stops_attributes_#{vehicle_journey_at_stop_counter}_departure_time_5i"
+      = vjas.stop_point.stop_area.name
+
+  td class="departure_time #{vjas.departure_time.nil? ? 'missing' : ''} #{vjas.errors[:departure_time].blank? ? '' : 'invalid_position'}"
+    = select_hour(vjas.departure_time ? vjas.departure_time.hour : 0, { :prefix => "vehicle_journey", :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][departure_time(4i)]"}, :class => "hour", :tabindex => tab_counter_departure + 1 )
+    = select_minute(vjas.departure_time ? vjas.departure_time.min : 0, { :prefix => "vehicle_journey", :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][departure_time(5i)]"}, :class => "minute", :tabindex => tab_counter_departure + 2)
\ No newline at end of file
diff --git a/app/views/vehicle_journeys/_vehicle_journeys.html.erb b/app/views/vehicle_journeys/_vehicle_journeys.html.erb
deleted file mode 100644
index c321b960b..000000000
--- a/app/views/vehicle_journeys/_vehicle_journeys.html.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="page_info">
-  <span class="search"><%= t("will_paginate.page_entries_info.search") %></span>
-  <%= page_entries_info @vehicle_journeys %>
-  <span class="pull-right">
-    <% if controller_name == 'vehicle_journey_frequencies' && exist_vehicle_journeys?(@route) %>
-      <i class="fa fa-clock-o"></i>
-      <%= link_to t("vehicle_journeys.actions.show"), referential_line_route_vehicle_journeys_path(@referential, @line, @route) %>
-    <% elsif controller_name == 'vehicle_journeys' && exist_vehicle_journey_frequencies?(@route) %>
-      <i class="fa fa-clock-o"></i>
-      <%= link_to t("vehicle_journey_frequencies.actions.show"), referential_line_route_vehicle_journey_frequencies_path(@referential, @line, @route) %>
-    <% end %>
-  </span>
-</div>
-<div class="pagination">
-  <%= will_paginate @vehicle_journeys, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer %>
-</div>
-<div class="vehicle_journeys paginated_content">
-  <%= render 'vehicle_journeys_matrix' %>
-</div>
-<div class="pagination">
-  <%= will_paginate @vehicle_journeys, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer %>
-</div> 
diff --git a/app/views/vehicle_journeys/_vehicle_journeys.html.slim b/app/views/vehicle_journeys/_vehicle_journeys.html.slim
new file mode 100644
index 000000000..3a8fdd730
--- /dev/null
+++ b/app/views/vehicle_journeys/_vehicle_journeys.html.slim
@@ -0,0 +1,21 @@
+.page_info
+  span.search = t("will_paginate.page_entries_info.search")
+  
+  = page_entries_info @vehicle_journeys
+  
+  span.pull-right
+    - if controller_name == 'vehicle_journey_frequencies' && exist_vehicle_journeys?(@route)
+      i.fa.fa-clock-o
+      = link_to t("vehicle_journeys.actions.show"), referential_line_route_vehicle_journeys_path(@referential, @line, @route)
+    - elsif controller_name == 'vehicle_journeys' && exist_vehicle_journey_frequencies?(@route)
+      i.fa.fa-clock-o
+      = link_to t("vehicle_journey_frequencies.actions.show"), referential_line_route_vehicle_journey_frequencies_path(@referential, @line, @route)
+
+.pagination
+  = will_paginate @vehicle_journeys, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer
+
+.vehicle_journeys.paginated_content
+  == render 'vehicle_journeys_matrix'
+
+.pagination
+  = will_paginate @vehicle_journeys, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer
\ No newline at end of file
diff --git a/app/views/vehicle_journeys/_vehicle_journeys_matrix.html.erb b/app/views/vehicle_journeys/_vehicle_journeys_matrix.html.erb
deleted file mode 100644
index 3254430cd..000000000
--- a/app/views/vehicle_journeys/_vehicle_journeys_matrix.html.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-<table class="table table-hover table-striped">
-  <thead>
-    <tr>
-      <th class="title">
-        <button data-style="primary" data-container="body" rel="popover" data-toggle="popover" title='<%= t(".line_routes") %>'
-                data-placement="top" data-content='<%= render( partial: "route_popover", :locals => { :selected_route => @route }) %>'
-                class="route_popover btn btn-default btn-sm">
-          <i class='fa fa-search'></i>
-          <%= Chouette::Route.model_name.human.capitalize %>
-        </button>
-      </th>
-      <% @vehicle_journeys.each do |vj| %>
-        <th class="vehicle_journey">
-          <button data-style="primary" data-container="body" rel="popover" data-toggle="popover"
-                  data-title='<%= link_to(vehicle_title(vj), [@referential, @line, @route, vj] ) %>
-                      <%= link_to('<span class="fa fa-pencil"></span>'.html_safe,
-                                  send("edit_referential_line_route_vehicle_journey#{'_frequency' if vj.frequency?}_path", @referential, @line, @route, vj),
-                                  :class => "btn btn-default btn-sm" ) %>'
-                  data-placement= "top"
-                  data-content='<%= render( partial: "show_popover", :locals => { :vehicle_journey => vj }) %>'
-                  class="vehicle_journey_popover btn btn-default btn-sm">
-            <i class='fa fa-search'></i>
-          </button>
-        </th>
-      <% end %>
-    </tr>
-  </thead>
-  <tbody>
-    <% @route.stop_points.each_with_index do |sp, index| %>
-      <tr class="<%= cycle('odd', 'even') %>">
-        <td class="stop_area"><%= sp.stop_area.name %></td>
-        <% @vehicle_journeys.each do |vj| %>
-          <td class="hours <%= missing_time_check(@matrix["#{vj.id}-#{sp.id}"]) %><%= ' ce-VehicleJourneyBlock-frequency' if vj.frequency? %>">
-            <%= (@matrix["#{vj.id}-#{sp.id}"] && @matrix["#{vj.id}-#{sp.id}"].departure_time) ? l( @matrix["#{vj.id}-#{sp.id}"].departure_time, :format => :hour) : "--" %>
-          </td>
-        <% end %>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
diff --git a/app/views/vehicle_journeys/_vehicle_journeys_matrix.html.slim b/app/views/vehicle_journeys/_vehicle_journeys_matrix.html.slim
new file mode 100644
index 000000000..e842d836f
--- /dev/null
+++ b/app/views/vehicle_journeys/_vehicle_journeys_matrix.html.slim
@@ -0,0 +1,21 @@
+table.table.table-hover.table-striped
+  thead
+    tr
+      th.title
+        button data-style="primary" data-container="body" rel="popover" data-toggle="popover" title="#{t('.line_routes')}" data-placement="top" data-content="#{render( partial: 'route_popover', :locals => { :selected_route => @route })}" class="route_popover btn btn-default btn-sm"
+          i.fa.fa-search
+          = Chouette::Route.model_name.human.capitalize
+
+      - @vehicle_journeys.each do |vj|
+        th.vehicle_journey
+          button data-style="primary" data-container="body" rel="popover" data-toggle="popover" data-title="#{link_to(vehicle_title(vj), [@referential, @line, @route, vj] )}  #{link_to('<span class="fa fa-pencil"></span>'.html_safe, send("edit_referential_line_route_vehicle_journey#{'_frequency' if vj.frequency?}_path", @referential, @line, @route, vj), :class => "btn btn-default btn-sm" )}" data-placement= "top" data-content="#{render( partial: "show_popover", :locals => { :vehicle_journey => vj })}" class="vehicle_journey_popover btn btn-default btn-sm"
+            i.fa.fa-search
+
+  tbody
+    - @route.stop_points.each_with_index do |sp, index|
+      tr class="#{cycle('odd', 'even')}"
+        td.stop_area = sp.stop_area.name
+        
+        - @vehicle_journeys.each do |vj|
+          td class="hours #{missing_time_check(@matrix['#{vj.id}-#{sp.id}'])}#{'ce-VehicleJourneyBlock-frequency' if vj.frequency?}"
+            = (@matrix["#{vj.id}-#{sp.id}"] && @matrix["#{vj.id}-#{sp.id}"].departure_time) ? l( @matrix["#{vj.id}-#{sp.id}"].departure_time, :format => :hour) : "--"
\ No newline at end of file
diff --git a/app/views/vehicle_journeys/edit.html.erb b/app/views/vehicle_journeys/edit.html.erb
deleted file mode 100644
index 0d3a2db96..000000000
--- a/app/views/vehicle_journeys/edit.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<%= title_tag edit_vehicle_title(@vehicle_journey) %>
-
-<%= render 'form', vehicle_journey: @vehicle_journey, form_url: referential_line_route_vehicle_journey_path(@referential, @line, @route, @vehicle_journey) %>
-
-
diff --git a/app/views/vehicle_journeys/edit.html.slim b/app/views/vehicle_journeys/edit.html.slim
new file mode 100644
index 000000000..8b3dbcf51
--- /dev/null
+++ b/app/views/vehicle_journeys/edit.html.slim
@@ -0,0 +1,3 @@
+= title_tag edit_vehicle_title(@vehicle_journey)
+
+== render 'form', vehicle_journey: @vehicle_journey, form_url: referential_line_route_vehicle_journey_path(@referential, @line, @route, @vehicle_journey)
\ No newline at end of file
diff --git a/app/views/vehicle_journeys/edit.js.erb b/app/views/vehicle_journeys/edit.js.slim
index b16d9d343..a692bb543 100644
--- a/app/views/vehicle_journeys/edit.js.erb
+++ b/app/views/vehicle_journeys/edit.js.slim
@@ -1,7 +1,7 @@
 $(document).ready(function() {
   $("#vehicle_journey_journey_pattern_id").change(
     function(){
-      var url = "<%= select_journey_pattern_referential_line_route_vehicle_journey_path( @referential, @line, @route, @vehicle_journey)%>?journey_pattern_id="+
+      var url = "#{select_journey_pattern_referential_line_route_vehicle_journey_path( @referential, @line, @route, @vehicle_journey)}?journey_pattern_id="+
       $("#vehicle_journey_journey_pattern_input select option:selected").attr("value");
       $.get(url);
     }
diff --git a/app/views/vehicle_journeys/index.html.erb b/app/views/vehicle_journeys/index.html.erb
deleted file mode 100644
index 3fd123c79..000000000
--- a/app/views/vehicle_journeys/index.html.erb
+++ /dev/null
@@ -1,99 +0,0 @@
-<%= title_tag t('vehicle_journeys.index.title', :route => @route.name ) %>
-
-<%= search_form_for @q, :url => referential_line_route_vehicle_journeys_path(@referential,@line,@route), remote: true, :html => {:method => :get, class: "form-inline", :id => "search", role: "form"} do |f| %>
-<div class="panel panel-default">
-  <div class="panel-heading">
-    <%= f.label :journey_pattern_id_eq, "Missions" %>
-    <%= f.text_field(:journey_pattern_id_eq, :class => "form-control") %>
-    <button class="btn btn-default" type="submit"><i class="fa fa-search"></i></button>
-    <a data-toggle="collapse" data-parent="#search" href="#advanced_search" class="advanced_search">
-      <i class="fa fa-plus"></i> <%= "#{t('.advanced_search')}" %>
-    </a>
-  </div>
-
-  <div id="advanced_search" class="panel-collapse collapse">
-    <div class="panel-body">
-      <div>
-        <%= f.label :time_tables_id_not_eq, "Sans calendrier" %>
-        <%= f.check_box :time_tables_id_not_eq %>
-
-        <span class="time_tables_id_eq">
-          <%= f.label :time_tables_id_eq, "Sélectionner calendriers" %>
-          <%= f.text_field :time_tables_id_eq, :input_html => { :"data-pre" => [].to_json} %>
-        </span>
-      </div>
-      <% if controller_name != 'vehicle_journey_frequencies' %>
-        <div>
-          <%= f.label :vehicle_journey_at_stops_departure_time_not_eq, "Sans horaire" %>
-          <%= f.check_box :vehicle_journey_at_stops_departure_time_not_eq %>
-
-          <span class="vehicle_journey_at_stops_departure_time_gt">
-            <input name=<%= "q[vehicle_journey_at_stops_departure_time_gt(3i)]" %> type="hidden" value="1">
-            <input name=<%= "q[vehicle_journey_at_stops_departure_time_gt(2i)]" %> type="hidden" value="1">
-            <input name=<%= "q[vehicle_journey_at_stops_departure_time_gt(1i)]" %> type="hidden" value="2000">
-            <%= f.label :vehicle_journey_at_stops_departure_time_gt, t('.time_range') %>
-            <%= select_hour(@q.send( "vehicle_journey_at_stops_departure_time_gt") ? @q.send( "vehicle_journey_at_stops_departure_time_gt").hour : 0,
-                             :prefix => "q", :field_name => "vehicle_journey_at_stops_departure_time_gt(4i)") %>
-            <%= select_minute(@q.send( "vehicle_journey_at_stops_departure_time_gt") ? @q.send( "vehicle_journey_at_stops_departure_time_gt").min : 0,
-                               :prefix => "q", :field_name => "vehicle_journey_at_stops_departure_time_gt(5i)") %>
-          </span>
-        </div>
-      <% end %>
-    </div>
-  </div>
-</div>
-<% end %>
-<div id="vehicle_journeys" ><%= render "vehicle_journeys" %></div>
-
-<% content_for :sidebar do %>
-  <%= render "sidebar" %>
-<% end %>
-<script>
-	$(function() {
-        var time_tables_url = function(){
-          return '<%= referential_autocomplete_time_tables_path(@referential, :format => :json) %>?route_id=<%= @route.id %>';
-        };
-        var time_table_formatter = function(item){
-          var day_types = '';
-          if ( item.day_types.length >0 ){
-            day_types = '<span class=\"day_types\">' +  item.day_types + '</span>' ;
-          }
-          var tags = '';
-          if ( item.tags.length >0 ){
-            tags = '<div class=\"info\">' +  item.tags + '</div>' ;
-          }
-          return '<li><div class=\"comment\">' + item.comment +
-                  '</div><div class=\"info\">' + item.time_table_bounding + '  ' + day_types + '</div>' +
-                  tags + '</li>';
-        };
-		$( "#q_time_tables_id_eq" ).tokenInput( time_tables_url, {
-          crossDomain: false,
-          prePopulate: $('#q_time_tables_id_eq').data('pre'),
-          minChars: 2,
-          propertyToSearch: 'comment',
-          hintText: '<%= t('search_hint') %>',
-          noResultsText: '<%= t('no_result_text') %>',
-          searchingText: '<%= t('searching_term') %>',
-          resultsFormatter: time_table_formatter,
-          tokenFormatter: time_table_formatter
-        });
-		$( "#q_journey_pattern_id_eq" ).tokenInput( '<%= referential_line_route_journey_patterns_path(@referential, @line, @route, :format => :json) %>', {
-          crossDomain: false,
-          prePopulate: $('#q_journey_pattern_id_eq').data('pre'),
-          minChars: 1,
-          queryParam: 'q[name_cont]',
-          propertyToSearch: 'name',
-          hintText: '<%= t('search_hint') %>',
-          noResultsText: '<%= t('no_result_text') %>',
-          searchingText: '<%= t('searching_term') %>',
-          resultsFormatter: function(item){ return '<li><div class=\"name\">' + item.name + ', (' + item.id + ') </div></li>' },
-        });
-        $( 'input[name="q[time_tables_id_not_eq]"]').change( function(){
-            $('span.time_tables_id_eq').toggle( $(this).filter(":checked").val()==undefined);
-        });
-        $( 'input[name="q[vehicle_journey_at_stops_departure_time_not_eq]"]').change( function(){
-            $('span.vehicle_journey_at_stops_departure_time_gt').toggle( $(this).filter(":checked").val()==undefined);
-        });
-
-	});
-</script>
diff --git a/app/views/vehicle_journeys/index.html.slim b/app/views/vehicle_journeys/index.html.slim
new file mode 100644
index 000000000..e59f2ca1b
--- /dev/null
+++ b/app/views/vehicle_journeys/index.html.slim
@@ -0,0 +1,93 @@
+= title_tag t('vehicle_journeys.index.title', route: @route.name )
+
+= search_form_for @q, :url => referential_line_route_vehicle_journeys_path(@referential,@line,@route), remote: true, :html => {:method => :get, class: "form-inline", :id => "search", role: "form"} do |f|
+  .panel.panel-default
+    .panel-heading
+      = f.label :journey_pattern_id_eq, "Missions"
+      = f.text_field(:journey_pattern_id_eq, class: "form-control")
+      
+      button.btn.btn-default type="submit"
+        i.fa.fa-search
+
+      a.advanced_search data-toggle="collapse" data-parent="#search" href="#advanced_search"
+        i.fa.fa-plus
+        = "#{t('.advanced_search')}"
+
+    #advanced_search.panel-collapse.collapse
+      .panel-body
+        div
+          = f.label :time_tables_id_not_eq, "Sans calendrier"
+          = f.check_box :time_tables_id_not_eq
+
+          span.time_tables_id_eq
+            = f.label :time_tables_id_eq, "Sélectionner calendriers"
+            = f.text_field :time_tables_id_eq, :input_html => { :"data-pre" => [].to_json}
+          
+        - if controller_name != 'vehicle_journey_frequencies'
+          div
+            = f.label :vehicle_journey_at_stops_departure_time_not_eq, "Sans horaire"
+            = f.check_box :vehicle_journey_at_stops_departure_time_not_eq
+
+            span.vehicle_journey_at_stops_departure_time_gt
+              input name="#{q[vehicle_journey_at_stops_departure_time_gt(3i)]}" type="hidden" value="1"
+              input name="#{q[vehicle_journey_at_stops_departure_time_gt(2i)]}" type="hidden" value="1"
+              input name="#{q[vehicle_journey_at_stops_departure_time_gt(1i)]}" type="hidden" value="2000"
+              
+              = f.label :vehicle_journey_at_stops_departure_time_gt, t('.time_range')
+              = select_hour(@q.send( "vehicle_journey_at_stops_departure_time_gt") ? @q.send( "vehicle_journey_at_stops_departure_time_gt").hour : 0, :prefix => "q", :field_name => "vehicle_journey_at_stops_departure_time_gt(4i)")
+              = select_minute(@q.send( "vehicle_journey_at_stops_departure_time_gt") ? @q.send( "vehicle_journey_at_stops_departure_time_gt").min : 0, :prefix => "q", :field_name => "vehicle_journey_at_stops_departure_time_gt(5i)")
+
+#vehicle_journeys
+  == render "vehicle_journeys"
+
+- content_for :sidebar do
+  == render "sidebar"
+
+javascript:
+  $(function() {
+    var time_tables_url = function(){
+      return "#{referential_autocomplete_time_tables_path(@referential, :format => :json)}?route_id=#{@route.id}";
+    };
+
+    var time_table_formatter = function(item){
+      var day_types = '';
+      if ( item.day_types.length >0 ){
+        day_types = '<span class=\"day_types\">' +  item.day_types + '</span>' ;
+      }
+      var tags = '';
+      if ( item.tags.length >0 ){
+        tags = '<div class=\"info\">' +  item.tags + '</div>' ;
+      }
+      return '<li><div class=\"comment\">' + item.comment +
+      '</div><div class=\"info\">' + item.time_table_bounding + '  ' + day_types + '</div>' +
+      tags + '</li>';
+    };
+    $( "#q_time_tables_id_eq" ).tokenInput( time_tables_url, {
+      crossDomain: false,
+      prePopulate: $('#q_time_tables_id_eq').data('pre'),
+      minChars: 2,
+      propertyToSearch: 'comment',
+      hintText: "#{t('search_hint')}",
+      noResultsText: "#{t('no_result_text')}",
+      searchingText: "#{t('searching_term')}",
+      resultsFormatter: time_table_formatter,
+      tokenFormatter: time_table_formatter
+    });
+    $( "#q_journey_pattern_id_eq" ).tokenInput("#{referential_line_route_journey_patterns_path(@referential, @line, @route, :format => :json)}", {
+      crossDomain: false,
+      prePopulate: $('#q_journey_pattern_id_eq').data('pre'),
+      minChars: 1,
+      queryParam: 'q[name_cont]',
+      propertyToSearch: 'name',
+      hintText: "#{t('search_hint')}",
+      noResultsText: "#{t('no_result_text')}",
+      searchingText: "#{t('searching_term')}",
+      resultsFormatter: function(item){ return '<li><div class=\"name\">' + item.name + ', (' + item.id + ') </div></li>' },
+    });
+    $( 'input[name="q[time_tables_id_not_eq]"]').change( function(){
+      $('span.time_tables_id_eq').toggle( $(this).filter(":checked").val()==undefined);
+    });
+    $( 'input[name="q[vehicle_journey_at_stops_departure_time_not_eq]"]').change( function(){
+      $('span.vehicle_journey_at_stops_departure_time_gt').toggle( $(this).filter(":checked").val()==undefined);
+    });
+  });
\ No newline at end of file
diff --git a/app/views/vehicle_journeys/index.js.erb b/app/views/vehicle_journeys/index.js.erb
deleted file mode 100644
index 72b57c8fb..000000000
--- a/app/views/vehicle_journeys/index.js.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-$('#vehicle_journeys').html('<%= escape_javascript(render("vehicle_journeys")) %>');
-
diff --git a/app/views/vehicle_journeys/index.js.slim b/app/views/vehicle_journeys/index.js.slim
new file mode 100644
index 000000000..5f1b08f2c
--- /dev/null
+++ b/app/views/vehicle_journeys/index.js.slim
@@ -0,0 +1 @@
+$('#vehicle_journeys').html("#{escape_javascript(render('vehicle_journeys'))}");
\ No newline at end of file
diff --git a/app/views/vehicle_journeys/new.html.erb b/app/views/vehicle_journeys/new.html.erb
deleted file mode 100644
index d2e9d7c4c..000000000
--- a/app/views/vehicle_journeys/new.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= title_tag t('vehicle_journeys.new.title') %>
-
-<%= render 'form', { vehicle_journey: @vehicle_journey, form_url: referential_line_route_vehicle_journeys_path(@referential, @line, @route, @vehicle_journey) } %>
-
diff --git a/app/views/vehicle_journeys/new.html.slim b/app/views/vehicle_journeys/new.html.slim
new file mode 100644
index 000000000..6c13aa7a1
--- /dev/null
+++ b/app/views/vehicle_journeys/new.html.slim
@@ -0,0 +1,3 @@
+= title_tag t('vehicle_journeys.new.title')
+
+== render 'form', { vehicle_journey: @vehicle_journey, form_url: referential_line_route_vehicle_journeys_path(@referential, @line, @route, @vehicle_journey) }
\ No newline at end of file
diff --git a/app/views/vehicle_journeys/new.js.erb b/app/views/vehicle_journeys/new.js.slim
index 160e7a34b..df9d48e7e 100644
--- a/app/views/vehicle_journeys/new.js.erb
+++ b/app/views/vehicle_journeys/new.js.slim
@@ -3,7 +3,7 @@ $(document).ready(function() {
     function(){
       var vehicle_journey_journey_pattern_id = $("#vehicle_journey_journey_pattern_input select option:selected").attr("value");
       if (vehicle_journey_journey_pattern_id > 0) {
-        var url = "<%= referential_line_route_journey_patterns_path(@referential.id,@line.id,@route.id) %>";
+        var url = "#{referential_line_route_journey_patterns_path(@referential.id,@line.id,@route.id)}";
         url = url + "/" + vehicle_journey_journey_pattern_id +
                 "/new_vehicle_journey";
         $.get(url);
diff --git a/app/views/vehicle_journeys/select_journey_pattern.js.erb b/app/views/vehicle_journeys/select_journey_pattern.js.erb
deleted file mode 100644
index 6a32c7b9d..000000000
--- a/app/views/vehicle_journeys/select_journey_pattern.js.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-$('.journey_pattern_dependent_list').html('<%= escape_javascript(
-  render(:partial => 'vehicle_journeys/vehicle_journey_at_stop_fields',
-         :collection => @vehicle_journey.vehicle_journey_at_stops, 
-         :as => :vehicle_journey_at_stop,
-         :locals => { :vehicle_journey_at_stops_size => @vehicle_journey.vehicle_journey_at_stops.size })).html_safe %>'); 
-
-
diff --git a/app/views/vehicle_journeys/select_journey_pattern.js.slim b/app/views/vehicle_journeys/select_journey_pattern.js.slim
new file mode 100644
index 000000000..efddb25b6
--- /dev/null
+++ b/app/views/vehicle_journeys/select_journey_pattern.js.slim
@@ -0,0 +1 @@
+$('.journey_pattern_dependent_list').html("#{escape_javascript(render(partial: 'vehicle_journeys/vehicle_journey_at_stop_fields', collection: @vehicle_journey.vehicle_journey_at_stops, as: :vehicle_journey_at_stop, locals: { :vehicle_journey_at_stops_size => @vehicle_journey.vehicle_journey_at_stops.size })).html_safe}");
\ No newline at end of file
diff --git a/app/views/vehicle_journeys/show.html.erb b/app/views/vehicle_journeys/show.html.erb
deleted file mode 100644
index 4bf814bbe..000000000
--- a/app/views/vehicle_journeys/show.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<%= render 'show_details', vehicle_journey: @vehicle_journey %>
-<%= render 'show_sidebar' %>
diff --git a/app/views/vehicle_journeys/show.html.slim b/app/views/vehicle_journeys/show.html.slim
new file mode 100644
index 000000000..8ff4b188d
--- /dev/null
+++ b/app/views/vehicle_journeys/show.html.slim
@@ -0,0 +1,2 @@
+== render 'show_details', vehicle_journey: @vehicle_journey
+== render 'show_sidebar'
\ No newline at end of file