Refs #2606: update stuff

5 files changed, 19 insertions, 28 deletions

diff --git a/app/views/referential_companies/index.html.slim b/app/views/referential_companies/index.html.slim
index 6f41f206d..4f6040e5d 100644
--- a/app/views/referential_companies/index.html.slim
+++ b/app/views/referential_companies/index.html.slim
@@ -8,8 +8,8 @@
 / PageContent
 .page_content
   .container-fluid
-    - if @companies.any?
-      .row
+    - if params[:q].present? or @companies.any?
+      .row.mb-sm
         .col-lg-5.col-md-6.col-sm-6.col-xs-8
           = search_form_for @q, url: referential_companies_path(@referential), html: {method: :get} do |f|
             .input-group.search_bar
@@ -21,19 +21,20 @@
 
         .col-lg-7.col-md-6.col-sm-6.col-xs-4.text-right
           = new_pagination @companies
-          
-      .row.mt-sm
+
+    - if @companies.any?
+      .row
         .col-lg-12
           = table_builder @companies,
-            { 'Oid' => Proc.new { |n| n.try(:objectid).try(:local_id) }, @companies.human_attribute_name(:code) => 'code',
-            @companies.human_attribute_name(:name) => 'name', @companies.human_attribute_name(:short_name) => 'short_name', @companies.human_attribute_name(:registration_number) => 'registration_number' },
+            { 'ID Codif' => Proc.new { |n| n.try(:objectid).try(:local_id) },
+            @companies.human_attribute_name(:name) => 'name', @companies.human_attribute_name(:phone) => 'phone', @companies.human_attribute_name(:email) => 'email', @companies.human_attribute_name(:url) => 'url' },
             [:show, :edit, :delete],
             [],
             'table'
 
           = new_pagination @companies, 'pull-right'
 
-    - else
+    - unless @companies.any?
       .row
         .col-lg-12
           = replacement_msg t('companies.search_no_results')
diff --git a/app/views/referential_companies/show.html.slim b/app/views/referential_companies/show.html.slim
index 4e3285dfb..ae89c1444 100644
--- a/app/views/referential_companies/show.html.slim
+++ b/app/views/referential_companies/show.html.slim
@@ -22,13 +22,7 @@
     .row
       .col-lg-6.col-md-6.col-sm-12.col-xs-12
         = definition_list t('metadatas'),
-          { Chouette::Company.human_attribute_name(:short_name) => @company.short_name,
-            Chouette::Company.human_attribute_name(:organizational_unit) => @company.organizational_unit,
-            Chouette::Company.human_attribute_name(:operating_department_name) => @company.operating_department_name,
-            Chouette::Company.human_attribute_name(:code) => @company.code,
+          { 'ID Codif' => @company.try(:objectid).try(:local_id),
             Chouette::Company.human_attribute_name(:phone) => @company.phone,
-            Chouette::Company.human_attribute_name(:fax) => @company.fax,
             Chouette::Company.human_attribute_name(:email) => @company.email,
-            Chouette::Company.human_attribute_name(:time_zone) => @company.time_zone,
-            Chouette::Company.human_attribute_name(:url) => @company.url,
-            Chouette::Company.human_attribute_name(:registration_number) => @company.registration_number }
+            Chouette::Company.human_attribute_name(:url) => @company.url }
diff --git a/app/views/referential_networks/index.html.slim b/app/views/referential_networks/index.html.slim
index 90e4258a4..9619035c4 100644
--- a/app/views/referential_networks/index.html.slim
+++ b/app/views/referential_networks/index.html.slim
@@ -8,8 +8,8 @@
 /PageContent
 .page_content
   .container-fluid
-    - if @networks.any?
-      .row
+    - if params[:q].present? or @networks.any?
+      .row.mb-sm
         .col-lg-5.col-md-6.col-sm-6.col-xs-8
           = search_form_for @q, url: referential_networks_path(@referential), html: {method: :get} do |f|
             .input-group.search_bar
@@ -22,17 +22,18 @@
         .col-lg-7.col-md-6.col-sm-6.col-xs-4.text-right
           = new_pagination @networks
 
-      .row.mt-sm
+    - if @networks.any?
+      .row
         .col-lg-12
           = table_builder @networks,
-            { 'Oid' => Proc.new { |n| n.try(:objectid).try(:local_id) }, @networks.human_attribute_name(:name) => 'name', @networks.human_attribute_name(:description) => 'description', @networks.human_attribute_name(:registration_number) => 'registration_number' },
+            { 'ID Codif' => Proc.new { |n| n.try(:objectid).try(:local_id) }, @networks.human_attribute_name(:name) => 'name' },
             [:show, :edit, :delete],
             [],
             'table'
 
           = new_pagination @networks, 'pull-right'
 
-    - else
+    - unless @networks.any?
       .row
         .col-lg-12
           = replacement_msg t('networks.search_no_results')
diff --git a/app/views/referential_networks/show.html.slim b/app/views/referential_networks/show.html.slim
index 0e19e043d..3a195b342 100644
--- a/app/views/referential_networks/show.html.slim
+++ b/app/views/referential_networks/show.html.slim
@@ -22,10 +22,4 @@
     .row
       .col-lg-6.col-md-6.col-sm-12.col-xs-12
         = definition_list t('metadatas'),
-          { Chouette::Network.human_attribute_name(:registration_number) => @network.registration_number,
-            Chouette::Network.human_attribute_name(:comment) => @network.comment,
-            Chouette::Network.human_attribute_name(:version_date) => (@network.version_date.present? ? l(@network.version_date, format: :short) : '-'),
-            Chouette::Network.human_attribute_name(:description) => @network.description,
-            Chouette::Network.human_attribute_name(:source_name) => @network.source_name,
-            Chouette::Network.human_attribute_name(:source_type_name) => (@network.source_type_name.present? ? t("source_types.label.#{@network.source_type_name}") : '-'),
-            Chouette::Network.human_attribute_name(:source_identifier) => @network.source_identifier }
+          { 'ID Codif' => @network.try(:objectid).try(:local_id) }
diff --git a/app/views/referentials/show.html.slim b/app/views/referentials/show.html.slim
index dce4c1b52..af8e6b8cd 100644
--- a/app/views/referentials/show.html.slim
+++ b/app/views/referentials/show.html.slim
@@ -55,8 +55,9 @@
           / ID Codif, nom court, nom de la ligne, réseau, mode, transporteur principal, actions = [show, edit_notes]
           = table_builder @reflines,
             { 'ID Codif' => Proc.new { |n| n.objectid.local_id }, @reflines.human_attribute_name(:registration_number) => 'registration_number',
-            @reflines.human_attribute_name(:name) => 'name', @reflines.human_attribute_name(:network) => Proc.new { |n| n.try(:network).try(:name) },
+            @reflines.human_attribute_name(:name) => 'name',
             @reflines.human_attribute_name(:transport_mode) => 'transport_mode',
+            @reflines.human_attribute_name(:network) => Proc.new { |n| n.try(:network).try(:name) },
             @reflines.human_attribute_name(:company) => Proc.new { |n| n.try(:company).try(:name) } },
             [:show],
             [],