From 18a4f9ca2b747218d2cb1ad23283f4096dba4656 Mon Sep 17 00:00:00 2001 From: Zakaria BOUZIANE Date: Tue, 3 Mar 2015 17:37:09 +0100 Subject: Tooltip for HUB constrained referentials --- app/views/connection_links/_form.erb | 2 +- app/views/group_of_lines/_form.erb | 6 +++--- app/views/journey_patterns/_form.html.erb | 6 +++--- app/views/lines/_form.erb | 8 ++++---- app/views/networks/_form.erb | 6 +++--- app/views/routes/_form.html.erb | 2 +- app/views/stop_areas/_form.html.erb | 28 ++++++++++++++-------------- app/views/time_tables/_form.erb | 4 ++-- app/views/vehicle_journeys/_form.html.erb | 2 +- config/locales/companies.yml | 12 +++++++++--- config/locales/connection_links.yml | 6 ++++++ config/locales/group_of_lines.yml | 10 ++++++++++ config/locales/journey_patterns.yml | 10 ++++++++++ config/locales/lines.yml | 12 ++++++++++++ config/locales/networks.yml | 10 ++++++++++ config/locales/routes.yml | 6 ++++++ config/locales/stop_areas.yml | 22 ++++++++++++++++++++++ config/locales/time_tables.yml | 8 ++++++++ config/locales/vehicle_journeys.yml | 6 ++++++ 19 files changed, 131 insertions(+), 35 deletions(-) diff --git a/app/views/connection_links/_form.erb b/app/views/connection_links/_form.erb index 54ac7088e..0620dcc94 100644 --- a/app/views/connection_links/_form.erb +++ b/app/views/connection_links/_form.erb @@ -4,7 +4,7 @@ <%= form.input :name %> <%= form.input :connection_link_type, :as => :select, :collection => Chouette::ConnectionLink.connection_link_types, :include_blank => false, :member_label => Proc.new { |type| t("connection_link_types.label.#{type}") } %> <%= form.input :comment %> - <%= form.input :link_distance %> + <%= form.input :link_distance, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.connection_link.link_distance") } %> <%= form.input :mobility_restricted_suitability,:as => :boolean %> <%= form.input :stairs_availability,:as => :boolean %> <%= form.input :lift_availability,:as => :boolean %> diff --git a/app/views/group_of_lines/_form.erb b/app/views/group_of_lines/_form.erb index 9482248b6..d9c033a37 100644 --- a/app/views/group_of_lines/_form.erb +++ b/app/views/group_of_lines/_form.erb @@ -1,9 +1,9 @@ <%= semantic_form_for [@referential, @group_of_line] do |form| %> <%= form.inputs do %> - <%= form.input :name %> - <%= form.input :registration_number %> + <%= form.input :name, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.group_of_lines.name") } %> + <%= form.input :registration_number, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.group_of_lines.registration_number") } %> <%= form.input :comment %> - <%= form.input :objectid, :required => !@group_of_line.new_record?, :input_html => { :title => t("formtastic.titles.group_of_line.objectid")} %> + <%= form.input :objectid, :required => !@group_of_line.new_record?, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.group_of_lines.objectid") } %> <% end %> <%= form.inputs do %> diff --git a/app/views/journey_patterns/_form.html.erb b/app/views/journey_patterns/_form.html.erb index 361f7f380..f57556577 100644 --- a/app/views/journey_patterns/_form.html.erb +++ b/app/views/journey_patterns/_form.html.erb @@ -1,11 +1,11 @@ <%= semantic_form_for [@referential, @line, @route, @journey_pattern] do |form| %> <%= form.inputs do %> - <%= form.input :name %> + <%= form.input :name, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.journey_pattern.name") } %> <%= form.input :published_name %> - <%= form.input :registration_number %> + <%= form.input :registration_number, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.journey_pattern.registration_number") } %> <%= form.input :comment %> <%= 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, :required => !@journey_pattern.new_record?, :input_html => { :title => t("formtastic.titles.journey_pattern.objectid")} %> + <%= form.input :objectid, :required => !@journey_pattern.new_record?, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.journey_pattern.objectid") } %> <% end %> <%= form.actions do %> diff --git a/app/views/lines/_form.erb b/app/views/lines/_form.erb index 489aeba97..eb31f8dc1 100644 --- a/app/views/lines/_form.erb +++ b/app/views/lines/_form.erb @@ -3,10 +3,10 @@ <%= form.inputs do %> <%= form.input :network, :as => :select, :collection => Chouette::Network.all, :include_blank => false %> <%= form.input :company, :as => :select, :collection => Chouette::Company.all, :include_blank => false%> - <%= form.input :name %> + <%= form.input :name, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.line.name") } %> <%= form.input :published_name %> - <%= form.input :registration_number, :input_html => { :title => t("formtastic.titles.line.registration_number")} %> - <%= form.input :number %> + <%= form.input :registration_number, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.line.registration_number")} %> + <%= form.input :number, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.line.number") } %> <%= form.input :transport_mode, :as => :select, :collection => Chouette::Line.transport_modes, :include_blank => false, :member_label => Proc.new { |mode| t("transport_modes.label.#{mode}") } %> <%= form.input :color, :as => :string %> <%= form.input :text_color %> @@ -14,7 +14,7 @@ <%= form.input :mobility_restricted_suitability, :as => :select, :collection => [[@line.human_attribute_name("accessible"), true], [@line.human_attribute_name("not_accessible"), false]], :include_blank => true %> <%= form.input :flexible_service, :as => :select, :collection => [[@line.human_attribute_name("on_demaond_fs"), true], [@line.human_attribute_name("regular_fs"), false]], :include_blank => true %> <%= form.input :comment %> - <%= form.input :objectid, :required => !@line.new_record?, :input_html => { :title => t("formtastic.titles.line.objectid")} %> + <%= form.input :objectid, :required => !@line.new_record?, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.line.objectid")} %> <%= form.input :group_of_line_tokens, :label => t('.group_of_lines'), :as => :text, :input_html => { :"data-pre" => ( @line.group_of_lines.map { |group_of_line| { :id => group_of_line.id, :name => group_of_line.name } } ).to_json } %>