aboutsummaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
authorjpl2016-12-05 10:45:35 +0100
committerjpl2016-12-05 10:45:35 +0100
commitfdb0f3b15df731de3678eff5afa970d9d6c9c7fa (patch)
tree5924e081825858f8748b9d7d9cf13d194b2992bf /app/views
parent703a37f054df7fc35ebf948cb5a4548f16136bd2 (diff)
downloadchouette-core-fdb0f3b15df731de3678eff5afa970d9d6c9c7fa.tar.bz2
Refs #2140: remove lines from stop_areas
Diffstat (limited to 'app/views')
-rw-r--r--app/views/referential_stop_areas/_stop_areas.html.slim2
-rw-r--r--app/views/referential_stop_areas/index.html.slim2
-rw-r--r--app/views/stop_areas/_stop_areas.html.slim2
-rw-r--r--app/views/stop_areas/index.html.slim6
4 files changed, 6 insertions, 6 deletions
diff --git a/app/views/referential_stop_areas/_stop_areas.html.slim b/app/views/referential_stop_areas/_stop_areas.html.slim
index f8551a0ac..f976eb327 100644
--- a/app/views/referential_stop_areas/_stop_areas.html.slim
+++ b/app/views/referential_stop_areas/_stop_areas.html.slim
@@ -1,6 +1,6 @@
- if @stop_areas.any?
= table_builder @stop_areas,
- { 'Object_id' => 'objectid', @stop_areas.human_attribute_name(:name) => 'name', @stop_areas.human_attribute_name(:registration_number) => 'registration_number', @stop_areas.human_attribute_name(:city_name) => 'city_name', @stop_areas.human_attribute_name(:zip_code) => 'zip_code', @stop_areas.human_attribute_name(:lines) => Proc.new { |n| n.try(:lines).try(:count) } },
+ { 'Object_id' => 'objectid', @stop_areas.human_attribute_name(:name) => 'name', @stop_areas.human_attribute_name(:registration_number) => 'registration_number', @stop_areas.human_attribute_name(:city_name) => 'city_name', @stop_areas.human_attribute_name(:zip_code) => 'zip_code' },
[:show, :edit, :delete],
'table table-bordered'
diff --git a/app/views/referential_stop_areas/index.html.slim b/app/views/referential_stop_areas/index.html.slim
index b92348e27..937131a37 100644
--- a/app/views/referential_stop_areas/index.html.slim
+++ b/app/views/referential_stop_areas/index.html.slim
@@ -7,7 +7,7 @@
= f.text_field :name_or_objectid_cont, placeholder: t('.name_or_objectid'), class: 'form-control'
.input-group-btn
- button.btn.btn-default#search-btn type="submit"
+ button.btn.btn-primary#search-btn type="submit"
span.fa.fa-search
a data-toggle="collapse" data-parent="#search" href="#advanced_search"
diff --git a/app/views/stop_areas/_stop_areas.html.slim b/app/views/stop_areas/_stop_areas.html.slim
index f8551a0ac..f976eb327 100644
--- a/app/views/stop_areas/_stop_areas.html.slim
+++ b/app/views/stop_areas/_stop_areas.html.slim
@@ -1,6 +1,6 @@
- if @stop_areas.any?
= table_builder @stop_areas,
- { 'Object_id' => 'objectid', @stop_areas.human_attribute_name(:name) => 'name', @stop_areas.human_attribute_name(:registration_number) => 'registration_number', @stop_areas.human_attribute_name(:city_name) => 'city_name', @stop_areas.human_attribute_name(:zip_code) => 'zip_code', @stop_areas.human_attribute_name(:lines) => Proc.new { |n| n.try(:lines).try(:count) } },
+ { 'Object_id' => 'objectid', @stop_areas.human_attribute_name(:name) => 'name', @stop_areas.human_attribute_name(:registration_number) => 'registration_number', @stop_areas.human_attribute_name(:city_name) => 'city_name', @stop_areas.human_attribute_name(:zip_code) => 'zip_code' },
[:show, :edit, :delete],
'table table-bordered'
diff --git a/app/views/stop_areas/index.html.slim b/app/views/stop_areas/index.html.slim
index 739bade2a..7f1026892 100644
--- a/app/views/stop_areas/index.html.slim
+++ b/app/views/stop_areas/index.html.slim
@@ -1,6 +1,6 @@
= title_tag t('stop_areas.index.title')
-= search_form_for @q, url: stop_area_referential_stop_areas_path(@stop_area_referential), remote: true, html: { method: :get, class: "form", id: "search", role: "form"} do |f|
+= search_form_for @q, url: stop_area_referential_stop_areas_path(@stop_area_referential), remote: true, html: { method: :get, class: "form-inline", id: "search", role: "form"} do |f|
.panel.panel-default
.panel-heading
.input-group.col-md-9.col-sm-9
@@ -11,8 +11,8 @@
span.fa.fa-search
a data-toggle="collapse" data-parent="#search" href="#advanced_search"
- i.fa.fa-plus
- = "#{t('.advanced_search')}"
+ span.fa.fa-plus
+ = " #{t('.advanced_search')}"
#advanced_search.panel-collapse.collapse
.panel-body