aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZog2018-01-12 10:41:57 +0100
committerZog2018-01-12 10:41:57 +0100
commitc758d8cb45dd0bbaaa0f5a4f06678d0613d88682 (patch)
treef0ebed6693b85c8832fd3dcb70950d453d004d00
parent216821cbc5410a1377dd57b09ee2753aee13e37c (diff)
downloadchouette-core-c758d8cb45dd0bbaaa0f5a4f06678d0613d88682.tar.bz2
Refs #5563 @0.25h; Show StopArea type in select box5563-show-parent-stop-type
-rw-r--r--app/assets/stylesheets/components/_select2.sass5
-rw-r--r--app/views/stop_areas/autocomplete.rabl2
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/components/_select2.sass b/app/assets/stylesheets/components/_select2.sass
index 332af16cd..38603e11a 100644
--- a/app/assets/stylesheets/components/_select2.sass
+++ b/app/assets/stylesheets/components/_select2.sass
@@ -7,6 +7,11 @@
// .select2-results__message, .loading-results
// display: none
+.select2-results__option, .select2-selection__rendered
+ .label
+ font-size: 0.8em
+ margin-right: 0.5em
+
.select2-container, .select2-container--bootstrap
.select2-selection--single .select2-selection__rendered
height: 100%
diff --git a/app/views/stop_areas/autocomplete.rabl b/app/views/stop_areas/autocomplete.rabl
index 3208289b5..a5f0bd5ec 100644
--- a/app/views/stop_areas/autocomplete.rabl
+++ b/app/views/stop_areas/autocomplete.rabl
@@ -15,7 +15,7 @@ node do |stop_area|
:latitude => stop_area.latitude,
:area_type => stop_area.area_type,
:comment => stop_area.comment,
- :text => stop_area.full_name
+ :text => "<span class='small label label-info'>#{I18n.t("area_types.label.#{stop_area.area_type}")}</span>#{stop_area.full_name}"
}
end