aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpl2016-08-03 16:44:19 +0200
committerjpl2016-08-03 16:44:19 +0200
commit420c571c4798fe41376a7a7b758a0d4d0efca8c0 (patch)
tree5bac6056d2dc49ff91422ba63f14003b72db4b55
parentcc3d149d794444fe4c504234563b32c12652d8a7 (diff)
downloadchouette-core-420c571c4798fe41376a7a7b758a0d4d0efca8c0.tar.bz2
Refs #1295: convert erb to slim (rule_parameter_sets)
-rw-r--r--app/views/rule_parameter_sets/_column_fields.html.erb11
-rw-r--r--app/views/rule_parameter_sets/_column_fields.html.slim13
-rw-r--r--app/views/rule_parameter_sets/_form.html.erb84
-rw-r--r--app/views/rule_parameter_sets/_form.html.slim72
-rw-r--r--app/views/rule_parameter_sets/_mode_fields.html.erb12
-rw-r--r--app/views/rule_parameter_sets/_mode_fields.html.slim9
-rw-r--r--app/views/rule_parameter_sets/_mode_selection.html.erb6
-rw-r--r--app/views/rule_parameter_sets/_mode_selection.html.slim4
-rw-r--r--app/views/rule_parameter_sets/_rule_parameter_set.html.erb23
-rw-r--r--app/views/rule_parameter_sets/_rule_parameter_set.html.slim14
-rw-r--r--app/views/rule_parameter_sets/_transport_mode_parameter_set_fields.html.erb10
-rw-r--r--app/views/rule_parameter_sets/_transport_mode_parameter_set_fields.html.slim9
-rw-r--r--app/views/rule_parameter_sets/edit.html.erb4
-rw-r--r--app/views/rule_parameter_sets/edit.html.slim3
-rw-r--r--app/views/rule_parameter_sets/index.html.erb9
-rw-r--r--app/views/rule_parameter_sets/index.html.slim7
-rw-r--r--app/views/rule_parameter_sets/mode.js.erb13
-rw-r--r--app/views/rule_parameter_sets/mode.js.slim10
-rw-r--r--app/views/rule_parameter_sets/new.html.erb4
-rw-r--r--app/views/rule_parameter_sets/new.html.slim3
-rw-r--r--app/views/rule_parameter_sets/show.html.erb174
-rw-r--r--app/views/rule_parameter_sets/show.html.slim143
22 files changed, 287 insertions, 350 deletions
diff --git a/app/views/rule_parameter_sets/_column_fields.html.erb b/app/views/rule_parameter_sets/_column_fields.html.erb
deleted file mode 100644
index 0a9c70f96..000000000
--- a/app/views/rule_parameter_sets/_column_fields.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
- <td></td>
- <td><%= t("activerecord.attributes.#{object_name}.#{column}") %></td>
- <% suffix = "column_#{column}_object_#{object_name}"%>
- <td> <%= f.check_box "unique_#{suffix}".to_sym, :class => "special" %></td>
- <% if RuleParameterSet.validable_column_type(object_name, column) == :string %>
- <td><%= f.select "pattern_#{suffix}".to_sym, options_for_select([[t("rule_parameter_sets.labels.free_char"), "0"], [t("rule_parameter_sets.labels.num_char"), "1"], [t("rule_parameter_sets.labels.alpha_char"), "2"], [t("rule_parameter_sets.labels.upper_char"), "3"], [t("rule_parameter_sets.labels.lower_char"), "4"]]) %></td>
- <% else %>
- <td><%= t "rule_parameter_sets.labels.num_char" %></td>
- <% end %>
- <td><%= f.number_field "min_size_#{suffix}".to_sym, :class => "special" %></td>
- <td><%= f.number_field "max_size_#{suffix}".to_sym, :class => "special" %></td>
diff --git a/app/views/rule_parameter_sets/_column_fields.html.slim b/app/views/rule_parameter_sets/_column_fields.html.slim
new file mode 100644
index 000000000..176318765
--- /dev/null
+++ b/app/views/rule_parameter_sets/_column_fields.html.slim
@@ -0,0 +1,13 @@
+td
+td = t("activerecord.attributes.#{object_name}.#{column}")
+- suffix = "column_#{column}_object_#{object_name}"
+td = f.check_box "unique_#{suffix}".to_sym, class: 'special'
+
+- if RuleParameterSet.validable_column_type(object_name, column) == :string
+ td
+ = f.select "pattern_#{suffix}".to_sym, options_for_select([[t("rule_parameter_sets.labels.free_char"), "0"], [t("rule_parameter_sets.labels.num_char"), "1"], [t("rule_parameter_sets.labels.alpha_char"), "2"], [t("rule_parameter_sets.labels.upper_char"), "3"], [t("rule_parameter_sets.labels.lower_char"), "4"]])
+- else
+ td = t('rule_parameter_sets.labels.num_char')
+
+td = f.number_field "min_size_#{suffix}".to_sym, class: 'special'
+td = f.number_field "max_size_#{suffix}".to_sym, class: 'special'
diff --git a/app/views/rule_parameter_sets/_form.html.erb b/app/views/rule_parameter_sets/_form.html.erb
deleted file mode 100644
index 95316a42f..000000000
--- a/app/views/rule_parameter_sets/_form.html.erb
+++ /dev/null
@@ -1,84 +0,0 @@
-<%= semantic_form_for [ :organisation, @rule_parameter_set] do |form| %>
- <%= form.inputs do %>
- <%= form.input :name %>
- <%= form.input :inter_stop_area_distance_min, :as => :number %>
- <%= form.input :parent_stop_area_distance_max, :as => :number %>
- <%= form.input :stop_areas_area %>
- <%= form.input :inter_access_point_distance_min, :as => :number %>
- <%= form.input :inter_connection_link_distance_max, :as => :number %>
- <%= form.input :walk_default_speed_max, :as => :number %>
- <%= form.input :walk_occasional_traveller_speed_max, :as => :number %>
- <%= form.input :walk_frequent_traveller_speed_max, :as => :number %>
- <%= form.input :walk_mobility_restricted_traveller_speed_max, :as => :number %>
-
- <%= form.input :inter_access_link_distance_max, :as => :number %>
- <%= form.input :inter_stop_duration_max, :as => :number %>
- <%= form.input :facility_stop_area_distance_max, :as => :number %>
-
- <%= form.input :check_lines_in_groups, :as => :boolean %>
- <%= form.input :check_line_routes, :as => :boolean %>
- <%= form.input :check_stop_parent, :as => :boolean %>
- <%= form.input :check_connection_link_on_physical, :as => :boolean %>
- <%= form.input :check_allowed_transport_modes, :as => :boolean %>
-
- <table class="table table-striped table-condensed">
- <thead>
- <tr>
- <th><%= t("transport_modes.name") %></th>
- <% RuleParameterSet.mode_attribute_prefixes.each do |prefix| %>
- <% if prefix == "allowed_transport" %>
- <% hidden = (@rule_parameter_set.check_allowed_transport_modes == "1") ? "" : 'display:none;'%>
- <th class="allowed" style="<%= hidden %>" ><%= RuleParameterSet.human_attribute_name(prefix) %></th>
- <% else %>
- <th><%= RuleParameterSet.human_attribute_name(prefix) %></th>
- <% end %>
- <% end %>
- </tr>
- </thead>
- <tbody>
- <% Chouette::Line.transport_modes.map(&:to_s).each do |mode| %>
- <tr>
- <%= render :partial => "mode_fields", :locals => { :f => form, :mode => mode} %>
- </tr>
- <% end %>
- </tbody>
- </table>
-
- <%= t("rule_parameter_sets.labels.columns_restrictions") %>
- <table class="table table-bordered table-condensed">
- <% RuleParameterSet.validable_object_names.each do |object_name| %>
- <thead>
- <tr>
- <th><%= form.check_box "check_#{object_name}".to_sym, :class => "special" %> <%= t("activerecord.models.#{object_name}.one") %></th>
- <th><%= RuleParameterSet.human_attribute_name("attribute") %></th>
- <th><%= RuleParameterSet.human_attribute_name("unique") %></th>
- <th><%= RuleParameterSet.human_attribute_name("string_type") %></th>
- <th><%= RuleParameterSet.human_attribute_name("min_size") %></th>
- <th><%= RuleParameterSet.human_attribute_name("max_size") %></th>
- </tr>
- </thead>
- <tbody>
- <% RuleParameterSet.validable_columns[object_name].each do |col| %>
- <tr class="<%= "columns_for_#{object_name.pluralize}" %>">
- <%= render :partial => "column_fields", :locals => { :f => form, :object_name => object_name, :column => col} %>
- </tr>
- <% end %>
- </tbody>
- <% end %>
- </table>
-
- <% end %>
-
- <%= form.actions do %>
- <%= form.action :submit, :as => :button %>
- <%= form.action :cancel, :as => :link %>
- <% end %>
-<% end %>
-
-<script>
- $(function() {
- $( "#rule_parameter_set_check_allowed_transport_modes").change( function(){
- $(".allowed").toggle();
- });
- });
-</script>
diff --git a/app/views/rule_parameter_sets/_form.html.slim b/app/views/rule_parameter_sets/_form.html.slim
new file mode 100644
index 000000000..74ad9ae3b
--- /dev/null
+++ b/app/views/rule_parameter_sets/_form.html.slim
@@ -0,0 +1,72 @@
+= semantic_form_for [ :organisation, @rule_parameter_set] do |form|
+ = form.inputs do
+ = form.input :name
+ = form.input :inter_stop_area_distance_min, as: :number
+ = form.input :parent_stop_area_distance_max, as: :number
+ = form.input :stop_areas_area
+ = form.input :inter_access_point_distance_min, as: :number
+ = form.input :inter_connection_link_distance_max, as: :number
+ = form.input :walk_default_speed_max, as: :number
+ = form.input :walk_occasional_traveller_speed_max, as: :number
+ = form.input :walk_frequent_traveller_speed_max, as: :number
+ = form.input :walk_mobility_restricted_traveller_speed_max, as: :number
+
+ = form.input :inter_access_link_distance_max, as: :number
+ = form.input :inter_stop_duration_max, as: :number
+ = form.input :facility_stop_area_distance_max, as: :number
+
+ = form.input :check_lines_in_groups, as: :boolean
+ = form.input :check_line_routes, as: :boolean
+ = form.input :check_stop_parent, as: :boolean
+ = form.input :check_connection_link_on_physical, as: :boolean
+ = form.input :check_allowed_transport_modes, as: :boolean
+
+ table.table.table-striped.table-condensed
+ thead
+ tr
+ th = t("transport_modes.name")
+
+ - RuleParameterSet.mode_attribute_prefixes.each do |prefix|
+ - if prefix == "allowed_transport"
+ - hidden = (@rule_parameter_set.check_allowed_transport_modes == "1") ? "" : 'display:none;'
+ th.allowed style="#{hidden}"
+ = RuleParameterSet.human_attribute_name(prefix)
+ - else
+ th = RuleParameterSet.human_attribute_name(prefix)
+
+ tbody
+ - Chouette::Line.transport_modes.map(&:to_s).each do |mode|
+ tr
+ == render partial: "mode_fields", :locals => { f: form, mode: mode }
+
+ = t("rule_parameter_sets.labels.columns_restrictions")
+
+ table.table.table-bordered.table-condensed
+ - RuleParameterSet.validable_object_names.each do |object_name|
+ thead
+ tr
+ th
+ = form.check_box "check_#{object_name}".to_sym, class: 'special'
+ = t("activerecord.models.#{object_name}.one")
+
+ th = RuleParameterSet.human_attribute_name("attribute")
+ th = RuleParameterSet.human_attribute_name("unique")
+ th = RuleParameterSet.human_attribute_name("string_type")
+ th = RuleParameterSet.human_attribute_name("min_size")
+ th = RuleParameterSet.human_attribute_name("max_size")
+
+ tbody
+ - RuleParameterSet.validable_columns[object_name].each do |col|
+ tr class="columns_for_#{object_name.pluralize}"
+ == render partial: "column_fields", :locals => { f: form, object_name: object_name, column: col }
+
+ = form.actions do
+ = form.action :submit, as: :button
+ = form.action :cancel, as: :link
+
+javascript:
+ $(function() {
+ $( "#rule_parameter_set_check_allowed_transport_modes").change( function() {
+ $(".allowed").toggle();
+ });
+ }); \ No newline at end of file
diff --git a/app/views/rule_parameter_sets/_mode_fields.html.erb b/app/views/rule_parameter_sets/_mode_fields.html.erb
deleted file mode 100644
index a305c4d0a..000000000
--- a/app/views/rule_parameter_sets/_mode_fields.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
- <td><%= t("transport_modes.label.#{mode}") %></td>
- <% RuleParameterSet.mode_attribute_prefixes.each do |prefix| %>
- <% if prefix == "allowed_transport" %>
- <% hidden = (@rule_parameter_set.check_allowed_transport_modes == "1") ? "" : 'display: none;'%>
- <td class="allowed" style="<%= hidden %>" >
- <%= f.check_box "#{prefix}_mode_#{mode}".to_sym, :class => "special" %>
- <% else%>
- <td>
- <%= f.number_field "#{prefix}_mode_#{mode}".to_sym, :class => "special" %>
- <% end %>
- </td>
- <% end %>
diff --git a/app/views/rule_parameter_sets/_mode_fields.html.slim b/app/views/rule_parameter_sets/_mode_fields.html.slim
new file mode 100644
index 000000000..848e065f3
--- /dev/null
+++ b/app/views/rule_parameter_sets/_mode_fields.html.slim
@@ -0,0 +1,9 @@
+td = t("transport_modes.label.#{mode}")
+
+- RuleParameterSet.mode_attribute_prefixes.each do |prefix|
+ - if prefix == "allowed_transport"
+ - hidden = (@rule_parameter_set.check_allowed_transport_modes == "1") ? "" : 'display: none;'
+ td.allowed style="#{hidden}"
+ = f.check_box "#{prefix}_mode_#{mode}".to_sym, class: 'special'
+ - else
+ td = f.number_field "#{prefix}_mode_#{mode}".to_sym, class: 'special' \ No newline at end of file
diff --git a/app/views/rule_parameter_sets/_mode_selection.html.erb b/app/views/rule_parameter_sets/_mode_selection.html.erb
deleted file mode 100644
index 56d1c05bb..000000000
--- a/app/views/rule_parameter_sets/_mode_selection.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<select class="undescribed_modes">
- <% Chouette::TransportMode.all.map { |m| m.name.downcase}.each do |mode| %>
- <option value='<%= mode %>'><%= t("transport_modes.label.#{mode}") %></option>
- <% end %>
-</select>
-
diff --git a/app/views/rule_parameter_sets/_mode_selection.html.slim b/app/views/rule_parameter_sets/_mode_selection.html.slim
new file mode 100644
index 000000000..a2a8a16e5
--- /dev/null
+++ b/app/views/rule_parameter_sets/_mode_selection.html.slim
@@ -0,0 +1,4 @@
+select.undescribed_modes
+ - Chouette::TransportMode.all.map { |m| m.name.downcase}.each do |mode|
+ option value="#{mode}"
+ = t("transport_modes.label.#{mode}") \ No newline at end of file
diff --git a/app/views/rule_parameter_sets/_rule_parameter_set.html.erb b/app/views/rule_parameter_sets/_rule_parameter_set.html.erb
deleted file mode 100644
index 257b8e145..000000000
--- a/app/views/rule_parameter_sets/_rule_parameter_set.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<div id="index_item" class="panel panel-default rule_parameter_set">
- <div class="panel-heading">
- <div class="panel-title clearfix">
- <span class="pull-right">
- <%= link_to edit_organisation_rule_parameter_set_path( rule_parameter_set), :class => "btn btn-default btn-sm" do %>
- <span class="fa fa-pencil"></span>
- <% end %>
- <% if rule_parameter_set.organisation.rule_parameter_sets.size > 1 %>
- <%= link_to organisation_rule_parameter_set_path( rule_parameter_set), :method => :delete, :data => {:confirm => t('rule_parameter_sets.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %>
- <span class="fa fa-trash-o"></span>
- <% end %>
- <% end %>
- </span>
- <h5>
- <%= link_to( organisation_rule_parameter_set_path( rule_parameter_set), :class => "preview", :title => "#{RuleParameterSet.model_name.human.capitalize} #{rule_parameter_set.name}") do %>
- <span class="name">
- <%= truncate(rule_parameter_set.name, :length => 20) %>
- </span>
- <% end %>
- </h5>
- </div>
- </div>
-</div>
diff --git a/app/views/rule_parameter_sets/_rule_parameter_set.html.slim b/app/views/rule_parameter_sets/_rule_parameter_set.html.slim
new file mode 100644
index 000000000..5603d2b80
--- /dev/null
+++ b/app/views/rule_parameter_sets/_rule_parameter_set.html.slim
@@ -0,0 +1,14 @@
+#index_item.panel.panel-default.rule_parameter_set
+ .panel-heading
+ .panel-title.clearfix
+ span.pull-right
+ = link_to edit_organisation_rule_parameter_set_path( rule_parameter_set), class: 'btn btn-default btn-sm' do
+ span.fa.fa-pencil
+
+ - if rule_parameter_set.organisation.rule_parameter_sets.size > 1
+ = link_to organisation_rule_parameter_set_path( rule_parameter_set), method: :delete, data: { confirm: t('rule_parameter_sets.actions.destroy_confirm') }, class: 'btn btn-danger btn-sm' do
+ span.fa.fa-trash-o
+
+ h5
+ = link_to( organisation_rule_parameter_set_path( rule_parameter_set), class: 'preview', title: "#{RuleParameterSet.model_name.human.capitalize} #{rule_parameter_set.name}") do
+ span.name = truncate(rule_parameter_set.name, length: 20) \ No newline at end of file
diff --git a/app/views/rule_parameter_sets/_transport_mode_parameter_set_fields.html.erb b/app/views/rule_parameter_sets/_transport_mode_parameter_set_fields.html.erb
deleted file mode 100644
index 3d2bcd3d2..000000000
--- a/app/views/rule_parameter_sets/_transport_mode_parameter_set_fields.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<%= f.inputs :class => 'transport_mode_parameter_sets nested-fields' do %>
- <%= f.input :transport_mode, :as => :select, :collection => Chouette::TransportMode.all, :include_blank => false, :member_label => Proc.new { |mode| t("transport_modes.label.#{mode}") }, :label => "transport_mode", :wrapper_html => { :class => 'fl1' } %>
- <%= f.input :inter_stop_area_distance_min, :as => :number, :label => "inter_stop_area_distance_min", :wrapper_html => { :class => 'fl1' } %>
- <%= f.input :inter_stop_area_distance_max, :as => :number, :label => "inter_stop_area_distance_max", :wrapper_html => { :class => 'fl2' } %>
- <%= f.input :speed_min, :as => :number, :label => "speed_min", :wrapper_html => { :class => 'fl2' } %>
- <%= f.input :speed_max, :as => :number, :label => "speed_max", :wrapper_html => { :class => 'fl2' } %>
- <%= f.input :inter_stop_duration_variation_max, :as => :number, :label => "inter_stop_duration_variation_max", :wrapper_html => { :class => 'fl2' } %>
- <%= link_to_remove_association t('actions.destroy'), f %>
-<% end %>
-
diff --git a/app/views/rule_parameter_sets/_transport_mode_parameter_set_fields.html.slim b/app/views/rule_parameter_sets/_transport_mode_parameter_set_fields.html.slim
new file mode 100644
index 000000000..a60c966e2
--- /dev/null
+++ b/app/views/rule_parameter_sets/_transport_mode_parameter_set_fields.html.slim
@@ -0,0 +1,9 @@
+= f.inputs class: 'transport_mode_parameter_sets nested-fields' do
+ = f.input :transport_mode, as: :select, :collection => Chouette::TransportMode.all, include_blank: false, member_label: Proc.new { |mode| t("transport_modes.label.#{mode}") }, label: "transport_mode", wrapper_html: { class: 'fl1' }
+ = f.input :inter_stop_area_distance_min, as: :number, label: "inter_stop_area_distance_min", wrapper_html: { class: 'fl1' }
+ = f.input :inter_stop_area_distance_max, as: :number, label: "inter_stop_area_distance_max", wrapper_html: { class: 'fl2' }
+ = f.input :speed_min, as: :number, label: "speed_min", wrapper_html: { class: 'fl2' }
+ = f.input :speed_max, as: :number, label: "speed_max", wrapper_html: { class: 'fl2' }
+ = f.input :inter_stop_duration_variation_max, as: :number, label: "inter_stop_duration_variation_max", wrapper_html: { class: 'fl2' }
+
+ = link_to_remove_association t('actions.destroy'), f \ No newline at end of file
diff --git a/app/views/rule_parameter_sets/edit.html.erb b/app/views/rule_parameter_sets/edit.html.erb
deleted file mode 100644
index eb2ca466f..000000000
--- a/app/views/rule_parameter_sets/edit.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= title_tag t('rule_parameter_sets.edit.title', :rule_parameter_set => @rule_parameter_set.name ) %>
-
-<%= render "form" %>
-
diff --git a/app/views/rule_parameter_sets/edit.html.slim b/app/views/rule_parameter_sets/edit.html.slim
new file mode 100644
index 000000000..b49b02cf6
--- /dev/null
+++ b/app/views/rule_parameter_sets/edit.html.slim
@@ -0,0 +1,3 @@
+= title_tag t('rule_parameter_sets.edit.title', rule_parameter_set: @rule_parameter_set.name )
+
+== render 'form' \ No newline at end of file
diff --git a/app/views/rule_parameter_sets/index.html.erb b/app/views/rule_parameter_sets/index.html.erb
deleted file mode 100644
index 0d091829a..000000000
--- a/app/views/rule_parameter_sets/index.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<%= title_tag t('rule_parameter_sets.index.title') %>
-
-<%= paginated_content(@rule_parameter_sets) %>
-
-<% content_for :sidebar do %>
-<ul class="actions">
- <li><%= link_to t('rule_parameter_sets.actions.new'), new_organisation_rule_parameter_set_path, :class => "add" %></li>
-</ul>
-<% end %>
diff --git a/app/views/rule_parameter_sets/index.html.slim b/app/views/rule_parameter_sets/index.html.slim
new file mode 100644
index 000000000..6be57d68e
--- /dev/null
+++ b/app/views/rule_parameter_sets/index.html.slim
@@ -0,0 +1,7 @@
+= title_tag t('rule_parameter_sets.index.title')
+
+= paginated_content(@rule_parameter_sets)
+
+- content_for :sidebar do
+ ul.actions
+ li = link_to t('rule_parameter_sets.actions.new'), new_organisation_rule_parameter_set_path, class: 'add' \ No newline at end of file
diff --git a/app/views/rule_parameter_sets/mode.js.erb b/app/views/rule_parameter_sets/mode.js.erb
deleted file mode 100644
index 22b70830e..000000000
--- a/app/views/rule_parameter_sets/mode.js.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-if ( $('#specific_parameters_<%= @mode %>').length == 0) {
- <% form_content = "" %>
- <% semantic_form_for [@referential, @rule_parameter_set] do |form| %>
- <% form_content += render(:partial => 'mode_fields', :locals => { :mode => @mode, :f => form }) %>
- <% end %>
- $('#added_mode_parameter_set').before('<%= escape_javascript( form_content).html_safe %>');
-}
-else {
- $('#_destroy_mode_<%= @mode %>').attr( "value", false);
- $('#specific_parameters_<%= @mode %>').toggle();
-}
-
-
diff --git a/app/views/rule_parameter_sets/mode.js.slim b/app/views/rule_parameter_sets/mode.js.slim
new file mode 100644
index 000000000..313599aff
--- /dev/null
+++ b/app/views/rule_parameter_sets/mode.js.slim
@@ -0,0 +1,10 @@
+if ( $("#specific_parameters_#{@mode}").length == 0 ) {
+ - form_content = ""
+ - semantic_form_for [@referential, @rule_parameter_set] do |form|
+ - form_content += render(partial: 'mode_fields', locals: { mode: @mode, f: form })
+
+ $('#added_mode_parameter_set').before("#{escape_javascript(form_content).html_safe}");
+} else {
+ $("#_destroy_mode_#{@mode}").attr( "value", false);
+ $("#specific_parameters_#{@mode}").toggle();
+} \ No newline at end of file
diff --git a/app/views/rule_parameter_sets/new.html.erb b/app/views/rule_parameter_sets/new.html.erb
deleted file mode 100644
index 228a2da7a..000000000
--- a/app/views/rule_parameter_sets/new.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= title_tag t('rule_parameter_sets.new.title') %>
-
-<%= render "form" %>
-
diff --git a/app/views/rule_parameter_sets/new.html.slim b/app/views/rule_parameter_sets/new.html.slim
new file mode 100644
index 000000000..c4e4c5b4d
--- /dev/null
+++ b/app/views/rule_parameter_sets/new.html.slim
@@ -0,0 +1,3 @@
+= title_tag t('rule_parameter_sets.new.title')
+
+== render 'form' \ No newline at end of file
diff --git a/app/views/rule_parameter_sets/show.html.erb b/app/views/rule_parameter_sets/show.html.erb
deleted file mode 100644
index 626fb295c..000000000
--- a/app/views/rule_parameter_sets/show.html.erb
+++ /dev/null
@@ -1,174 +0,0 @@
-<%= title_tag t('rule_parameter_sets.show.title', :rule_parameter_set => @rule_parameter_set.name ) %>
-
-<div class="rule_parameter_set_show">
-
- <div class="summary">
- <p>
- <label><%= RuleParameterSet.human_attribute_name("stop_areas_area") %>: </label>
- <%= @rule_parameter_set.stop_areas_area %>
- </p>
- <div class="attributes_group" >
- <span class="title"><%= t(".min_distance") %></span>
- <div class="columns">
- <div class="two_columns">
- <label><%= t(".inter_stop_area_distance_min") %> : </label>
- <span class="value"><%= @rule_parameter_set.inter_stop_area_distance_min %></span>
- </div>
- <div class="two_columns">
- <label><%= t(".inter_access_point_distance_min") %> : </label>
- <span class="value"><%= @rule_parameter_set.inter_access_point_distance_min %></span>
- </div>
- </div>
- </div>
- <div class="attributes_group" >
- <span class="title"><%= t(".max_distance") %></span>
- <div class="columns">
- <div class="two_columns">
- <label><%= t(".parent_stop_area_distance_max") %>: </label>
- <span class="value"><%= @rule_parameter_set.parent_stop_area_distance_max %></span>
- </div>
- <div class="two_columns">
- <label><%= t(".inter_connection_link_distance_max") %>: </label>
- <span class="value"><%= @rule_parameter_set.inter_connection_link_distance_max %></span>
- </div>
- </div>
- <div class="columns">
- <div class="two_columns">
- <label><%= t(".inter_access_link_distance_max") %>: </label>
- <span class="value"><%= @rule_parameter_set.inter_access_link_distance_max %></span>
- </div>
- <div class="two_columns">
- <label><%= t(".facility_stop_area_distance_max") %>: </label>
- <span class="value"><%= @rule_parameter_set.facility_stop_area_distance_max %></span>
- </div>
- </div>
- </div>
- <div class="attributes_group" >
- <span class="title"><%= t(".walk_speed") %></span>
- <div class="columns">
- <div class="four_columns">
- <label><%= t(".walk_default_speed_max") %>: </label>
- <span class="value"><%= @rule_parameter_set.walk_default_speed_max %></span>
- </div>
- <div class="four_columns">
- <label><%= t(".walk_occasional_traveller_speed_max") %>: </label>
- <span class="value"><%= @rule_parameter_set.walk_occasional_traveller_speed_max %></span>
- </div>
- <div class="four_columns">
- <label><%= t(".walk_frequent_traveller_speed_max") %>: </label>
- <span class="value"><%= @rule_parameter_set.walk_frequent_traveller_speed_max %></span>
- </div>
- <div class="four_columns">
- <label><%= t(".walk_mobility_restricted_traveller_speed_max") %>: </label>
- <span class="value"><%= @rule_parameter_set.walk_mobility_restricted_traveller_speed_max %></span>
- </div>
- </div>
- </div>
- <p>
- <label><%= t(".inter_stop_duration_max") %>: </label>
- <%= @rule_parameter_set.inter_stop_duration_max %>
- </p>
-
- <p>
- <label><%= RuleParameterSet.human_attribute_name("check_lines_in_groups") %>: </label>
- <%= boolean_value(@rule_parameter_set.check_lines_in_groups)%>
- </p>
-
- <p>
- <label><%= RuleParameterSet.human_attribute_name("check_line_routes") %>: </label>
- <%= boolean_value(@rule_parameter_set.check_line_routes) %>
- </p>
-
- <p>
- <label><%= RuleParameterSet.human_attribute_name("check_stop_parent") %>: </label>
- <%= boolean_value(@rule_parameter_set.check_stop_parent) %>
- </p>
-
- <p>
- <label><%= RuleParameterSet.human_attribute_name("check_connection_link_on_physical") %>: </label>
- <%= boolean_value(@rule_parameter_set.check_connection_link_on_physical) %>
- </p>
-
- </p>
- <label><%= RuleParameterSet.human_attribute_name("check_allowed_transport_modes") %>: </label>
- <%= boolean_value(@rule_parameter_set.check_allowed_transport_modes) %>
- </p>
-
-
-<div class="rule_parameter_by_mode">
- <label><%= t(".rule_parameter_by_mode") %>
- <%= t(".modes_allowed") if @rule_parameter_set.check_allowed_transport_modes == "1" %>
- </label>
- <table class="table table-striped table-condensed">
- <tr>
- <th><%= t("transport_modes.name") %></th>
- <% RuleParameterSet.mode_attribute_prefixes.each do |prefix| %>
- <% unless prefix == "allowed_transport" %>
- <th><%= RuleParameterSet.human_attribute_name(prefix) %></th>
- <% end %>
- <% end %>
- </tr>
-
- <% Chouette::Line.transport_modes.map(&:to_s).each do |mode| %>
- <% if @rule_parameter_set.allowed(mode) %>
- <tr>
- <td><%= t("transport_modes.label.#{mode}") %></td>
- <% RuleParameterSet.mode_attribute_prefixes.each do |prefix| %>
-
- <% unless prefix == "allowed_transport" %>
- <td><%= @rule_parameter_set.send "#{prefix}_mode_#{mode}" %></td>
- <% end %>
- <% end %>
- </tr>
- <% end %>
- <% end %>
- </table>
- </div>
- <div class="rule_parameter_by_object">
- <label><%= t("rule_parameter_sets.labels.columns_restrictions") %> </label>
- <table class="table table-bordered table-condensed">
- <% RuleParameterSet.validable_object_names.each do |object_name| %>
- <% if @rule_parameter_set.selected(object_name) %>
- <thead>
- <tr>
- <th> <%= t("activerecord.models.#{object_name}.one") %></th>
- <th><%= RuleParameterSet.human_attribute_name("attribute") %></th>
- <th><%= RuleParameterSet.human_attribute_name("unique") %></th>
- <th><%= RuleParameterSet.human_attribute_name("string_type") %></th>
- <th><%= RuleParameterSet.human_attribute_name("min_size") %></th>
- <th><%= RuleParameterSet.human_attribute_name("max_size") %></th>
- </tr>
- </thead>
- <tbody>
- <% RuleParameterSet.validable_columns[object_name].each do |col| %>
- <% if @rule_parameter_set.selected_column(object_name,col)%>
- <tr>
- <td></td>
- <td><%= t("activerecord.attributes.#{object_name}.#{col}") %></td>
- <% suffix = "column_#{col}_object_#{object_name}"%>
- <td><%= unique(@rule_parameter_set.send "unique_#{suffix}".to_sym) %></td>
- <td><%= pattern(@rule_parameter_set.send "pattern_#{suffix}".to_sym) %></td>
- <td><%= @rule_parameter_set.send "min_size_#{suffix}".to_sym %></td>
- <td><%= @rule_parameter_set.send "max_size_#{suffix}".to_sym %></td>
- </tr>
- <% end %>
- <% end %>
- </tbody>
- <% end %>
- <% end %>
- </table>
- </div>
- </div>
-</div>
-
-<% content_for :sidebar do %>
-<ul class="actions">
- <li><%= link_to t('rule_parameter_sets.actions.new'), new_organisation_rule_parameter_set_path, :class => "add" %></li>
- <% if @rule_parameter_set.persisted? %>
- <li><%= link_to t('rule_parameter_sets.actions.edit'), edit_organisation_rule_parameter_set_path( @rule_parameter_set), :class => "edit" %></li>
- <% if current_organisation.rule_parameter_sets.size > 1 %>
- <li><%= link_to t('rule_parameter_sets.actions.destroy'), organisation_rule_parameter_set_path( @rule_parameter_set), :method => :delete, :data => {:confirm => t('rule_parameter_sets.actions.destroy_confirm')}, :class => "remove" %></li>
- <% end %>
- <% end %>
-</ul>
-<% end %>
diff --git a/app/views/rule_parameter_sets/show.html.slim b/app/views/rule_parameter_sets/show.html.slim
new file mode 100644
index 000000000..2d54f4572
--- /dev/null
+++ b/app/views/rule_parameter_sets/show.html.slim
@@ -0,0 +1,143 @@
+= title_tag t('rule_parameter_sets.show.title', :rule_parameter_set => @rule_parameter_set.name )
+
+.rule_parameter_set_show
+ .summary
+ p
+ label = "#{RuleParameterSet.human_attribute_name('stop_areas_area')} : "
+ = @rule_parameter_set.stop_areas_area
+
+ .attributes_group
+ span.title = t(".min_distance")
+
+ .columns
+ .two_columns
+ label = "#{t('.inter_stop_area_distance_min')} : "
+ span.value = @rule_parameter_set.inter_stop_area_distance_min
+
+ .two_columns
+ label = "#{t('.inter_access_point_distance_min')} : "
+ span.value = @rule_parameter_set.inter_access_point_distance_min
+
+ .attributes_group
+ span.title = t(".max_distance")
+
+ .columns
+ .two_columns
+ label = "#{t('.parent_stop_area_distance_max')} : "
+ span.value = @rule_parameter_set.parent_stop_area_distance_max
+
+ .two_columns
+ label = "#{t('.inter_connection_link_distance_max')} : "
+ span.value = @rule_parameter_set.inter_connecion_link_distance_max
+
+ .columns
+ .two_columns
+ label = "#{t('.inter_access_link_distance_max')} : "
+ span.value = @rule_parameter_set.inter_access_link_distance_max
+
+ .two_columns
+ label = "#{t('.facility_stop_area_distance_max')} : "
+ span.value = @rule_parameter_set.facility_stop_area_distance_max
+
+ .attributes_group
+ span.title = t(".walk_speed")
+
+ .columns
+ .four_columns
+ label = "#{t('.walk_default_speed_max')} : "
+ span.value = @rule_parameter_set.walk_default_speed_max
+
+ .four_columns
+ label = "#{t('.walk_occasional_traveller_speed_max')} : "
+ span.value = @rule_parameter_set.walk_occasional_traveller_speed_max
+
+ .four_columns
+ label = "#{t('.walk_frequent_traveller_speed_max')} : "
+ span.value = @rule_parameter_set.walk_frequent_traveller_speed_max
+
+ .four_columns
+ label = "#{t('.walk_mobility_restricted_traveller_speed_max')} : "
+ span.value = @rule_parameter_set.walk_mobility_restricted_traveller_speed_max
+
+ p
+ label = "#{t('.inter_stop_duration_max')} :"
+ = @rule_parameter_set.inter_stop_duration_max
+
+ p
+ label = "#{RuleParameterSet.human_attribute_name('check_lines_in_groups')} : "
+ = boolean_value(@rule_parameter_set.check_lines_in_groups)
+
+ p
+ label = "#{RuleParameterSet.human_attribute_name('check_line_routes')} : "
+ = boolean_value(@rule_parameter_set.check_line_routes)
+
+ p
+ label = "#{RuleParameterSet.human_attribute_name('check_stop_parent')} : "
+ = boolean_value(@rule_parameter_set.check_stop_parent)
+
+ p
+ label = "#{RuleParameterSet.human_attribute_name('check_connection_link_on_physical')} : "
+ = boolean_value(@rule_parameter_set.check_connection_link_on_physical)
+
+ p
+ label = "#{RuleParameterSet.human_attribute_name('check_allowed_transport_modes')} : "
+ = boolean_value(@rule_parameter_set.check_allowed_transport_modes)
+
+ .rule_parameter_by_mode
+ label
+ = t(".rule_parameter_by_mode")
+ = t(".modes_allowed") if @rule_parameter_set.check_allowed_transport_modes == "1"
+
+ table.table.table-striped.table-condensed
+ tr
+ th = t("transport_modes.name")
+
+ - RuleParameterSet.mode_attribute_prefixes.each do |prefix|
+ - unless prefix == "allowed_transport"
+ th = RuleParameterSet.human_attribute_name(prefix)
+
+ - Chouette::Line.transport_modes.map(&:to_s).each do |mode|
+ - if @rule_parameter_set.allowed(mode)
+ tr
+ td = t("transport_modes.label.#{mode}")
+
+ - RuleParameterSet.mode_attribute_prefixes.each do |prefix|
+ - unless prefix == "allowed_transport"
+ td = @rule_parameter_set.send "#{prefix}_mode_#{mode}"
+
+ .rule_parameter_by_object
+ label = t("rule_parameter_sets.labels.columns_restrictions")
+
+ table.table.table-bordered.table-condensed
+ - RuleParameterSet.validable_object_names.each do |object_name|
+ - if @rule_parameter_set.selected(object_name)
+ thead
+ tr
+ th = t("activerecord.models.#{object_name}.one")
+ th = RuleParameterSet.human_attribute_name("attribute")
+ th = RuleParameterSet.human_attribute_name("unique")
+ th = RuleParameterSet.human_attribute_name("string_type")
+ th = RuleParameterSet.human_attribute_name("min_size")
+ th = RuleParameterSet.human_attribute_name("max_size")
+
+ tbody
+ - RuleParameterSet.validable_columns[object_name].each do |col|
+ - if @rule_parameter_set.selected_column(object_name,col)
+ tr
+ td
+ td = t("activerecord.attributes.#{object_name}.#{col}")
+ - suffix = "column_#{col}_object_#{object_name}"
+ td = unique(@rule_parameter_set.send "unique_#{suffix}".to_sym)
+ td = pattern(@rule_parameter_set.send "pattern_#{suffix}".to_sym)
+ td = @rule_parameter_set.send "min_size_#{suffix}".to_sym
+ td = @rule_parameter_set.send "max_size_#{suffix}".to_sym
+
+- content_for :sidebar do
+ ul.actions
+ li = link_to t('rule_parameter_sets.actions.new'), new_organisation_rule_parameter_set_path, class: 'add'
+
+ - if @rule_parameter_set.persisted?
+ li = link_to t('rule_parameter_sets.actions.edit'), edit_organisation_rule_parameter_set_path( @rule_parameter_set), class: 'edit'
+
+ - if current_organisation.rule_parameter_sets.size > 1
+ li = link_to t('rule_parameter_sets.actions.destroy'), organisation_rule_parameter_set_path( @rule_parameter_set), method: :delete, data: { confirm: t('rule_parameter_sets.actions.destroy_confirm') }, class: 'remove' \ No newline at end of file