From 9944f19bf67e366750acb09c1aa65dae660daa84 Mon Sep 17 00:00:00 2001 From: jpl Date: Thu, 28 Jul 2016 17:04:02 +0200 Subject: Refs #1295: convert erb to slim (connection_links) --- app/views/connection_links/_connection_link.erb | 40 -------- app/views/connection_links/_connection_link.slim | 34 +++++++ app/views/connection_links/_connection_links.erb | 9 -- .../connection_links/_connection_links.html.slim | 10 ++ app/views/connection_links/_form.erb | 24 ----- app/views/connection_links/_form.html.slim | 21 +++++ app/views/connection_links/edit.html.erb | 3 - app/views/connection_links/edit.html.slim | 3 + app/views/connection_links/index.html.erb | 26 ------ app/views/connection_links/index.html.slim | 23 +++++ app/views/connection_links/index.js.erb | 1 - app/views/connection_links/index.js.slim | 1 + app/views/connection_links/new.html.erb | 3 - app/views/connection_links/new.html.slim | 3 + app/views/connection_links/select_areas.html.erb | 15 --- app/views/connection_links/select_areas.html.slim | 11 +++ app/views/connection_links/show.html.erb | 102 --------------------- app/views/connection_links/show.html.slim | 92 +++++++++++++++++++ app/views/connection_links/show.kml.erb | 20 ---- app/views/connection_links/show.kml.slim | 16 ++++ 20 files changed, 214 insertions(+), 243 deletions(-) delete mode 100644 app/views/connection_links/_connection_link.erb create mode 100644 app/views/connection_links/_connection_link.slim delete mode 100644 app/views/connection_links/_connection_links.erb create mode 100644 app/views/connection_links/_connection_links.html.slim delete mode 100644 app/views/connection_links/_form.erb create mode 100644 app/views/connection_links/_form.html.slim delete mode 100644 app/views/connection_links/edit.html.erb create mode 100644 app/views/connection_links/edit.html.slim delete mode 100644 app/views/connection_links/index.html.erb create mode 100644 app/views/connection_links/index.html.slim delete mode 100644 app/views/connection_links/index.js.erb create mode 100644 app/views/connection_links/index.js.slim delete mode 100644 app/views/connection_links/new.html.erb create mode 100644 app/views/connection_links/new.html.slim delete mode 100644 app/views/connection_links/select_areas.html.erb create mode 100644 app/views/connection_links/select_areas.html.slim delete mode 100644 app/views/connection_links/show.html.erb create mode 100644 app/views/connection_links/show.html.slim delete mode 100644 app/views/connection_links/show.kml.erb create mode 100644 app/views/connection_links/show.kml.slim 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 @@ - \ 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 @@ -
- <%= t("will_paginate.page_entries_info.search") %> <%= page_entries_info @connection_links %> -
- - 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| %> -
-
-
- <%= f.text_field :name_cont, :placeholder => "#{t('.name')}", :class => "form-control" %> -
- -
-
- - - -
-
-<% end %> - - - -<% content_for :sidebar do %> - - -<% 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 + + / + / + / + / + +#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.erb deleted file mode 100644 index b4c40c5f6..000000000 --- a/app/views/connection_links/select_areas.html.erb +++ /dev/null @@ -1,15 +0,0 @@ -<%= title_tag t('connection_links.select_areas.title', :connection_link => @connection_link.name ) %> - -<%= semantic_form_for [@referential, @connection_link] do |form| %> -
- <%= 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 %> - - <%= form.actions do %> - <%= form.action :submit, :as => :button %> - <%= form.action :cancel, :as => :link %> - <% end %> -
-<% end %> diff --git a/app/views/connection_links/select_areas.html.slim b/app/views/connection_links/select_areas.html.slim new file mode 100644 index 000000000..85da40eb7 --- /dev/null +++ b/app/views/connection_links/select_areas.html.slim @@ -0,0 +1,11 @@ += 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 } + + = 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 ) %> - - - -<% content_for :sidebar do %> - - <%= 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 @@ - - - - <% if @connection_link.geometry %> - - <%= @connection_link.name %> - <%= @connection_link.geometry.kml_representation.html_safe %> - - - true - <%= @connection_link.departure.geometry.kml_representation.html_safe %> - - - true - <%= @connection_link.arrival.geometry.kml_representation.html_safe %> - - <% end %> - - - 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 -- cgit v1.2.3