diff options
| author | Luc Donnet | 2018-01-19 17:04:15 +0100 |
|---|---|---|
| committer | GitHub | 2018-01-19 17:04:15 +0100 |
| commit | 13f1ea15f0e20effd3f7b5afe018d8d346579c2e (patch) | |
| tree | 8d2f4a186bac118184a0f637c8e6134e087575a0 | |
| parent | 18d756c03fce40648187ab18f29896d4f2c17b23 (diff) | |
| parent | c758d8cb45dd0bbaaa0f5a4f06678d0613d88682 (diff) | |
| download | chouette-core-13f1ea15f0e20effd3f7b5afe018d8d346579c2e.tar.bz2 | |
Merge pull request #238 from af83/5563-show-parent-stop-type
5563 Show StopArea type in select box
| -rw-r--r-- | app/assets/stylesheets/components/_select2.sass | 5 | ||||
| -rw-r--r-- | app/views/stop_areas/autocomplete.rabl | 2 |
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 |