diff options
| -rw-r--r-- | app/views/lines/_form.html.slim | 32 | ||||
| -rw-r--r-- | app/views/shared/_lines_search_form.html.slim | 4 | ||||
| -rw-r--r-- | config/locales/lines.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/lines.fr.yml | 2 |
4 files changed, 23 insertions, 17 deletions
diff --git a/app/views/lines/_form.html.slim b/app/views/lines/_form.html.slim index cbb50ae28..d7b5a65ed 100644 --- a/app/views/lines/_form.html.slim +++ b/app/views/lines/_form.html.slim @@ -1,21 +1,21 @@ = semantic_form_for [@line_referential, @line] do |form| = 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, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@line_referential)}.line.name") } - = form.input :published_name - = form.input :registration_number, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@line_referential)}.line.registration_number")} - = form.input :number, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@line_referential)}.line.number") } - = form.input :transport_mode, include_blank: false - = form.input :color, as: :string - = form.input :text_color - = form.input :stable_id - = form.input :url - = 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#{format_restriction_for_locales(@line_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 } + / = 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, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@line_referential)}.line.name") } + / = form.input :published_name + / = form.input :registration_number, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@line_referential)}.line.registration_number")} + / = form.input :number, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@line_referential)}.line.number") } + / = form.input :transport_mode, include_blank: false + / = form.input :color, as: :string + / = form.input :text_color + / = form.input :stable_id + / = form.input :url + / = 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#{format_restriction_for_locales(@line_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 } .footnotes_block h3 = t("footnotes.index.title") diff --git a/app/views/shared/_lines_search_form.html.slim b/app/views/shared/_lines_search_form.html.slim index ec355ad8e..c12ee132b 100644 --- a/app/views/shared/_lines_search_form.html.slim +++ b/app/views/shared/_lines_search_form.html.slim @@ -19,4 +19,6 @@ .col-xs-3 = f.select(:company_id_eq, referential.companies.collect { |c| [c.name, c.id] }.unshift([t("lines.index.no_networks"), -1]), { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t("lines.index.all_companies") }) .col-xs-3 - = f.select(:transport_mode_eq, Chouette::Line.transport_mode.values.collect { |v| [ I18n.t("enumerize.line.transport_mode.#{v}"), v] }.unshift([t("lines.index.no_transport_modes"), -1]), { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t("lines.index.all_transport_modes") }) + = f.select(:transport_mode_eq, Chouette::Line.transport_mode.values.collect { |v| [ I18n.t("enumerize.line.transport_mode.#{v}"), v] }.unshift([t("lines.index.no_transport_modes"), -1]), { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t("lines.index.all_transport_modes") }) + .col-xs-3 + = f.select(:transport_submode_eq, Chouette::Line.transport_submode.values.collect { |v| [ I18n.t("enumerize.line.transport_submode.#{v}"), v] }.unshift([t("lines.index.no_transport_submodes"), -1]), { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t("lines.index.all_transport_submodes") }) diff --git a/config/locales/lines.en.yml b/config/locales/lines.en.yml index 4f8392196..748064c3d 100644 --- a/config/locales/lines.en.yml +++ b/config/locales/lines.en.yml @@ -30,10 +30,12 @@ en: no_companies: "No companies" no_group_of_lines: "No group of lines" no_transport_modes: No transport mode + no_transport_submodes: No transport sub mode all_networks: "All networks" all_companies: "All companies" all_group_of_lines: "All group of lines" all_transport_modes: All transport modes + all_transport_submodes: All transport sub modes multi_selection: "Multiple selection" multi_selection_enable: "Enable multiple selection" multi_selection_disable: "Disable multiple selection" diff --git a/config/locales/lines.fr.yml b/config/locales/lines.fr.yml index 46508d083..b328b7885 100644 --- a/config/locales/lines.fr.yml +++ b/config/locales/lines.fr.yml @@ -30,10 +30,12 @@ fr: no_companies: "Aucun transporteurs" no_group_of_lines: "Aucun groupes de ligne" no_transport_modes: Aucun mode de transport + no_transport_submodes: Aucun sous mode de transport all_networks: "Tous les réseaux" all_companies: "Tous les transporteurs" all_group_of_lines: "Tous les groupes de ligne" all_transport_modes: Tous les modes de transport + all_transport_submodes: Tous les sous modes de transport multi_selection: "Sélection multiple" multi_selection_enable: "Activer la sélection multiple" multi_selection_disable: "Désactiver la sélection multiple" |