Refs #2019: update ref_networks table with new table helper

4 files changed, 24 insertions, 36 deletions

diff --git a/app/helpers/newfront_helper.rb b/app/helpers/newfront_helper.rb
index 5bdf674b9..c943b0f76 100644
--- a/app/helpers/newfront_helper.rb
+++ b/app/helpers/newfront_helper.rb
@@ -49,7 +49,10 @@ module NewfrontHelper
       actions.collect do |action|
         polymorph_url = []
 
-        polymorph_url << action if action != :show
+        unless [:show, :delete].include? action
+          polymorph_url << action
+        end
+
         if current_referential
           polymorph_url << current_referential
         elsif item.respond_to? :referential
@@ -58,7 +61,11 @@ module NewfrontHelper
 
         polymorph_url << item
 
-        content_tag :li, link_to(action, polymorph_url)
+        if action == :delete
+          content_tag :li, link_to(t("table.#{action}"), polymorph_url, method: :delete, data: { confirm: 'Etes-vous sûr(e) de vouloir effectuer cette action ?' })
+        else
+          content_tag :li, link_to(t("table.#{action}"), polymorph_url)
+        end
       end.join.html_safe
     end
 
diff --git a/app/views/referential_networks/_networks.html.slim b/app/views/referential_networks/_networks.html.slim
index d2db33662..b14af3bf0 100644
--- a/app/views/referential_networks/_networks.html.slim
+++ b/app/views/referential_networks/_networks.html.slim
@@ -1,39 +1,8 @@
 .networks
   = table_builder @networks,
     { 'Oid' => Proc.new { |n| n.objectid.local_id }, Chouette::Network.human_attribute_name(:name) => 'name' },
-    [:show, :edit],
+    [:show, :edit, :delete],
     'table table-bordered'
 
-
-  table.table.table-bordered.table-hover
-    thead
-      tr
-        th = Chouette::Network.human_attribute_name(:name)
-        th.text-center = "Actions"
-        
-    tbody
-      - @networks.each_with_index do |network, i|
-        - if i < 6
-          tr
-            td
-              span.label.label-default style='margin-right:5px'
-                = network.objectid.local_id
-              = network.name
-              = network.referential.id
-            
-            / Actions
-            td.text-center
-              .btn-group.btn-group-xs
-                .btn-primary.btn.dropdown-toggle data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
-                  span.fa.fa-bars
-                  span.caret
-                
-                ul.dropdown-menu
-                  li = link_to 'Voir', referential_network_path(@referential, network)
-                  - if policy(network).update?
-                    li = link_to 'Editer', edit_referential_network_path(@referential, network)
-                  - if policy(network).destroy?
-                    li = link_to 'Supprimer', referential_network_path(@referential, network), method: :delete, data: { confirm: t('networks.actions.destroy_confirm') }
-
-  / .text-center
-  /   = will_paginate @networks, container: false, renderer: RemoteBootstrapPaginationLinkRenderer
+  .text-center
+    = will_paginate @networks, container: false, renderer: RemoteBootstrapPaginationLinkRenderer
diff --git a/config/locales/networks.en.yml b/config/locales/networks.en.yml
index f2b256a08..225d28005 100644
--- a/config/locales/networks.en.yml
+++ b/config/locales/networks.en.yml
@@ -62,5 +62,11 @@ en:
           name: "maximum 75 characters"
           registration_number: "Positif integer, unique key, of no more than 8 digits."
           objectid: "[prefix]:PTNetwork:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character. Maximum length of the unique key = 3."
+
+  table:
+    show: Show
+    edit: Edit
+    delete: Delete
+
   referential_networks:
     <<: *en_networks
diff --git a/config/locales/networks.fr.yml b/config/locales/networks.fr.yml
index 8d259a9a0..00ad84668 100644
--- a/config/locales/networks.fr.yml
+++ b/config/locales/networks.fr.yml
@@ -62,5 +62,11 @@ fr:
           name: "maximum 75 caractères"
           registration_number: "Entier positif, clé unique, d'un maximum de 8 chiffres."
           objectid: "[prefixe]:PTNetwork:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'. Longueur maximale de la clé unique = 3."
+
+  table:
+    show: Voir
+    edit: Modifier
+    delete: Supprimer
+
   referential_networks:
     <<: *fr_networks