diff options
| -rw-r--r-- | app/assets/stylesheets/journey_patterns.css.scss | 3 | ||||
| -rw-r--r-- | app/helpers/journey_patterns_helper.rb | 5 | ||||
| -rw-r--r-- | app/views/journey_patterns/_form.html.erb | 2 | ||||
| -rw-r--r-- | config/locales/journey_patterns.yml | 4 |
4 files changed, 13 insertions, 1 deletions
diff --git a/app/assets/stylesheets/journey_patterns.css.scss b/app/assets/stylesheets/journey_patterns.css.scss index 54f796940..5981c76b0 100644 --- a/app/assets/stylesheets/journey_patterns.css.scss +++ b/app/assets/stylesheets/journey_patterns.css.scss @@ -39,6 +39,9 @@ #route_color{ width: 100px; color: white; font-weight: bold;} + #journey_pattern_stop_point_ids_input fieldset .choices-group { + margin-top: 25px; + } } #workspace.journey_patterns.show diff --git a/app/helpers/journey_patterns_helper.rb b/app/helpers/journey_patterns_helper.rb index d7b66db06..bcfb71cd1 100644 --- a/app/helpers/journey_patterns_helper.rb +++ b/app/helpers/journey_patterns_helper.rb @@ -8,5 +8,10 @@ module JourneyPatternsHelper truncate(journey_pattern.name, :length => 30) end end + def stop_point_ids_label(journey_pattern) + return journey_pattern.human_attribute_name(:stop_point_ids) if journey_pattern.vehicle_journeys.empty? + + "#{journey_pattern.human_attribute_name(:stop_point_ids)}. #{t('journey_patterns.form.warning', :count => journey_pattern.vehicle_journeys.count)}" + end end diff --git a/app/views/journey_patterns/_form.html.erb b/app/views/journey_patterns/_form.html.erb index ed68bb4c8..9d7454b72 100644 --- a/app/views/journey_patterns/_form.html.erb +++ b/app/views/journey_patterns/_form.html.erb @@ -4,7 +4,7 @@ <%= form.input :published_name %> <%= form.input :registration_number %> <%= form.input :comment %> - <%= form.input :stop_point_ids, :as => :check_boxes, :collection => @route.stop_points.map { |s| [s.stop_area.name, s.id.to_s]}, :input_html => (@journey_pattern.new_record? ? { :checked => 'checked' }:{}) %> + <%= form.input :stop_point_ids, :label => stop_point_ids_label(@journey_pattern), :as => :check_boxes, :collection => @route.stop_points.map { |s| [s.stop_area.name, s.id.to_s]}, :input_html => (@journey_pattern.new_record? ? { :checked => 'checked' }:{}) %> <%= form.input :objectid, :input_html => { :disabled => !@journey_pattern.new_record? } %> <% end %> diff --git a/config/locales/journey_patterns.yml b/config/locales/journey_patterns.yml index 76c727f79..301c4b7e7 100644 --- a/config/locales/journey_patterns.yml +++ b/config/locales/journey_patterns.yml @@ -19,6 +19,8 @@ en: stop_points: "Stop point on journey pattern list" index: title: Journey Patterns + form: + warning: "Be careful, selection is also applied to the %{count} vehicle journeys associated to this journey pattern" activerecord: models: journey_pattern: @@ -59,6 +61,8 @@ fr: stop_points: "Liste des arrêts de la mission" index: title: Missions + form: + warning: "Attention, la sélection s'applique aussi aux %{count} courses de la mission" activerecord: models: journey_pattern: |