7 files changed, 42 insertions, 36 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 9f2e2765f..0a7b0fb75 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -73,8 +73,6 @@ module ApplicationHelper
       "time_tables"
     when path.include?("/timebands")
       "timebands"
-     when path.include?("/rule_parameter_set")
-      "parametersets"
     when path.include?("/import_tasks")
       "imports"
     when path.include?("/exports")
diff --git a/app/helpers/compliance_check_blocks_helper.rb b/app/helpers/compliance_check_blocks_helper.rb
new file mode 100644
index 000000000..b4d858b07
--- /dev/null
+++ b/app/helpers/compliance_check_blocks_helper.rb
@@ -0,0 +1,3 @@
+module ComplianceCheckBlocksHelper
+  include TransportModeHelper
+end
diff --git a/app/helpers/compliance_check_sets_helper.rb b/app/helpers/compliance_check_sets_helper.rb
new file mode 100644
index 000000000..fc7165fed
--- /dev/null
+++ b/app/helpers/compliance_check_sets_helper.rb
@@ -0,0 +1,16 @@
+module ComplianceCheckSetsHelper
+  def compliance_check_set_path(compliance_check_set)
+    workbench_compliance_check_set_path(compliance_check_set.workbench, compliance_check_set)
+  end
+
+  def executed_compliance_check_set_path(compliance_check_set)
+    executed_workbench_compliance_check_set_path(compliance_check_set.workbench, compliance_check_set)
+  end
+
+  def compliance_check_path(compliance_check)
+    workbench_compliance_check_set_compliance_check_path(
+      compliance_check.compliance_check_set.workbench,
+      compliance_check.compliance_check_set,
+      compliance_check)
+  end
+end
diff --git a/app/helpers/compliance_control_blocks_helper.rb b/app/helpers/compliance_control_blocks_helper.rb
index 311e6fb46..b53ac17ae 100644
--- a/app/helpers/compliance_control_blocks_helper.rb
+++ b/app/helpers/compliance_control_blocks_helper.rb
@@ -1,5 +1,5 @@
 module ComplianceControlBlocksHelper
-  def transport_mode(transport_mode, transport_submode)
+  def compliance_transport_mode(transport_mode, transport_submode)
     return "[Tous les modes de transport]" if transport_mode == ""
     if transport_submode == ""
        "[" + t("enumerize.transport_mode.#{transport_mode}") + "]"
diff --git a/app/helpers/referentials_helper.rb b/app/helpers/referentials_helper.rb
index f3c18d9f8..01e5a5879 100644
--- a/app/helpers/referentials_helper.rb
+++ b/app/helpers/referentials_helper.rb
@@ -1,12 +1,13 @@
 module ReferentialsHelper
-  # Line statuses helper
+  # Outputs a green check icon and the text "Oui" or a red exclamation mark
+  # icon and the text "Non" based on `status`
   def line_status(status)
     if status
-    cls = 'danger'
-      content_tag :span, status ? " #{t('false')} " : " #{t('true')}", class: "fa fa-exclamation-circle fa-lg text-#{cls}"
+      content_tag(:span, nil, class: 'fa fa-exclamation-circle fa-lg text-danger') +
+        t('false')
     else
-    cls = 'success'
-      content_tag :span, status ? " #{t('false')} " : " #{t('true')}", class: "fa fa-check-circle fa-lg text-#{cls}"
+      content_tag(:span, nil, class: 'fa fa-check-circle fa-lg text-success') +
+        t('true')
     end
   end
 end
diff --git a/app/helpers/rule_parameter_sets_helper.rb b/app/helpers/rule_parameter_sets_helper.rb
deleted file mode 100644
index bb210d9cd..000000000
--- a/app/helpers/rule_parameter_sets_helper.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-module RuleParameterSetsHelper
-
-  def unique( value)
-    return t("true") if value == "1"
-    t "false"
-  end
-
-  def pattern(value)
-    return t("rule_parameter_sets.labels.free_char") if value == "0"
-    return t("rule_parameter_sets.labels.num_char") if value == "1"
-    return t("rule_parameter_sets.labels.alpha_char") if value == "2"
-    return t("rule_parameter_sets.labels.upper_char") if value == "3"
-    return t("rule_parameter_sets.labels.lower_char") if value == "4"
-  end
-  
-  def boolean_value(value)
-    return t("true") if value == "1"
-    t "false"
-  end
-  
-  def transport_mode_label_pairs
-    Chouette::TransportMode
-      .all
-      .zip_map { |mode| t("transport_modes.label.#{mode}") }
-  end
-end
-
-
diff --git a/app/helpers/transport_mode_helper.rb b/app/helpers/transport_mode_helper.rb
new file mode 100644
index 000000000..7a486fc2d
--- /dev/null
+++ b/app/helpers/transport_mode_helper.rb
@@ -0,0 +1,16 @@
+module TransportModeHelper
+  def transport_mode_text(transport_modable=nil)
+    mode    = transport_modable.try(:transport_mode)
+    return "[Tous les modes de transport]" if mode.blank?
+
+    submode = transport_modable.try(:transport_submode)
+    [translated_mode_name(:mode, mode), translated_mode_name(:submode, submode)].join
+  end
+
+  private
+  def translated_mode_name mode_type, value
+    return "" if value.blank?
+    "[#{I18n.t("enumerize.transport_#{mode_type}.#{value}")}]"
+  end
+
+end