diff options
| author | jpl | 2016-08-01 17:13:04 +0200 |
|---|---|---|
| committer | jpl | 2016-08-01 17:13:04 +0200 |
| commit | 78a53da8b4e29066833a684cad66ed7919922fab (patch) | |
| tree | 2da5972faf92c31f5373b8d1877cb7dde8483964 | |
| parent | 9476ef8d8d93914b6bcb64ed6eb65b60e8beb086 (diff) | |
| download | chouette-core-78a53da8b4e29066833a684cad66ed7919922fab.tar.bz2 | |
Refs #1295: convert erb to slim (networks)
| -rw-r--r-- | app/views/networks/_form.erb | 18 | ||||
| -rw-r--r-- | app/views/networks/_form.html.slim | 15 | ||||
| -rw-r--r-- | app/views/networks/_network.erb | 21 | ||||
| -rw-r--r-- | app/views/networks/_network.html.slim | 14 | ||||
| -rw-r--r-- | app/views/networks/_networks.erb | 9 | ||||
| -rw-r--r-- | app/views/networks/_networks.html.slim | 9 | ||||
| -rw-r--r-- | app/views/networks/edit.html.erb | 3 | ||||
| -rw-r--r-- | app/views/networks/edit.html.slim | 3 | ||||
| -rw-r--r-- | app/views/networks/index.html.erb | 26 | ||||
| -rw-r--r-- | app/views/networks/index.html.slim | 23 | ||||
| -rw-r--r-- | app/views/networks/index.js.erb | 1 | ||||
| -rw-r--r-- | app/views/networks/index.js.slim | 1 | ||||
| -rw-r--r-- | app/views/networks/new.html.erb | 3 | ||||
| -rw-r--r-- | app/views/networks/new.html.slim | 3 | ||||
| -rw-r--r-- | app/views/networks/show.html.erb | 49 | ||||
| -rw-r--r-- | app/views/networks/show.html.slim | 47 | ||||
| -rw-r--r-- | app/views/networks/show.kml.erb | 14 | ||||
| -rw-r--r-- | app/views/networks/show.kml.slim | 10 |
18 files changed, 125 insertions, 144 deletions
diff --git a/app/views/networks/_form.erb b/app/views/networks/_form.erb deleted file mode 100644 index 5794794fd..000000000 --- a/app/views/networks/_form.erb +++ /dev/null @@ -1,18 +0,0 @@ -<%= semantic_form_for [@referential, @network] do |form| %> - <%= form.inputs do %> - <%= form.input :name, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.network.name")} %> - <%= form.input :registration_number, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.network.registration_number")} %> - <%= form.input :comment %> - <%= form.input :version_date, :as => :date_picker %> - <%= form.input :description %> - <%= form.input :source_name %> - <%= form.input :source_type_name, :as => :select, :collection => Chouette::Network.source_type_names, :include_blank => true, :member_label => Proc.new { |mode| t("source_types.label.#{mode}") } %> - <%= form.input :source_identifier %> - <%= form.input :objectid, :required => !@network.new_record?, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.network.objectid")} %> - <% end %> - - <%= form.actions do %> - <%= form.action :submit, :as => :button %> - <%= form.action :cancel, :as => :link %> - <% end %> -<% end %> diff --git a/app/views/networks/_form.html.slim b/app/views/networks/_form.html.slim new file mode 100644 index 000000000..e7020ef68 --- /dev/null +++ b/app/views/networks/_form.html.slim @@ -0,0 +1,15 @@ += semantic_form_for [@referential, @network] do |form| + = form.inputs do + = form.input :name, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.network.name")} + = form.input :registration_number, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.network.registration_number")} + = form.input :comment + = form.input :version_date, as: :date_picker + = form.input :description + = form.input :source_name + = form.input :source_type_name, as: :select, :collection => Chouette::Network.source_type_names, :include_blank => true, :member_label => Proc.new { |mode| t("source_types.label.#{mode}") } + = form.input :source_identifier + = form.input :objectid, :required => !@network.new_record?, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.network.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/networks/_network.erb b/app/views/networks/_network.erb deleted file mode 100644 index 618e39b72..000000000 --- a/app/views/networks/_network.erb +++ /dev/null @@ -1,21 +0,0 @@ -<div id="index_item" class="panel panel-default network"> - <div class="panel-heading"> - <div class="panel-title clearfix"> - <span class="pull-right"> - <%= link_to edit_referential_network_path(@referential, network), :class => "btn btn-default btn-sm" do %> - <span class="fa fa-pencil"></span> - <% end %> - <%= link_to referential_network_path(@referential, network), :method => :delete, :data => {:confirm => t('networks.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %> - <span class="fa fa-trash-o"></span> - <% end %> - </span> - <h5> - <%= link_to([@referential, network], :class => "preview", :title => "#{Chouette::Network.model_name.human.capitalize} #{network.name}") do %> - <span class="name"> - <%= truncate(network.name, :length => 20) %> - </span> - <% end %> - </h5> - </div> - </div> -</div> diff --git a/app/views/networks/_network.html.slim b/app/views/networks/_network.html.slim new file mode 100644 index 000000000..dc1aa6b5c --- /dev/null +++ b/app/views/networks/_network.html.slim @@ -0,0 +1,14 @@ +#index_item.panel.panel-default.network + .panel-heading + .panel-title.clearfix + span.pull-right + = link_to edit_referential_network_path(@referential, network), class: 'btn btn-default btn-sm' do + span.fa.fa-pencil + + = link_to referential_network_path(@referential, network), method: :delete, :data => { :confirm => t('networks.actions.destroy_confirm') }, class: 'btn btn-danger btn-sm' do + span.fa.fa-trash-o + + h5 + = link_to [@referential, network], class: 'preview', title: "#{Chouette::Network.model_name.human.capitalize} #{network.name}" do + span.name + = truncate(network.name, :length => 20)
\ No newline at end of file diff --git a/app/views/networks/_networks.erb b/app/views/networks/_networks.erb deleted file mode 100644 index 9d95d63b6..000000000 --- a/app/views/networks/_networks.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 @networks %> -</div> -<div class="networks paginated_content"> - <%= paginated_content(@networks) %> -</div> -<div class="pagination"> - <%= will_paginate @networks, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer %> -</div> diff --git a/app/views/networks/_networks.html.slim b/app/views/networks/_networks.html.slim new file mode 100644 index 000000000..9143e5c16 --- /dev/null +++ b/app/views/networks/_networks.html.slim @@ -0,0 +1,9 @@ +.page_info + span.search = t('will_paginate.page_entries_info.search') + = page_entries_info @networks + +.networks.paginated_content + = paginated_content(@networks) + +.pagination + = will_paginate @networks, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer
\ No newline at end of file diff --git a/app/views/networks/edit.html.erb b/app/views/networks/edit.html.erb deleted file mode 100644 index b551690d6..000000000 --- a/app/views/networks/edit.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -<%= title_tag t('networks.edit.title', :network => @network.name) %> - -<%= render "form" %> diff --git a/app/views/networks/edit.html.slim b/app/views/networks/edit.html.slim new file mode 100644 index 000000000..d4e088937 --- /dev/null +++ b/app/views/networks/edit.html.slim @@ -0,0 +1,3 @@ += title_tag t('networks.edit.title', network: @network.name) + += render 'form'
\ No newline at end of file diff --git a/app/views/networks/index.html.erb b/app/views/networks/index.html.erb deleted file mode 100644 index e093a258c..000000000 --- a/app/views/networks/index.html.erb +++ /dev/null @@ -1,26 +0,0 @@ -<%= title_tag t('networks.index.title') %> - -<%= search_form_for @q, :url => referential_networks_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="networks"><%= render 'networks' %></div> - -<% content_for :sidebar do %> -<ul class="actions"> - <li><%= link_to t('networks.actions.new'), new_referential_network_path(@referential), :class => "add" %></li> - <br> -</ul> -<% end %> diff --git a/app/views/networks/index.html.slim b/app/views/networks/index.html.slim new file mode 100644 index 000000000..f3ead931e --- /dev/null +++ b/app/views/networks/index.html.slim @@ -0,0 +1,23 @@ += title_tag t('networks.index.title') + += search_form_for @q, :url => referential_networks_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 + + / <!-- <a data-toggle="collapse" data-parent="#search" href="#advanced_search"> --> + / <!-- <i class="fa fa-plus"></i> <%= "#{t('.advanced_search')}" %> --> + / <!-- </a> --> + +#networks + = render 'networks' + +- content_for :sidebar do + ul.actions + li + = link_to t('networks.actions.new'), new_referential_network_path(@referential), class: 'add' + br
\ No newline at end of file diff --git a/app/views/networks/index.js.erb b/app/views/networks/index.js.erb deleted file mode 100644 index 43d9ce10c..000000000 --- a/app/views/networks/index.js.erb +++ /dev/null @@ -1 +0,0 @@ -$('#networks').html('<%= escape_javascript(render("networks")) %>');
\ No newline at end of file diff --git a/app/views/networks/index.js.slim b/app/views/networks/index.js.slim new file mode 100644 index 000000000..1b5581307 --- /dev/null +++ b/app/views/networks/index.js.slim @@ -0,0 +1 @@ +$('#networks').html("#{escape_javascript(render('networks'))}");
\ No newline at end of file diff --git a/app/views/networks/new.html.erb b/app/views/networks/new.html.erb deleted file mode 100644 index 749beb197..000000000 --- a/app/views/networks/new.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -<%= title_tag t('networks.new.title') %> - -<%= render "form" %> diff --git a/app/views/networks/new.html.slim b/app/views/networks/new.html.slim new file mode 100644 index 000000000..7071ded33 --- /dev/null +++ b/app/views/networks/new.html.slim @@ -0,0 +1,3 @@ += title_tag t('networks.new.title') + += render 'form'
\ No newline at end of file diff --git a/app/views/networks/show.html.erb b/app/views/networks/show.html.erb deleted file mode 100644 index d61974394..000000000 --- a/app/views/networks/show.html.erb +++ /dev/null @@ -1,49 +0,0 @@ -<%= title_tag t('networks.show.title', :network => @network.name )%> - -<div class="network_show"> - <%= @map.to_html %> - <div class="summary"> - <p> - <label><%= Chouette::Network.human_attribute_name("registration_number") %>: </label> - <%= @network.registration_number %> - </p> - <p> - <label><%= Chouette::Network.human_attribute_name("comment") %>: </label> - <%= @network.comment %> - </p> - <p> - <label><%= Chouette::Network.human_attribute_name("version_date") %>: </label> - <% if @network.version_date.present? %> - <%= l @network.version_date %> - <%end%> - </p> - <p> - <label><%= Chouette::Network.human_attribute_name("description") %>: </label> - <%= @network.description %> - </p> - <p> - <label><%= Chouette::Network.human_attribute_name("source_name") %>: </label> - <%= @network.source_name %> - </p> - <p> - <label><%= Chouette::Network.human_attribute_name("source_type_name") %>: </label> - <% if @network.source_type_name.present? %> - <%= t("source_types.label.#{@network.source_type_name}") %> - <% end %> - </p> - <p> - <label><%= Chouette::Network.human_attribute_name("source_identifier") %>: </label> - <%= @network.source_identifier %> - </p> - </div> -</div> - -<% content_for :sidebar do %> -<ul class="actions"> - <li><%= link_to t('networks.actions.new'), new_referential_network_path(@referential), :class => "add" %></li> - <li><%= link_to t('networks.actions.edit'), edit_referential_network_path(@referential, @network), :class => "edit" %></li> - <li><%= link_to t('networks.actions.destroy'), referential_network_path(@referential, @network), :method => :delete, :data => {:confirm => t('networks.actions.destroy_confirm')}, :class => "remove" %></li> - <br> -</ul> - <%= creation_tag(@network) %> -<% end %> diff --git a/app/views/networks/show.html.slim b/app/views/networks/show.html.slim new file mode 100644 index 000000000..936f6a4a8 --- /dev/null +++ b/app/views/networks/show.html.slim @@ -0,0 +1,47 @@ += title_tag t('networks.show.title', network: @network.name) + +.network_show + = @map.to_html + + .summary + p + label = "#{Chouette::Network.human_attribute_name('registration_number')} : " + = @network.registration_number + + p + label = "#{Chouette::Network.human_attribute_name('comment')} : " + = @network.comment + + p + label = "#{Chouette::Network.human_attribute_name('version_date')} : " + - if @network.version_date.present? + = l @network.version_date + + p + label = "#{Chouette::Network.human_attribute_name('description')} : " + = @network.description + + p + label = "#{Chouette::Network.human_attribute_name('source_name')} : " + = @network.source_name + + p + label = "#{Chouette::Network.human_attribute_name('source_type_name')} : " + - if @network.source_type_name.present? + = t("source_types.label.#{@network.source_type_name}") + + p + label = "#{Chouette::Network.human_attribute_name('source_identifier')} : " + = @network.source_identifier + +- content_for :sidebar do + ul.actions + li + = link_to t('networks.actions.new'), new_referential_network_path(@referential), class: 'add' + li + = link_to t('networks.actions.edit'), edit_referential_network_path(@referential, @network), class: 'edit' + li + = link_to t('networks.actions.destroy'), referential_network_path(@referential, @network), method: :delete, data: { :confirm => t('networks.actions.destroy_confirm')}, class: 'remove' + br + + = creation_tag(@network)
\ No newline at end of file diff --git a/app/views/networks/show.kml.erb b/app/views/networks/show.kml.erb deleted file mode 100644 index 34d4598fe..000000000 --- a/app/views/networks/show.kml.erb +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<kml xmlns="http://www.opengis.net/kml/2.2"> - <Document> - <% @network.commercial_stop_areas.each do |stop_area| %> - <Placemark id="<%= stop_area.id %>" > - <name><%= stop_area.name %></name> - <stop_area_type><%= stop_area.area_type.underscore %></stop_area_type> - <stop_area_type_label><%= t("area_types.label.#{stop_area.stop_area_type}") %></stop_area_type_label> - <%= (stop_area.position or stop_area.default_position).kml_representation.html_safe %> - </Placemark> - <% end %> - </Document> -</kml> - diff --git a/app/views/networks/show.kml.slim b/app/views/networks/show.kml.slim new file mode 100644 index 000000000..5fd79cd47 --- /dev/null +++ b/app/views/networks/show.kml.slim @@ -0,0 +1,10 @@ +doctype XML + +kml xmlns="http://www.opengis.net/kml/2.2" + document + - @network.commercial_stop_areas.each do |stop_area| + placemark id="#{stop_area.id}" + name = stop_area.name + stop_area_type = stop_area.area_type.underscore + stop_area_type_label = t("area_types.label.#{stop_area.stop_area_type}") + = (stop_area.position or stop_area.default_position).kml_representation.html_safe
\ No newline at end of file |
