diff options
| author | Zog | 2018-01-29 16:25:08 +0100 |
|---|---|---|
| committer | Zog | 2018-02-01 14:40:24 +0100 |
| commit | 82de76f0efce7558a3fe240edf4e2293a8788ee1 (patch) | |
| tree | 3c9c70b904d989a4b8e0d8b2d0db03314465a410 /app/views | |
| parent | d896ba8753f9877dfd29a97cf1310d54d0b25874 (diff) | |
| download | chouette-core-82de76f0efce7558a3fe240edf4e2293a8788ee1.tar.bz2 | |
Refs #5758 @1h; Add localized names to StopAreas
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/stop_areas/_form.html.slim | 6 | ||||
| -rw-r--r-- | app/views/stop_areas/show.html.slim | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app/views/stop_areas/_form.html.slim b/app/views/stop_areas/_form.html.slim index 1bc3e77ef..c2b9a7f4f 100644 --- a/app/views/stop_areas/_form.html.slim +++ b/app/views/stop_areas/_form.html.slim @@ -6,8 +6,12 @@ /= @map.to_html = f.input :id, as: :hidden = f.input :name, :input_html => {:title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.stop_area.name")} + .form-group + .col-sm-3.col-xs-5 + .col-sm-9.col-xs-7 + - f.object.localized_names.each do |k, v| + .col-md-6= f.input "localized_names[#{k}]", input_html: {value: v}, label: label_for_country(k) = f.input :kind, as: :radio_buttons, checked: @stop_area.kind, :input_html => {:disabled => !@stop_area.new_record?}, :include_blank => false, item_wrapper_class: 'radio-inline', wrapper: :horizontal_form, disabled: !@stop_area.new_record? - .slave data-master="[name='stop_area[kind]']" data-value="commercial" = f.input :parent_id, as: :select, :collection => [f.object.parent_id], input_html: { data: { select2_ajax: 'true', url: autocomplete_stop_area_referential_stop_areas_path(@stop_area_referential), initvalue: {id: f.object.parent_id, text: f.object.parent.try(:full_name)}}} - %i(non_commercial commercial).each do |kind| diff --git a/app/views/stop_areas/show.html.slim b/app/views/stop_areas/show.html.slim index b0896c1e0..67f309cef 100644 --- a/app/views/stop_areas/show.html.slim +++ b/app/views/stop_areas/show.html.slim @@ -7,10 +7,12 @@ .row .col-lg-6.col-md-6.col-sm-12.col-xs-12 - attributes = { t('id_reflex') => @stop_area.get_objectid.short_id } + - @stop_area.localized_names.each do |k, v| + - attributes.merge!({label_for_country(k, @stop_area.human_attribute_name(:name)) => v }) if v.present? - attributes.merge!({ @stop_area.human_attribute_name(:parent) => @stop_area.parent ? link_to(@stop_area.parent.name, stop_area_referential_stop_area_path(@stop_area_referential, @stop_area.parent)) : "-" }) if @stop_area.commercial? - attributes.merge!({ @stop_area.human_attribute_name(:stop_area_type) => Chouette::AreaType.find(@stop_area.area_type).try(:label), - @stop_area.human_attribute_name(:registration_number) => @stop_area.registration_number, - }) + @stop_area.human_attribute_name(:registration_number) => @stop_area.registration_number + }) - attributes.merge!(@stop_area.human_attribute_name(:waiting_time) => @stop_area.waiting_time_text) if has_feature?(:stop_area_waiting_time) - attributes.merge!({ "Coordonnées" => geo_data(@stop_area, @stop_area_referential), @stop_area.human_attribute_name(:zip_code) => @stop_area.zip_code, |
