aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpl2016-07-28 17:04:02 +0200
committerjpl2016-07-28 17:04:02 +0200
commit9944f19bf67e366750acb09c1aa65dae660daa84 (patch)
tree7f44940fcbfddfe35638a454e7661a90f45c9e02
parent893573d9e102409891ef7b0a98d0225c85ca62ed (diff)
downloadchouette-core-9944f19bf67e366750acb09c1aa65dae660daa84.tar.bz2
Refs #1295: convert erb to slim (connection_links)
-rw-r--r--app/views/connection_links/_connection_link.erb40
-rw-r--r--app/views/connection_links/_connection_link.slim34
-rw-r--r--app/views/connection_links/_connection_links.erb9
-rw-r--r--app/views/connection_links/_connection_links.html.slim10
-rw-r--r--app/views/connection_links/_form.erb24
-rw-r--r--app/views/connection_links/_form.html.slim21
-rw-r--r--app/views/connection_links/edit.html.erb3
-rw-r--r--app/views/connection_links/edit.html.slim3
-rw-r--r--app/views/connection_links/index.html.erb26
-rw-r--r--app/views/connection_links/index.html.slim23
-rw-r--r--app/views/connection_links/index.js.erb1
-rw-r--r--app/views/connection_links/index.js.slim1
-rw-r--r--app/views/connection_links/new.html.erb3
-rw-r--r--app/views/connection_links/new.html.slim3
-rw-r--r--app/views/connection_links/select_areas.html.slim (renamed from app/views/connection_links/select_areas.html.erb)22
-rw-r--r--app/views/connection_links/show.html.erb102
-rw-r--r--app/views/connection_links/show.html.slim92
-rw-r--r--app/views/connection_links/show.kml.erb20
-rw-r--r--app/views/connection_links/show.kml.slim16
19 files changed, 212 insertions, 241 deletions
diff --git a/app/views/connection_links/_connection_link.erb b/app/views/connection_links/_connection_link.erb
deleted file mode 100644
index 7996eb0f3..000000000
--- a/app/views/connection_links/_connection_link.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-<div id="index_item" class="panel panel-default connection_link">
- <div class="panel-heading">
- <div class="panel-title clearfix">
- <span class="pull-right">
- <%= link_to edit_referential_connection_link_path(@referential, connection_link), :class => "btn btn-default btn-sm" do %>
- <span class="fa fa-pencil"></span>
- <% end %>
- <%= link_to referential_connection_link_path(@referential, connection_link), :method => :delete, :data => {:confirm => t('connection_links.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %>
- <span class="fa fa-trash-o"></span>
- <% end %>
- </span>
- <h5>
- <%= link_to([@referential, connection_link], :class => "preview", :title => "#{Chouette::ConnectionLink.model_name.human.capitalize} #{connection_link.name}") do %>
- <span class="name">
- <%= truncate(connection_link.name, :length => 20) %>
- </span>
- <% end %>
- </h5>
- </div>
- </div>
- <div class="panel-body">
- <p>
- <%= t('.from') %>
- <% if connection_link.departure.present? %>
- <%= link_to_if connection_link.departure, truncate(connection_link.departure.name, :length => 15) , referential_stop_area_path(@referential, connection_link.departure), :title => "#{connection_link.human_attribute_name('departure')} #{connection_link.departure.name}" %>
- <% else %>
- <%= connection_link.human_attribute_name('undefined') %>
- <% end %>
- <%= t('.to') %>
- <% if connection_link.arrival.present? %>
- <%= link_to_if( connection_link.arrival, truncate(connection_link.arrival.name, :length => 15), referential_stop_area_path(@referential, connection_link.arrival), :title => "#{connection_link.human_attribute_name('arrival')} #{connection_link.arrival.name}" ) %>
- <% else %>
- <%= connection_link.human_attribute_name("undefined") %>
- <% end %>
- </p>
- <p>
- <%= connection_link.human_attribute_name('default_duration').capitalize %>: <%= connection_link.default_duration ? connection_link.default_duration.strftime('%Mm %Ss') : connection_link.human_attribute_name("undefined") %>
- </p>
- </div>
-</div> \ No newline at end of file
diff --git a/app/views/connection_links/_connection_link.slim b/app/views/connection_links/_connection_link.slim
new file mode 100644
index 000000000..cfe84cc53
--- /dev/null
+++ b/app/views/connection_links/_connection_link.slim
@@ -0,0 +1,34 @@
+#index_item.panel.panel-default.connection_link
+ .panel-heading
+ .panel-title.clearfix
+ span.pull-right
+ = link_to edit_referential_connection_link_path(@referential, connection_link), class: 'btn btn-default btn-sm' do
+ span.fa.fa-pencil
+
+ = link_to referential_connection_link_path(@referential, connection_link), :method => :delete, :data => {:confirm => t('connection_links.actions.destroy_confirm')}, class: 'btn btn-danger btn-sm' do
+ span.fa.fa-trash-o
+
+ h5
+ = link_to([@referential, connection_link], class: 'preview', title: "#{Chouette::ConnectionLink.model_name.human.capitalize} #{connection_link.name}") do
+ span.name
+ = truncate(connection_link.name, :length => 20)
+
+ .panel-body
+ p
+ = t('.from')
+
+ - if connection_link.departure.present?
+ = link_to_if connection_link.departure, truncate(connection_link.departure.name, :length => 15) , referential_stop_area_path(@referential, connection_link.departure), :title => "#{connection_link.human_attribute_name('departure')} #{connection_link.departure.name}"
+ - else
+ = connection_link.human_attribute_name('undefined')
+
+ = t('.to')
+
+ - if connection_link.arrival.present?
+ = link_to_if( connection_link.arrival, truncate(connection_link.arrival.name, :length => 15), referential_stop_area_path(@referential, connection_link.arrival), :title => "#{connection_link.human_attribute_name('arrival')} #{connection_link.arrival.name}" )
+ - else
+ = connection_link.human_attribute_name("undefined")
+ p
+ = connection_link.human_attribute_name('default_duration').capitalize
+ = " : "
+ = connection_link.default_duration ? connection_link.default_duration.strftime('%Mm %Ss') : connection_link.human_attribute_name("undefined") \ No newline at end of file
diff --git a/app/views/connection_links/_connection_links.erb b/app/views/connection_links/_connection_links.erb
deleted file mode 100644
index cfc1d45f4..000000000
--- a/app/views/connection_links/_connection_links.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="page_info">
- <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @connection_links %>
-</div>
-<div class="connection_links paginated_content">
- <%= paginated_content(@connection_links) %>
-</div>
-<div class="pagination">
- <%= will_paginate @connection_links, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer %>
-</div>
diff --git a/app/views/connection_links/_connection_links.html.slim b/app/views/connection_links/_connection_links.html.slim
new file mode 100644
index 000000000..8cf41a6c1
--- /dev/null
+++ b/app/views/connection_links/_connection_links.html.slim
@@ -0,0 +1,10 @@
+.page_info
+ span.search
+ = t("will_paginate.page_entries_info.search")
+ = page_entries_info @connection_links
+
+.connection_links.paginated_content
+ = paginated_content(@connection_links)
+
+.pagination
+ = will_paginate @connection_links, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer
diff --git a/app/views/connection_links/_form.erb b/app/views/connection_links/_form.erb
deleted file mode 100644
index 49ca68aef..000000000
--- a/app/views/connection_links/_form.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<%= semantic_form_for [@referential, @connection_link] do |form| %>
- <%= form.inputs do %>
- <%= form.input :name %>
- <%= form.input :connection_link_type, :as => :select, :collection => Chouette::ConnectionLink.connection_link_types, :include_blank => true, :member_label => Proc.new { |type| t("connection_link_types.label.#{type}") } %>
- <%= form.input :comment %>
- <%= form.input :link_distance, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.connection_link.link_distance") } %>
- <%= form.input :mobility_restricted_suitability, :as => :select, :collection => [[t("true"), true], [t("false"), false]], :include_blank => true %>
- <%= form.input :stairs_availability, :as => :select, :collection => [[t("true"), true], [t("false"), false]], :include_blank => true %>
- <%= form.input :lift_availability, :as => :select, :collection => [[t("true"), true], [t("false"), false]], :include_blank => true %>
-
- <%= form.input :objectid, :required => !@connection_link.new_record?, :input_html => { :title => t("formtastic.titles.connection_link.objectid")} %>
- <% end %>
- <%= form.inputs :name => t('connection_links.show.durations') do %>
- <%= form.input :default_duration, :as => :extended_time_picker, :size => 8, :step => :seconds, :label => @connection_link.human_attribute_name("default_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %>
- <%= form.input :frequent_traveller_duration, :as => :extended_time_picker, :size => 8, :step => :seconds, :include_seconds => true, :label => @connection_link.human_attribute_name("frequent_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %>
- <%= form.input :occasional_traveller_duration, :as => :extended_time_picker, :size => 8, :include_seconds => true, :label => @connection_link.human_attribute_name("occasional_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %>
- <%= form.input :mobility_restricted_traveller_duration, :as => :extended_time_picker,:size => 8, :include_seconds => true, :label => @connection_link.human_attribute_name("mobility_restricted_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %>
- <% end %>
-
- <%= form.actions do %>
- <%= form.action :submit, :as => :button %>
- <%= form.action :cancel, :as => :link %>
- <% end %>
-<% end %>
diff --git a/app/views/connection_links/_form.html.slim b/app/views/connection_links/_form.html.slim
new file mode 100644
index 000000000..afef3bba7
--- /dev/null
+++ b/app/views/connection_links/_form.html.slim
@@ -0,0 +1,21 @@
+= semantic_form_for [@referential, @connection_link] do |form|
+ = form.inputs do
+ = form.input :name
+ = form.input :connection_link_type, as: :select, :collection => Chouette::ConnectionLink.connection_link_types, :include_blank => true, :member_label => Proc.new { |type| t("connection_link_types.label.#{type}") }
+ = form.input :comment
+ = form.input :link_distance, input_html: { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.connection_link.link_distance") }
+ = form.input :mobility_restricted_suitability, as: :select, :collection => [[t("true"), true], [t("false"), false]], include_blank: true
+ = form.input :stairs_availability, as: :select, :collection => [[t("true"), true], [t("false"), false]], include_blank: true
+ = form.input :lift_availability, as: :select, :collection => [[t("true"), true], [t("false"), false]], include_blank: true
+
+ = form.input :objectid, :required => !@connection_link.new_record?, :input_html => { :title => t("formtastic.titles.connection_link.objectid")}
+
+ = form.inputs :name => t('connection_links.show.durations') do
+ = form.input :default_duration, :as => :extended_time_picker, :size => 8, :step => :seconds, :label => @connection_link.human_attribute_name("default_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" }
+ = form.input :frequent_traveller_duration, :as => :extended_time_picker, :size => 8, :step => :seconds, :include_seconds => true, :label => @connection_link.human_attribute_name("frequent_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" }
+ = form.input :occasional_traveller_duration, :as => :extended_time_picker, :size => 8, :include_seconds => true, :label => @connection_link.human_attribute_name("occasional_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" }
+ = form.input :mobility_restricted_traveller_duration, :as => :extended_time_picker,:size => 8, :include_seconds => true, :label => @connection_link.human_attribute_name("mobility_restricted_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" }
+
+ = form.actions do
+ = form.action :submit, as: :button
+ = form.action :cancel, as: :link \ No newline at end of file
diff --git a/app/views/connection_links/edit.html.erb b/app/views/connection_links/edit.html.erb
deleted file mode 100644
index 77200420b..000000000
--- a/app/views/connection_links/edit.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= title_tag t('connection_links.edit.title', :connection_link => @connection_link.name ) %>
-
-<%= render "form" %>
diff --git a/app/views/connection_links/edit.html.slim b/app/views/connection_links/edit.html.slim
new file mode 100644
index 000000000..08a6ddd36
--- /dev/null
+++ b/app/views/connection_links/edit.html.slim
@@ -0,0 +1,3 @@
+= title_tag t('connection_links.edit.title', :connection_link => @connection_link.name )
+
+= render 'form' \ No newline at end of file
diff --git a/app/views/connection_links/index.html.erb b/app/views/connection_links/index.html.erb
deleted file mode 100644
index 151ce2d89..000000000
--- a/app/views/connection_links/index.html.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<%= title_tag t('connection_links.index.title') %>
-
-<%= search_form_for @q, :url => referential_connection_links_path(@referential), remote: true, :html => {:method => :get, class: "form-inline", :id => "search", role: "form"} do |f| %>
-<div class="panel panel-default">
- <div class="panel-heading">
- <div class="input-group col-md-12">
- <%= f.text_field :name_cont, :placeholder => "#{t('.name')}", :class => "form-control" %>
- <div class="input-group-btn">
- <button class="btn btn-default" type="submit"><i class="fa fa-search"></i></button>
- </div>
- </div><!-- /input-group -->
- <!-- <a data-toggle="collapse" data-parent="#search" href="#advanced_search"> -->
- <!-- <i class="fa fa-plus"></i> <%= "#{t('.advanced_search')}" %> -->
- <!-- </a> -->
- </div>
-</div>
-<% end %>
-
-<div id="connection_links"><%= render 'connection_links' %></div>
-
-<% content_for :sidebar do %>
-<ul class="actions">
- <li><%= link_to t('connection_links.actions.new'), new_referential_connection_link_path(@referential), :class => "add" %></li>
-</ul>
-
-<% end %>
diff --git a/app/views/connection_links/index.html.slim b/app/views/connection_links/index.html.slim
new file mode 100644
index 000000000..d36c6a125
--- /dev/null
+++ b/app/views/connection_links/index.html.slim
@@ -0,0 +1,23 @@
+= title_tag t('connection_links.index.title')
+
+= search_form_for @q, :url => referential_connection_links_path(@referential), remote: true, :html => {:method => :get, class: "form-inline", :id => "search", role: "form"} do |f|
+ .panel.panel-default
+ .panel-heading
+ .input-group.col-md-12
+ = f.text_field :name_cont, :placeholder => "#{t('.name')}", class: 'form-control'
+ .input-group-btn
+ button.btn.btn-default type="submit"
+ i.fa.fa-search
+
+ / <!-- /input-group -->
+ / <!-- <a data-toggle="collapse" data-parent="#search" href="#advanced_search"> -->
+ / <!-- <i class="fa fa-plus"></i> <%= "#{t('.advanced_search')}" %> -->
+ / <!-- </a> -->
+
+#connection_links
+ = render 'connection_links'
+
+- content_for :sidebar do
+ ul.actions
+ li
+ = link_to t('connection_links.actions.new'), new_referential_connection_link_path(@referential), class: 'add'
diff --git a/app/views/connection_links/index.js.erb b/app/views/connection_links/index.js.erb
deleted file mode 100644
index c01f09b97..000000000
--- a/app/views/connection_links/index.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-$('#connection_links').html('<%= escape_javascript(render("connection_links")) %>'); \ No newline at end of file
diff --git a/app/views/connection_links/index.js.slim b/app/views/connection_links/index.js.slim
new file mode 100644
index 000000000..bf7d9dceb
--- /dev/null
+++ b/app/views/connection_links/index.js.slim
@@ -0,0 +1 @@
+$('#connection_links').html("#{escape_javascript(render('connection_links'))}"); \ No newline at end of file
diff --git a/app/views/connection_links/new.html.erb b/app/views/connection_links/new.html.erb
deleted file mode 100644
index bd098adc0..000000000
--- a/app/views/connection_links/new.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= title_tag t('connection_links.new.title') %>
-
-<%= render "form" %>
diff --git a/app/views/connection_links/new.html.slim b/app/views/connection_links/new.html.slim
new file mode 100644
index 000000000..c4acdf622
--- /dev/null
+++ b/app/views/connection_links/new.html.slim
@@ -0,0 +1,3 @@
+= title_tag t('connection_links.new.title')
+
+= render 'form' \ No newline at end of file
diff --git a/app/views/connection_links/select_areas.html.erb b/app/views/connection_links/select_areas.html.slim
index b4c40c5f6..85da40eb7 100644
--- a/app/views/connection_links/select_areas.html.erb
+++ b/app/views/connection_links/select_areas.html.slim
@@ -1,15 +1,11 @@
-<%= title_tag t('connection_links.select_areas.title', :connection_link => @connection_link.name ) %>
+= title_tag t('connection_links.select_areas.title', connection_link: @connection_link.name)
-<%= semantic_form_for [@referential, @connection_link] do |form| %>
-<div>
- <%= form.inputs do %>
- <%= form.input :departure_id, :as => :search_stop_area, :json => referential_autocomplete_stop_areas_path(@referential, :format => :json)+"?filter=itl_excluded", :tokenLimit => 1, :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_stop_areas/show', [@departure].compact, :view_path => 'app/views', :format => :json, :scope => self).render } %>
- <%= form.input :arrival_id, :as => :search_stop_area, :json => referential_autocomplete_stop_areas_path(@referential, :format => :json)+"?filter=itl_excluded", :tokenLimit => 1, :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_stop_areas/show', [@arrival].compact, :view_path => 'app/views', :format => :json, :scope => self).render } %>
- <% end %>
+= semantic_form_for [@referential, @connection_link] do |form|
+ div
+ = form.inputs do
+ = form.input :departure_id, :as => :search_stop_area, :json => referential_autocomplete_stop_areas_path(@referential, :format => :json)+"?filter=itl_excluded", :tokenLimit => 1, :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_stop_areas/show', [@departure].compact, :view_path => 'app/views', :format => :json, :scope => self).render }
+ = form.input :arrival_id, :as => :search_stop_area, :json => referential_autocomplete_stop_areas_path(@referential, :format => :json)+"?filter=itl_excluded", :tokenLimit => 1, :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_stop_areas/show', [@arrival].compact, :view_path => 'app/views', :format => :json, :scope => self).render }
- <%= form.actions do %>
- <%= form.action :submit, :as => :button %>
- <%= form.action :cancel, :as => :link %>
- <% end %>
-</div>
-<% end %>
+ = form.actions do
+ = form.action :submit, as: :button
+ = form.action :cancel, as: :link \ No newline at end of file
diff --git a/app/views/connection_links/show.html.erb b/app/views/connection_links/show.html.erb
deleted file mode 100644
index e715953fc..000000000
--- a/app/views/connection_links/show.html.erb
+++ /dev/null
@@ -1,102 +0,0 @@
-<%= title_tag t('connection_links.show.title', :connection_link => @connection_link.name ) %>
-
-<div class="connection_link_show">
- <%= @map.to_html %>
-
- <div class="summary">
- <p>
- <label><%= @connection_link.human_attribute_name(:departure) %>: </label>
- <% if @connection_link.departure.present? %>
- <%= link_to @connection_link.departure.name, [@referential, @connection_link.departure] %>
- <% else %>
- <%= @connection_link.human_attribute_name("undefined") %>
- <% end %>
- </p>
- <p>
- <label><%= @connection_link.human_attribute_name(:arrival) %>: </label>
- <% if @connection_link.arrival.present? %>
- <%= link_to @connection_link.arrival.name, [@referential, @connection_link.arrival] %>
- <% else %>
- <%= @connection_link.human_attribute_name("undefined") %>
- <% end %>
- </p>
- <p>
- <label><%= @connection_link.human_attribute_name("connection_link_type") %>: </label>
- <% if @connection_link.connection_link_type.blank? %>
- <%=t("unknown") %>
- <% else %>
- <%= t("connection_link_types.label.#{@connection_link.connection_link_type}") %>
- <% end %>
- </p>
- <p>
- <label><%= @connection_link.human_attribute_name("comment") %>: </label>
- <%= @connection_link.comment %>
- </p>
- <p>
- <label><%= @connection_link.human_attribute_name("link_distance") %>: </label>
- <%= @connection_link.link_distance %>
- </p>
- <p>
- <label><%= t('connection_links.show.durations') %> </label>
- </p>
- <p>
- <label class='duration'><%= @connection_link.human_attribute_name("default_duration") %>: </label>
- <% if (@connection_link.default_duration.present?) %>
- <%= @connection_link.default_duration.strftime('%Hh %Mm %Ss') %>
- <% end %>
- </p>
- <p>
- <label class='duration'><%= @connection_link.human_attribute_name("frequent_traveller_duration") %>: </label>
- <% if (@connection_link.frequent_traveller_duration.present?) %>
- <%= @connection_link.frequent_traveller_duration.strftime('%Hh %Mm %Ss') %>
- <% end %>
- </p>
- <p>
- <label class='duration'><%= @connection_link.human_attribute_name("occasional_traveller_duration") %>: </label>
- <% if (@connection_link.occasional_traveller_duration.present?) %>
- <%= @connection_link.occasional_traveller_duration.strftime('%Hh %Mm %Ss') %>
- <% end %>
- </p>
- <p>
- <label class='duration'><%= @connection_link.human_attribute_name("mobility_restricted_traveller_duration") %>: </label>
- <% if (@connection_link.mobility_restricted_traveller_duration.present?) %>
- <%= @connection_link.mobility_restricted_traveller_duration.strftime('%Hh %Mm %Ss') %>
- <% end %>
- </p>
- <p>
- <label><%= @connection_link.human_attribute_name("mobility_restricted_suitability") %>: </label>
- <% if (!@connection_link.mobility_restricted_suitability.nil?) %>
- <%= t((@connection_link.mobility_restricted_suitability == true).to_s) %>
- <% else %>
- <%=t("unknown") %>
- <% end %>
- </p>
- <p>
- <label><%= @connection_link.human_attribute_name("stairs_availability") %>: </label>
- <% if (!@connection_link.stairs_availability.nil?) %>
- <%= t((@connection_link.stairs_availability == true).to_s) %>
- <% else %>
- <%=t("unknown") %>
- <% end %>
- </p>
- <p>
- <label><%= @connection_link.human_attribute_name("lift_availability") %>: </label>
- <% if (!@connection_link.lift_availability.nil?) %>
- <%= t((@connection_link.lift_availability == true).to_s) %>
- <% else %>
- <%=t("unknown") %>
- <% end %>
- </p>
- </div>
-</div>
-
-<% content_for :sidebar do %>
-<ul class="actions">
- <li><%= link_to t('connection_links.actions.new'), new_referential_connection_link_path(@referential), :class => "add" %></li>
- <li><%= link_to t('connection_links.actions.edit'), edit_referential_connection_link_path(@referential, @connection_link), :class => "edit" %></li>
- <li><%= link_to t('connection_links.actions.destroy'), referential_connection_link_path(@referential, @connection_link), :method => :delete, :data => {:confirm => t('connection_links.actions.destroy_confirm')}, :class => "remove" %></li>
- <li><%= link_to t('connection_links.actions.select_areas'), select_areas_referential_connection_link_path(@referential, @connection_link), :class => "select" %></li>
- <br>
-</ul>
- <%= creation_tag(@connection_link) %>
-<% end %>
diff --git a/app/views/connection_links/show.html.slim b/app/views/connection_links/show.html.slim
new file mode 100644
index 000000000..263c4c154
--- /dev/null
+++ b/app/views/connection_links/show.html.slim
@@ -0,0 +1,92 @@
+= title_tag t('connection_links.show.title', :connection_link => @connection_link.name)
+
+.connection_link_show
+ = @map.to_html
+
+ .summary
+ p
+ label = "#{@connection_link.human_attribute_name(:departure)} : "
+ - if @connection_link.departure.present?
+ = link_to @connection_link.departure.name, [@referential, @connection_link.departure]
+ - else
+ = @connection_link.human_attribute_name("undefined")
+
+ p
+ label = "#{@connection_link.human_attribute_name(:arrival)} : "
+ - if @connection_link.arrival.present?
+ = link_to @connection_link.arrival.name, [@referential, @connection_link.arrival]
+ - else
+ = @connection_link.human_attribute_name("undefined")
+
+ p
+ label = "#{@connection_link.human_attribute_name('connection_link_type')} : "
+ - if @connection_link.connection_link_type.blank?
+ = t("unknown")
+ - else
+ = t("connection_link_types.label.#{@connection_link.connection_link_type}")
+
+ p
+ label = "#{@connection_link.human_attribute_name('comment')} : "
+ = @connection_link.comment
+
+ p
+ label = "#{@connection_link.human_attribute_name('link_distance')} : "
+ = @connection_link.link_distance
+
+ p
+ label = t('connection_links.show.durations')
+
+ p
+ label.duration = "#{@connection_link.human_attribute_name('default_duration')} : "
+ - if @connection_link.default_duration.present?
+ = @connection_link.default_duration.strftime('%Hh %Mm %Ss')
+
+ p
+ label.duration = "#{@connection_link.human_attribute_name('frequent_traveller_duration')} : "
+ - if @connection_link.frequent_traveller_duration.present?
+ = @connection_link.frequent_traveller_duration.strftime('%Hh %Mm %Ss')
+
+ p
+ label.duration = "#{@connection_link.human_attribute_name('occasional_traveller_duration')} : "
+ - if @connection_link.occasional_traveller_duration.present?
+ = @connection_link.occasional_traveller_duration.strftime('%Hh %Mm %Ss')
+
+ p
+ label.duration = "#{@connection_link.human_attribute_name('mobility_restricted_traveller_duration')} : "
+ -if @connection_link.mobility_restricted_traveller_duration.present?
+ = @connection_link.mobility_restricted_traveller_duration.strftime('%Hh %Mm %Ss')
+
+ p
+ label = "#{@connection_link.human_attribute_name('mobility_restricted_suitability')} : "
+ - if !@connection_link.mobility_restricted_suitability.nil?
+ = t((@connection_link.mobility_restricted_suitability == true).to_s)
+ - else
+ = t("unknown")
+
+ p
+ label = "#{@connection_link.human_attribute_name('stairs_availability')} : "
+ - if !@connection_link.stairs_availability.nil?
+ = t((@connection_link.stairs_availability == true).to_s)
+ - else
+ = t("unknown")
+
+ p
+ label = "#{@connection_link.human_attribute_name('lift_availability')} : "
+ - if !@connection_link.lift_availability.nil?
+ = t((@connection_link.lift_availability == true).to_s)
+ - else
+ = t("unknown")
+
+- content_for :sidebar do
+ ul.actions
+ li
+ = link_to t('connection_links.actions.new'), new_referential_connection_link_path(@referential), class: 'add'
+ li
+ = link_to t('connection_links.actions.edit'), edit_referential_connection_link_path(@referential, @connection_link), class: 'edit'
+ li
+ = link_to t('connection_links.actions.destroy'), referential_connection_link_path(@referential, @connection_link), :method => :delete, :data => {:confirm => t('connection_links.actions.destroy_confirm')}, class: 'remove'
+ li
+ = link_to t('connection_links.actions.select_areas'), select_areas_referential_connection_link_path(@referential, @connection_link), class: 'select'
+ br
+
+ = creation_tag(@connection_link) \ No newline at end of file
diff --git a/app/views/connection_links/show.kml.erb b/app/views/connection_links/show.kml.erb
deleted file mode 100644
index fa355d7b5..000000000
--- a/app/views/connection_links/show.kml.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kml xmlns="http://www.opengis.net/kml/2.2">
- <Document>
- <% if @connection_link.geometry %>
- <Placemark id="route_<%= @connection_link.id %>" >
- <name><%= @connection_link.name %></name>
- <%= @connection_link.geometry.kml_representation.html_safe %>
- </Placemark>
- <Placemark id="<%= @connection_link.departure.id %>" >
- <departure>true</departure>
- <%= @connection_link.departure.geometry.kml_representation.html_safe %>
- </Placemark>
- <Placemark id="<%= @connection_link.arrival.id %>" >
- <arrival>true</arrival>
- <%= @connection_link.arrival.geometry.kml_representation.html_safe %>
- </Placemark>
- <% end %>
- </Document>
-</kml>
-
diff --git a/app/views/connection_links/show.kml.slim b/app/views/connection_links/show.kml.slim
new file mode 100644
index 000000000..59169dba3
--- /dev/null
+++ b/app/views/connection_links/show.kml.slim
@@ -0,0 +1,16 @@
+doctype XML
+
+kml xmlns="http://www.opengis.net/kml/2.2"
+ document
+ - if @connection_link.geometry
+ placemark id="route_#{@connection_link.id}"
+ name = @connection_link.name
+ = @connection_link.geometry.kml_representation.html_safe
+
+ placemark id="#{@connection_link.departure.id}"
+ departure true
+ = @connection_link.departure.geometry.kml_representation.html_safe
+
+ placemark id="#{@connection_link.arrival.id}"
+ arrival true
+ = @connection_link.arrival.geometry.kml_representation.html_safe