diff options
| author | Michel Etienne | 2014-08-27 15:44:05 +0200 |
|---|---|---|
| committer | Michel Etienne | 2014-08-27 15:44:05 +0200 |
| commit | 4ff26e0096f122dc74b45b427137eb631da3fd06 (patch) | |
| tree | 8a9717bca9f5d05ff529462d6c8d7758e363eeb2 /app/views | |
| parent | 2a1b23c9bd1d4e2e97814ea9190892f2981b365d (diff) | |
| parent | 82cf451ad0faa76a26adc27528f4458596157802 (diff) | |
| download | chouette-core-4ff26e0096f122dc74b45b427137eb631da3fd06.tar.bz2 | |
Merge branch 'sismo' of github.com:afimb/chouette2 into sismo
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/vehicle_journeys/_form.html.erb | 10 | ||||
| -rw-r--r-- | app/views/vehicle_translations/_translate_form.html.erb | 8 |
2 files changed, 8 insertions, 10 deletions
diff --git a/app/views/vehicle_journeys/_form.html.erb b/app/views/vehicle_journeys/_form.html.erb index 5713a61df..d5d4cffdd 100644 --- a/app/views/vehicle_journeys/_form.html.erb +++ b/app/views/vehicle_journeys/_form.html.erb @@ -17,19 +17,19 @@ <%= form.label @vehicle_journey.human_attribute_name(:vehicle_journey_at_stop_ids), :class => "label" %> </li> <% unless @vehicle_journey.vehicle_journey_at_stops.empty? || - @vehicle_journey.vehicle_journey_at_stops.any? { |vjas| vjas.departure_time.nil? } %> <div class="vehicle_journey_at_stops"> + @vehicle_journey.vehicle_journey_at_stops.any? { |vjas| vjas.departure_time.nil? } %> <div class="vehicle_journey_at_stops"> <div class="well"> - <span class="title">Décaler tous les horaires de la course en fonction de ceux existants</span> + <span class="title"><%= t(".slide_title") %></span> <div> <span><%= t(".set") %></span> <%= select_tag "", options_for_select( [ [t('.slide_departure'), "departure"], [t('.slide_arrival'), "arrival"] ] ), :class => "departure_or_arrival" %> <span><%= t(".to") %></span> <%= select_hour(@vehicle_journey.vehicle_journey_at_stops.first.departure_time.hour) %> <%= select_minute(@vehicle_journey.vehicle_journey_at_stops.first.departure_time.min) %> - <a class="slide btn btn-default"><%= t("formtastic.slide") %></a> + <a class="slide btn btn-default"><%= t(".slide") %></a> </div> </div> - + <% end %> - + <table class="table table-hover table-striped"> <thead> <tr> diff --git a/app/views/vehicle_translations/_translate_form.html.erb b/app/views/vehicle_translations/_translate_form.html.erb index ea7e15bf0..8759d89f9 100644 --- a/app/views/vehicle_translations/_translate_form.html.erb +++ b/app/views/vehicle_translations/_translate_form.html.erb @@ -3,11 +3,9 @@ <%= semantic_form_for [@referential, @line, @route, @vehicle_journey, @vehicle_translation], remote: true do |form| %> <div class="modal-body"> <%= form.inputs do %> - <%= form.input :first_stop_arrival_time, - as: :time_picker, label: t( ".first_stop_arrival_time", stop_name: @vehicle_translation.first_stop_name), - input_html: { class: "form-control input-sm timepicker_basic"}, wrapper_html: { class: "input-append bootstrap-timepicker" } %> - <%= form.input :first_stop_departure_time, - as: :time_picker, label: t( ".first_stop_departure_time", stop_name: @vehicle_translation.first_stop_name), + <%= form.input :departure_or_arrival, as: :select, label: t('.set'), collection: [ [ t('.first_stop_departure_time', stop_name: @vehicle_translation.first_stop_name), "departure"], [t('.first_stop_arrival_time', stop_name: @vehicle_translation.first_stop_name), "arrival"] ], include_blank: false, required: true %> + <%= form.input :first_stop_time, + as: :time_picker, label: t( ".to"), input_html: { class: "form-control input-sm timepicker_basic"}, wrapper_html: { class: "input-append bootstrap-timepicker" } %> <div class="panel-group" id="accordion"> <div class="panel panel-default"> |