Refs #1295: convert erb to slim (journey_patterns)

12 files changed, 117 insertions, 133 deletions

diff --git a/app/views/journey_patterns/_form.html.erb b/app/views/journey_patterns/_form.html.erb
deleted file mode 100644
index f57556577..000000000
--- a/app/views/journey_patterns/_form.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<%= semantic_form_for [@referential, @line, @route, @journey_pattern] do |form| %>
-  <%= form.inputs do %> 
-    <%= form.input :name, :input_html => {  :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.journey_pattern.name") } %>
-    <%= form.input :published_name %>
-    <%= form.input :registration_number, :input_html => {  :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.journey_pattern.registration_number") } %>              
-    <%= form.input :comment %>              
-    <%= form.input :stop_point_ids, :label => stop_point_ids_label(@journey_pattern), :as => :check_boxes, :collection => @route.stop_points.map { |s| [s.stop_area.name, s.id.to_s]}, :input_html => (@journey_pattern.new_record? ? { :checked => 'checked' }:{}) %>              
-    <%= form.input :objectid, :required => !@journey_pattern.new_record?, :input_html => {  :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.journey_pattern.objectid") } %>  
-  <% end %>
-
-   <%= form.actions do %>
-     <%= form.action :submit, :as => :button %>
-     <%= form.action :cancel, :as => :link %>
-   <% end %>
-<% end %>
-
diff --git a/app/views/journey_patterns/_form.html.slim b/app/views/journey_patterns/_form.html.slim
new file mode 100644
index 000000000..7b14474d9
--- /dev/null
+++ b/app/views/journey_patterns/_form.html.slim
@@ -0,0 +1,12 @@
+= semantic_form_for [@referential, @line, @route, @journey_pattern] do |form|
+  = form.inputs do
+    = form.input :name, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.journey_pattern.name") }
+    = form.input :published_name
+    = form.input :registration_number, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.journey_pattern.registration_number") }
+    = form.input :comment
+    = form.input :stop_point_ids, :label => stop_point_ids_label(@journey_pattern), as: :check_boxes, :collection => @route.stop_points.map { |s| [s.stop_area.name, s.id.to_s]}, :input_html => (@journey_pattern.new_record? ? { :checked => 'checked' }:{})
+    = form.input :objectid, :required => !@journey_pattern.new_record?, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.journey_pattern.objectid") }
+
+  = form.actions do
+    = form.action :submit, as: :button
+    = form.action :cancel, as: :link
\ No newline at end of file
diff --git a/app/views/journey_patterns/_journey_pattern.html.erb b/app/views/journey_patterns/_journey_pattern.html.erb
deleted file mode 100644
index 029b3c40e..000000000
--- a/app/views/journey_patterns/_journey_pattern.html.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-<div id="index_item" class="panel panel-default journey_pattern">
-  <div class="panel-heading">
-    <div class="panel-title clearfix">
-      <span class="pull-right">                
-        <%= link_to referential_line_route_journey_pattern_path(@referential, @line, @route, journey_pattern), :method => :delete, :data => {:confirm =>  t('journey_patterns.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %>
-          <span class="fa fa-trash-o"></span>
-        <% end %>
-      </span>
-      <h5>
-        <%= link_to([@referential, @line, @route, journey_pattern], :class => "preview", :title => "#{Chouette::JourneyPattern.model_name.human.capitalize} #{journey_name(journey_pattern)}") do %>        
-        <span class="name">
-          <%= truncate(journey_name(journey_pattern), :length => 20) %>
-        </span>
-        <% end %>
-      </h5>
-    </div>                          
-  </div>
-  <div class="panel-body">
-    <% unless journey_pattern.stop_points.empty? %>
-      <p><%= t('.from_to', :departure => journey_pattern.stop_points.first.stop_area.name, :arrival => journey_pattern.stop_points.last.stop_area.name) %></p>
-    <% end %>
-    <p><%= t('.stop_count', :count => journey_pattern.stop_points.count, :route_count => @route.stop_points.count) %> | <%= t('.vehicle_journeys_count', :count => journey_pattern.vehicle_journeys.count) %></p>
-    <% if journey_pattern.vehicle_journeys.count > 0 %>
-      <p>
-        <i class="fa fa-clock-o"></i>
-        <%= link_to t('journey_patterns.journey_pattern.vehicle_journey_at_stops'), referential_line_route_vehicle_journeys_path(@referential, @line, @route, :q => {:journey_pattern_id_eq => journey_pattern.id}), :class => "with_fa" %>
-      </p>
-      <% if exist_vehicle_journey_frequencies?(@route, journey_pattern) %>
-        <p>
-          <i class="fa fa-clock-o"></i>
-          <%= link_to t('vehicle_journey_frequencies.actions.index'), referential_line_route_vehicle_journey_frequencies_path(@referential, @line, @route, :q => {:journey_pattern_id_eq => journey_pattern.id}) %>
-        </p>
-      <% end %>
-    <% end %>
-  </div>
-</div>
diff --git a/app/views/journey_patterns/_journey_pattern.html.slim b/app/views/journey_patterns/_journey_pattern.html.slim
new file mode 100644
index 000000000..c658b8267
--- /dev/null
+++ b/app/views/journey_patterns/_journey_pattern.html.slim
@@ -0,0 +1,31 @@
+#index_item.panel.panel-default.journey_pattern
+  .panel-heading
+    .panel-title.clearfix
+      span.pull-right
+        = link_to referential_line_route_journey_pattern_path(@referential, @line, @route, journey_pattern), method: :delete, :data => {:confirm =>  t('journey_patterns.actions.destroy_confirm')}, class: 'btn btn-danger btn-sm' do
+          span.fa.fa-trash-o
+
+      h5
+        = link_to [@referential, @line, @route, journey_pattern], class: 'preview', :title => "#{Chouette::JourneyPattern.model_name.human.capitalize} #{journey_name(journey_pattern)}" do
+          span.name
+            = truncate(journey_name(journey_pattern), :length => 20)
+
+  .panel-body
+    - unless journey_pattern.stop_points.empty?
+      p
+        = t('.from_to', :departure => journey_pattern.stop_points.first.stop_area.name, :arrival => journey_pattern.stop_points.last.stop_area.name)
+
+    p
+      = t('.stop_count', :count => journey_pattern.stop_points.count, :route_count => @route.stop_points.count)
+      = " | "
+      = t('.vehicle_journeys_count', :count => journey_pattern.vehicle_journeys.count)
+
+    - if journey_pattern.vehicle_journeys.count > 0
+      p
+        i.fa.fa-clock-o
+        = link_to t('journey_patterns.journey_pattern.vehicle_journey_at_stops'), referential_line_route_vehicle_journeys_path(@referential, @line, @route, :q => {:journey_pattern_id_eq => journey_pattern.id}), class: 'with_fa'
+
+      - if exist_vehicle_journey_frequencies?(@route, journey_pattern)
+        p
+          i.fa.fa-clock-o
+          = link_to t('vehicle_journey_frequencies.actions.index'), referential_line_route_vehicle_journey_frequencies_path(@referential, @line, @route, :q => {:journey_pattern_id_eq => journey_pattern.id})
\ No newline at end of file
diff --git a/app/views/journey_patterns/edit.html.erb b/app/views/journey_patterns/edit.html.erb
deleted file mode 100644
index 33fac2a6c..000000000
--- a/app/views/journey_patterns/edit.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= title_tag t('journey_patterns.edit.title', :journey_pattern => @journey_pattern.name ) %>
-
-<%= render "form" %>
-
diff --git a/app/views/journey_patterns/edit.html.slim b/app/views/journey_patterns/edit.html.slim
new file mode 100644
index 000000000..5c5aed5ad
--- /dev/null
+++ b/app/views/journey_patterns/edit.html.slim
@@ -0,0 +1,3 @@
+= title_tag t('journey_patterns.edit.title', journey_pattern: @journey_pattern.name )
+
+= render 'form'
\ No newline at end of file
diff --git a/app/views/journey_patterns/new.html.erb b/app/views/journey_patterns/new.html.erb
deleted file mode 100644
index fb6ecbd64..000000000
--- a/app/views/journey_patterns/new.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= title_tag  t('journey_patterns.new.title') %>
-
-<%= render "form" %>
-
diff --git a/app/views/journey_patterns/new.html.slim b/app/views/journey_patterns/new.html.slim
new file mode 100644
index 000000000..5f626abff
--- /dev/null
+++ b/app/views/journey_patterns/new.html.slim
@@ -0,0 +1,3 @@
+= title_tag t('journey_patterns.new.title')
+
+= render 'form'
\ No newline at end of file
diff --git a/app/views/journey_patterns/show.html.erb b/app/views/journey_patterns/show.html.erb
deleted file mode 100644
index 6bd6022f7..000000000
--- a/app/views/journey_patterns/show.html.erb
+++ /dev/null
@@ -1,47 +0,0 @@
-<%= title_tag t('journey_patterns.show.title', :journey_pattern => journey_name( @journey_pattern), :route => @route.name ) %>
-
-<div class="journey_pattern_show">
-  <%= @map.to_html %>
-
-  <div class="summary">
-    <p>
-      <label><%= @journey_pattern.human_attribute_name(:name) %>: </label>
-      <%= @journey_pattern.name %>
-    </p>
-    <p>
-      <label><%= @journey_pattern.human_attribute_name(:published_name) %>: </label>
-      <%= @journey_pattern.published_name %>
-    </p>
-    <p>
-      <label><%= @journey_pattern.human_attribute_name(:registration_number) %>: </label>
-      <%= @journey_pattern.registration_number %>
-    </p>
-    <p>
-      <label><%= @journey_pattern.human_attribute_name(:comment) %>: </label>
-      <%= @journey_pattern.comment %>
-    </p>
-  </div>
-
-</div>
-
-<p class="after_map" />
-<h3 class="journey_pattern_stop_points"><%= t('.stop_points') %></h3>
-<div class="stop_points paginated_content" >
-  <%= paginated_content @stop_points, "stop_points/stop_point" %>
-</div>
-
-<% content_for :sidebar do %>
-<ul class="actions">
-  <li><%= link_to t('journey_patterns.actions.new'), new_referential_line_route_journey_pattern_path(@referential, @line, @route), :class => "add" %></li>
-  <li><%= link_to t('journey_patterns.actions.edit'), edit_referential_line_route_journey_pattern_path(@referential, @line, @route, @journey_pattern), :class => "edit" %></li>
-  <li><%= link_to t('journey_patterns.actions.destroy'), referential_line_route_journey_pattern_path(@referential, @line, @route, @journey_pattern), :method => :delete, :data => {:confirm => t('journey_patterns.actions.destroy_confirm')}, :class => "remove" %></li>
-  <li>
-    <%= link_to edit_referential_line_route_journey_pattern_route_sections_selector_path(@referential, @line, @route, @journey_pattern), class: "edit#{' control-shape' if @journey_pattern.control?}" do %>
-      <%= t('journey_patterns.actions.edit_route_sections') %>
-      <% if @journey_pattern.control? %><i class="fa fa-exclamation-triangle"></i><% end %>
-    <% end %>
-  </li>
-  <li><%= link_to t('journey_patterns.journey_pattern.vehicle_journey_at_stops'), referential_line_route_vehicle_journeys_path(@referential, @line, @route, :q => {:journey_pattern_id_eq => @journey_pattern.id}), :class => "clock" %></li>
-</ul>
-  <%= creation_tag(@journey_pattern) %>
-<% end %>
diff --git a/app/views/journey_patterns/show.html.slim b/app/views/journey_patterns/show.html.slim
new file mode 100644
index 000000000..0fee1a257
--- /dev/null
+++ b/app/views/journey_patterns/show.html.slim
@@ -0,0 +1,47 @@
+= title_tag t('journey_patterns.show.title', journey_pattern: journey_name( @journey_pattern), route: @route.name )
+
+.journey_pattern_show
+  = @map.to_html
+
+  .summary
+    p
+      label = "#{@journey_pattern.human_attribute_name(:name)} : "
+      = @journey_pattern.name
+
+    p
+      label = "#{@journey_pattern.human_attribute_name(:published_name)} : "
+      = @journey_pattern.published_name
+
+    p
+      label = "#{@journey_pattern.human_attribute_name(:registration_number)} : "
+      = @journey_pattern.registration_number
+
+    p
+      label = "#{@journey_pattern.human_attribute_name(:comment)} : "
+      = @journey_pattern.comment
+
+p.after_map
+
+h3.journey_pattern_stop_points = t('.stop_points')
+
+.stop_points.paginated_content
+  = paginated_content @stop_points, "stop_points/stop_point"
+
+- content_for :sidebar do
+  ul.actions
+    li
+      = link_to t('journey_patterns.actions.new'), new_referential_line_route_journey_pattern_path(@referential, @line, @route), class: 'add'
+    li
+      = link_to t('journey_patterns.actions.edit'), edit_referential_line_route_journey_pattern_path(@referential, @line, @route, @journey_pattern), class: 'edit'
+    li
+      = link_to t('journey_patterns.actions.destroy'), referential_line_route_journey_pattern_path(@referential, @line, @route, @journey_pattern), :method => :delete, :data => {:confirm => t('journey_patterns.actions.destroy_confirm')}, class: 'remove'
+    li
+      = link_to edit_referential_line_route_journey_pattern_route_sections_selector_path(@referential, @line, @route, @journey_pattern), class: "edit#{' control-shape' if @journey_pattern.control?}" do
+        = t('journey_patterns.actions.edit_route_sections')
+        - if @journey_pattern.control?
+          i.fa.fa-exclamation-triangle
+
+    li
+      = link_to t('journey_patterns.journey_pattern.vehicle_journey_at_stops'), referential_line_route_vehicle_journeys_path(@referential, @line, @route, :q => {:journey_pattern_id_eq => @journey_pattern.id}), class: 'clock'
+  
+  = creation_tag(@journey_pattern)
\ No newline at end of file
diff --git a/app/views/journey_patterns/show.kml.erb b/app/views/journey_patterns/show.kml.erb
deleted file mode 100644
index 75ca50ab5..000000000
--- a/app/views/journey_patterns/show.kml.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kml xmlns="http://www.opengis.net/kml/2.2">
-  <Document>
-    <Placemark id="route_<%= @journey_pattern.id %>" >
-      <name><%= @journey_pattern.name %></name>
-      <inactive>true</inactive>
-      <%= @journey_pattern.route.geometry.kml_representation.html_safe %>
-    </Placemark>
-    <% @journey_pattern.route.stop_points.each_with_index do |stop_point, index| %>
-      <% if stop_point.stop_area.geometry %>
-      <Placemark id="<%= stop_point.stop_area.id %>" >
-        <name><%= "#{stop_point.stop_area.name} (#{index+1})" %></name>
-        <stop><%= @journey_pattern.stop_points.include?( stop_point) ? "true" : "false" %></stop>
-        <% if stop_point.stop_area.id==@route.stop_areas.first.id %>
-        <departure>true</departure>
-        <% elsif stop_point.stop_area.id==@route.stop_areas.last.id %>
-        <arrival>true</arrival>
-        <% end %>
-        <iconCode><%= icon_code(stop_point, @journey_pattern)%></iconCode>
-        <%= stop_point.stop_area.geometry.kml_representation.html_safe %>
-      </Placemark>
-      <% end %>
-    <% end %>
-  </Document>
-</kml>
-
diff --git a/app/views/journey_patterns/show.kml.slim b/app/views/journey_patterns/show.kml.slim
new file mode 100644
index 000000000..88a137bf5
--- /dev/null
+++ b/app/views/journey_patterns/show.kml.slim
@@ -0,0 +1,21 @@
+doctype XML
+
+kml xmlns="http://www.opengis.net/kml/2.2" 
+  document
+    placemark id="route_#{@journey_pattern.id}" 
+      name = @journey_pattern.name
+      inactive true
+      = @journey_pattern.route.geometry.kml_representation.html_safe
+
+    - @journey_pattern.route.stop_points.each_with_index do |stop_point, index|
+      - if stop_point.stop_area.geometry
+        placemark id="#{stop_point.stop_area.id}" 
+          name = "#{stop_point.stop_area.name} (#{index+1})"
+          stop = @journey_pattern.stop_points.include?(stop_point) ? "true" : "false"
+          - if stop_point.stop_area.id == @route.stop_areas.first.id
+            departure true
+          - elsif stop_point.stop_area.id == @route.stop_areas.last.id
+            arrival true
+          
+          iconcode = icon_code(stop_point, @journey_pattern)
+          = stop_point.stop_area.geometry.kml_representation.html_safe
\ No newline at end of file