aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpl2016-11-21 17:55:22 +0100
committerjpl2016-11-21 17:55:22 +0100
commitad2a4650eac510c95b0c04c4b069cb9cc10b7dce (patch)
treed2f52ae9eb071e33a9ab2038009bbd940fc72529
parent35fa0c1b1e32f5b40a6e05fb9c72d62a85e1cdd4 (diff)
downloadchouette-core-ad2a4650eac510c95b0c04c4b069cb9cc10b7dce.tar.bz2
Refs #2019: change list display, to table, for networks
-rw-r--r--app/views/networks/_network.html.slim15
-rw-r--r--app/views/networks/_networks.html.slim38
-rw-r--r--app/views/referential_lines/_lines.html.slim13
-rw-r--r--app/views/referential_networks/_network.html.slim15
-rw-r--r--app/views/referential_networks/_networks.html.slim38
-rw-r--r--app/views/referential_stop_areas/index.html.slim3
6 files changed, 70 insertions, 52 deletions
diff --git a/app/views/networks/_network.html.slim b/app/views/networks/_network.html.slim
deleted file mode 100644
index 94745ca3d..000000000
--- a/app/views/networks/_network.html.slim
+++ /dev/null
@@ -1,15 +0,0 @@
-#index_item.panel.panel-default.network
- .panel-heading
- .panel-title.clearfix
- span.pull-right
- - if policy(network).update?
- = link_to edit_line_referential_network_path(@line_referential, network), class: 'btn btn-default btn-sm' do
- span.fa.fa-pencil
- - if policy(network).destroy?
- = link_to line_referential_network_path(@line_referential, network), method: :delete, :data => { :confirm => t('networks.actions.destroy_confirm') }, class: 'btn btn-danger btn-sm' do
- span.fa.fa-trash-o
-
- h5
- = link_to [@line_referential, network], class: 'preview', title: "#{Chouette::Network.model_name.human.capitalize} #{network.name}" do
- span.name
- = truncate(network.name, :length => 20)
diff --git a/app/views/networks/_networks.html.slim b/app/views/networks/_networks.html.slim
index 9143e5c16..9f5197540 100644
--- a/app/views/networks/_networks.html.slim
+++ b/app/views/networks/_networks.html.slim
@@ -1,9 +1,31 @@
-.page_info
- span.search = t('will_paginate.page_entries_info.search')
- = page_entries_info @networks
+.networks
+ table.table.table-bordered.table-hover
+ thead
+ tr
+ th = @networks.human_attribute_name(:name)
+ th.text-center = "Actions"
+
+ tbody
+ - @networks.each do |network|
+ tr
+ td
+ span.label.label-default style='margin-right:5px'
+ = network.objectid.local_id
+ = network.name
+
+ / 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') }
-.networks.paginated_content
- = paginated_content(@networks)
-
-.pagination
- = will_paginate @networks, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer \ No newline at end of file
+ .text-center
+ = will_paginate @networks, container: false, renderer: RemoteBootstrapPaginationLinkRenderer
diff --git a/app/views/referential_lines/_lines.html.slim b/app/views/referential_lines/_lines.html.slim
index fc89a8939..372aa46a8 100644
--- a/app/views/referential_lines/_lines.html.slim
+++ b/app/views/referential_lines/_lines.html.slim
@@ -3,7 +3,14 @@
= page_entries_info @lines
.lines.paginated_content
- = paginated_content(@lines)
+ table.table.table-bordered.table-hover
+ thead
+ tr
+ th = @lines.human_attribute_name(:name)
+ th = @lines.human_attribute_name(:network)
+ th = @lines.human_attribute_name(:company)
+
+ / = paginated_content(@lines)
-.pagination
- = will_paginate @lines, container: false, renderer: RemoteBootstrapPaginationLinkRenderer \ No newline at end of file
+ .text-center
+ = will_paginate @lines, container: false, renderer: RemoteBootstrapPaginationLinkRenderer
diff --git a/app/views/referential_networks/_network.html.slim b/app/views/referential_networks/_network.html.slim
deleted file mode 100644
index f7c7b66eb..000000000
--- a/app/views/referential_networks/_network.html.slim
+++ /dev/null
@@ -1,15 +0,0 @@
-#index_item.panel.panel-default.network
- .panel-heading
- .panel-title.clearfix
- span.pull-right
- - if policy(network).update?
- = link_to edit_referential_network_path(@referential, network), class: 'btn btn-default btn-sm' do
- span.fa.fa-pencil
- - if policy(network).destroy?
- = link_to referential_network_path(@referential, network), method: :delete, :data => { :confirm => t('networks.actions.destroy_confirm') }, class: 'btn btn-danger btn-sm' do
- span.fa.fa-trash-o
-
- h5
- = link_to [@referential, network], class: 'preview', title: "#{Chouette::Network.model_name.human.capitalize} #{network.name}" do
- span.name
- = truncate(network.name, :length => 20)
diff --git a/app/views/referential_networks/_networks.html.slim b/app/views/referential_networks/_networks.html.slim
index 9143e5c16..9f5197540 100644
--- a/app/views/referential_networks/_networks.html.slim
+++ b/app/views/referential_networks/_networks.html.slim
@@ -1,9 +1,31 @@
-.page_info
- span.search = t('will_paginate.page_entries_info.search')
- = page_entries_info @networks
+.networks
+ table.table.table-bordered.table-hover
+ thead
+ tr
+ th = @networks.human_attribute_name(:name)
+ th.text-center = "Actions"
+
+ tbody
+ - @networks.each do |network|
+ tr
+ td
+ span.label.label-default style='margin-right:5px'
+ = network.objectid.local_id
+ = network.name
+
+ / 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') }
-.networks.paginated_content
- = paginated_content(@networks)
-
-.pagination
- = will_paginate @networks, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer \ No newline at end of file
+ .text-center
+ = will_paginate @networks, container: false, renderer: RemoteBootstrapPaginationLinkRenderer
diff --git a/app/views/referential_stop_areas/index.html.slim b/app/views/referential_stop_areas/index.html.slim
index 42ac267aa..c35622eb9 100644
--- a/app/views/referential_stop_areas/index.html.slim
+++ b/app/views/referential_stop_areas/index.html.slim
@@ -1,8 +1,5 @@
= title_tag t('stop_areas.index.title')
-#country_codes
- = @country_codes.to_json
-
= search_form_for @q, :url => referential_stop_areas_path(@referential), remote: true, :html => {:method => :get, class: "form-inline", :id => "search", role: "form"} do |f|
.panel.panel-default
.panel-heading