Refs #6508; Uniformize lines show

3 files changed, 9 insertions, 7 deletions

diff --git a/app/helpers/referentials_helper.rb b/app/helpers/referentials_helper.rb
index 9c3852322..a01d901e6 100644
--- a/app/helpers/referentials_helper.rb
+++ b/app/helpers/referentials_helper.rb
@@ -1,13 +1,15 @@
 module ReferentialsHelper
   # 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)
+  def line_status(status, verbose=true)
      if status
-      content_tag(:span, nil, class: 'fa fa-exclamation-circle fa-lg text-danger') +
-      t('activerecord.attributes.line.deactivated')
+      out = content_tag(:span, nil, class: 'fa fa-exclamation-circle fa-lg text-danger')
+      out += t('activerecord.attributes.line.deactivated') if verbose
+      out
     else
-      content_tag(:span, nil, class: 'fa fa-check-circle fa-lg text-success') +
-      t('activerecord.attributes.line.activated')
+      out = content_tag(:span, nil, class: 'fa fa-check-circle fa-lg text-success')
+      out += t('activerecord.attributes.line.activated') if verbose
+      out
     end
   end
 
diff --git a/app/views/lines/show.html.slim b/app/views/lines/show.html.slim
index 9e1ae6d6f..d0a0d5442 100644
--- a/app/views/lines/show.html.slim
+++ b/app/views/lines/show.html.slim
@@ -7,7 +7,7 @@
       .col-lg-6.col-md-6.col-sm-12.col-xs-12
         = definition_list t('metadatas'),
           {  t('objectid') => @line.get_objectid.short_id,
-             @line.human_attribute_name(:deactivated) => (@line.deactivated? ? t('false') : t('true')),
+             @line.human_attribute_name(:state) => line_status(@line.deactivated),
              @line.human_attribute_name(:network_id) => (@line.network.nil? ? t('lines.index.unset') : @line.network.name),
              @line.human_attribute_name(:company_id) => (@line.company.nil? ? t('lines.index.unset') : @line.company.name),
              @line.human_attribute_name(:secondary_companies) => (@line.secondary_companies.nil? ? t('lines.index.unset') : array_to_html_list(@line.secondary_companies.collect(&:name))),
diff --git a/app/views/referential_lines/show.html.slim b/app/views/referential_lines/show.html.slim
index 91868a002..8d763777e 100644
--- a/app/views/referential_lines/show.html.slim
+++ b/app/views/referential_lines/show.html.slim
@@ -7,7 +7,7 @@
       .col-lg-6.col-md-6.col-sm-12.col-xs-12
         = definition_list t('metadatas'),
           {  t('id_codif') => @line.get_objectid.short_id,
-             Chouette::Line.tmf('activated') => (@line.deactivated? ? t('false') : t('true')),
+             Chouette::Line.tmf('state') => line_status(@line.deactivated),
              Chouette::Line.tmf('network_id') => (@line.network.nil? ? t('lines.index.unset') : link_to(@line.network.name, [@referential, @line.network]) ),
              Chouette::Line.tmf('company') => (@line.company.nil? ? t('lines.index.unset') : link_to(@line.company.name, [@referential, @line.company]) ),
              Chouette::Line.tmf('secondary_company') => (@line.secondary_companies.nil? ? t('lines.index.unset') : @line.secondary_companies.collect(&:name).join(', ')),