Refs #2600: adding definition list component

2 files changed, 46 insertions, 62 deletions

diff --git a/app/views/referential_lines/show.html.slim b/app/views/referential_lines/show.html.slim
index 9eed5345e..24f52b8ce 100644
--- a/app/views/referential_lines/show.html.slim
+++ b/app/views/referential_lines/show.html.slim
@@ -6,43 +6,6 @@
   / t('last_update', time: l(@line.updated_at, format: :short)),
   / Below is secundary actions & optional contents (filters, ...)
   .row
-    .col-lg-12
-      .page_metalist
-        .pm-col
-          .pm-item
-            span.label.label-default
-              = @line.deactivated? ? 'Désactivée' : 'Activée'
-
-          .pm-item
-            strong = "#{@line.human_attribute_name(:network)} : "
-            = @line.network.nil? ? t('lines.index.unset') : @line.network.name
-
-          .pm-item
-            strong = "#{@line.human_attribute_name(:company)} : "
-            = @line.company.nil? ? t('lines.index.unset') : @line.company.name
-        
-        .pm-col
-          .pm-item
-            strong = "#{@line.human_attribute_name(:number)} : "
-            = @line.number
-          .pm-item
-            strong = "#{@line.human_attribute_name(:published_name)} : "
-            = @line.published_name
-          .pm-item
-            strong = "#{@line.human_attribute_name(:registration_number)} : "
-            = @line.registration_number
-        .pm-col
-          .pm-item
-            strong = "#{@line.human_attribute_name(:transport_mode)} : "
-            = t("enumerize.line.transport_mode.#{@line.transport_mode}") if @line.transport_mode
-          .pm-item
-            strong = "#{@line.human_attribute_name(:transport_submode)} : "
-            = t("enumerize.line.transport_submode.#{@line.transport_submode}") if @line.transport_submode
-          .pm-item
-            strong = "#{@line.human_attribute_name(:url)} : "
-            = @line.try(:url)
-
-  .row
     .col-lg-12.text-right.mb-sm
       = link_to t('lines.actions.show_network'), [@referential, @line.network], class: 'btn btn-primary'
       = link_to t('lines.actions.show_company'), [@referential, @line.company], class: 'btn btn-primary'
@@ -65,6 +28,44 @@
   .container-fluid
     .row
       .col-lg-12
+        / = definition_list t('metadatas'),
+        /   {  }
+        .page_metalist
+          .pm-col
+            .pm-item
+              span.label.label-default
+                = @line.deactivated? ? 'Désactivée' : 'Activée'
+
+            .pm-item
+              strong = "#{@line.human_attribute_name(:network)} : "
+              = @line.network.nil? ? t('lines.index.unset') : @line.network.name
+
+            .pm-item
+              strong = "#{@line.human_attribute_name(:company)} : "
+              = @line.company.nil? ? t('lines.index.unset') : @line.company.name
+          
+          .pm-col
+            .pm-item
+              strong = "#{@line.human_attribute_name(:number)} : "
+              = @line.number
+            .pm-item
+              strong = "#{@line.human_attribute_name(:published_name)} : "
+              = @line.published_name
+            .pm-item
+              strong = "#{@line.human_attribute_name(:registration_number)} : "
+              = @line.registration_number
+          .pm-col
+            .pm-item
+              strong = "#{@line.human_attribute_name(:transport_mode)} : "
+              = t("enumerize.line.transport_mode.#{@line.transport_mode}") if @line.transport_mode
+            .pm-item
+              strong = "#{@line.human_attribute_name(:transport_submode)} : "
+              = t("enumerize.line.transport_submode.#{@line.transport_submode}") if @line.transport_submode
+            .pm-item
+              strong = "#{@line.human_attribute_name(:url)} : "
+              = @line.try(:url)
+    .row
+      .col-lg-12
         - if @routes.any?
           = new_pagination @routes, 'pull-right'
 
diff --git a/app/views/referentials/show.html.slim b/app/views/referentials/show.html.slim
index 1f27b24bd..b3929d637 100644
--- a/app/views/referentials/show.html.slim
+++ b/app/views/referentials/show.html.slim
@@ -24,33 +24,15 @@
 .page_content
   .container-fluid
     .row
-      .col-lg-12
-        .page_metalist
-          .pm-col
-            - if @referential.archived?
-              .pm-item
-                span.label.label-default
-                  strong = "#{@referential.human_attribute_name(:archived_at)} : "
-                  = l(@referential.archived_at, format: :short)
-            - else
-              .pm-item
-                strong = "#{@referential.human_attribute_name(:archived_at)} : "
-
-            .pm-item
-              strong = "#{@referential.human_attribute_name(:validity_period)} : "
-              - if @referential.validity_period
-                = t('validity_range', debut: l(@referential.try(:validity_period).try(:begin), format: :short), end: l(@referential.try(:validity_period).try(:end), format: :short))
-
-          .pm-col
-            .pm-item
-              strong = "Organisation : "
-              = @referential.organisation.name
-            .pm-item
-              strong = "#{@referential.human_attribute_name(:published_at)} : "
-              = ""
+      .col-lg-6.col-md-6.col-sm-12.col-xs-12
+        = definition_list t('metadatas'),
+          { @referential.human_attribute_name(:archived_at) => (@referential.archived? ? l(@referential.archived_at, format: :short) : '-'),
+            @referential.human_attribute_name(:validity_period) => (@referential.validity_period.present? ? t('validity_range', debut: l(@referential.try(:validity_period).try(:begin), format: :short), end: l(@referential.try(:validity_period).try(:end), format: :short)) : '-'),
+            @referential.human_attribute_name(:organisation) => @referential.organisation.name,
+            @referential.human_attribute_name(:published_at) => '-' }
   
     - if @reflines.any?
-      .row
+      .row.mt-lg
         .col-lg-5.col-md-6.col-sm-6.col-xs-8
           = search_form_for @q, url: referential_path(@referential.id) do |f|
             .input-group.search_bar
@@ -59,6 +41,7 @@
               span.input-group-btn
                 button.btn.btn-default type='submit'
                   span.fa.fa-search
+
         .col-lg-7.col-md-6.col-sm-6.col-xs-4.text-right
           = new_pagination @reflines