aboutsummaryrefslogtreecommitdiffstats
path: root/app/views/referential_stop_areas
diff options
context:
space:
mode:
authorXinhui Xu2016-12-15 11:47:02 +0100
committerGitHub2016-12-15 11:47:02 +0100
commited25e709fc16e5dee5c326eda0479d492f137e35 (patch)
tree37417385e14b5e9bd6d876f9da9412cb1d072902 /app/views/referential_stop_areas
parentd70478af0ac8606723b313b86beaa611631646a2 (diff)
parent15d8febd4e796937b9b08f39e8541e0075035be2 (diff)
downloadchouette-core-ed25e709fc16e5dee5c326eda0479d492f137e35.tar.bz2
Merge branch 'staging' into enum_stop_area_area_type
Diffstat (limited to 'app/views/referential_stop_areas')
-rw-r--r--app/views/referential_stop_areas/index.html.slim6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/referential_stop_areas/index.html.slim b/app/views/referential_stop_areas/index.html.slim
index 967d91c48..604a5a76e 100644
--- a/app/views/referential_stop_areas/index.html.slim
+++ b/app/views/referential_stop_areas/index.html.slim
@@ -7,7 +7,7 @@
.panel.panel-default
.panel-heading
.input-group.col-md-9.col-sm-9
- = f.text_field :name_cont, :placeholder => "#{t('.name')}", class: 'form-control'
+ = f.text_field :name_or_objectid_cont, placeholder: t('.name_or_objectid'), class: 'form-control'
.input-group-btn
button.btn.btn-default type="submit"
i.fa.fa-search
@@ -23,6 +23,8 @@
= f.text_field :zip_code_cont, placeholder: "#{t('.zip_code')}", class: 'form-control typeahead', style: 'width: 100%'
.col-sm-3
= f.select(:area_type_cont, Chouette::StopArea.area_type.options, { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t(".area_type") })
+ = f.text_field :city_name_cont, placeholder: "#{t('.city_name')}", class: 'form-control typeahead', style: 'width: 100%'
+ .col-sm-3
#stop_areas
= render 'stop_areas'
@@ -33,4 +35,4 @@
li
= link_to t('stop_areas.actions.new'), new_referential_stop_area_path(@referential), class: 'add'
li
- / = link_to t('stop_areas.actions.default_geometry'), default_geometry_referential_stop_areas_path(@referential), :method => :put, :class => "calculator"
+ / = link_to t('stop_areas.actions.default_geometry'), default_geometry_referential_stop_areas_path(@referential), :method => :put, :class => "calculator" \ No newline at end of file