diff options
| -rw-r--r-- | app/views/import_tasks/_fields_gtfs_import.html.erb | 8 | ||||
| -rw-r--r-- | app/views/import_tasks/_fields_gtfs_import.html.slim | 6 | ||||
| -rw-r--r-- | app/views/import_tasks/_fields_neptune_import.html.slim (renamed from app/views/import_tasks/_fields_neptune_import.html.erb) | 0 | ||||
| -rw-r--r-- | app/views/import_tasks/_fields_netex_import.slim (renamed from app/views/import_tasks/_fields_netex_import.erb) | 0 | ||||
| -rw-r--r-- | app/views/import_tasks/new.html.erb | 40 | ||||
| -rw-r--r-- | app/views/import_tasks/new.html.slim | 28 |
6 files changed, 34 insertions, 48 deletions
diff --git a/app/views/import_tasks/_fields_gtfs_import.html.erb b/app/views/import_tasks/_fields_gtfs_import.html.erb deleted file mode 100644 index 6c75f36da..000000000 --- a/app/views/import_tasks/_fields_gtfs_import.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -<%= form.input :references_type, :as => :select, :include_blank => t("import_tasks.new.all"), :input_html => { :title => t("formtastic.titles.import_task.references_type") } %> -<%= form.input :object_id_prefix, :input_html => { :value => @referential.prefix } %> -<%= form.input :max_distance_for_commercial , :as => :number , :input_html => { :title => t("formtastic.titles.import_task.max_distance_for_commercial"), :value => 0 } %> -<%= form.input :ignore_last_word , :as => :boolean , :input_html => { :title => t("formtastic.titles.import_task.ignore_last_word"), :value => false }%> -<%= form.input :ignore_end_chars , :as => :number , :input_html => { :title => t("formtastic.titles.import_task.ignore_end_chars"), :value => 0 }%> -<%= form.input :max_distance_for_connection_link , :as => :number , :input_html => { :title => t("formtastic.titles.import_task.max_distance_for_connection_link"), :value => 0 }%> - - diff --git a/app/views/import_tasks/_fields_gtfs_import.html.slim b/app/views/import_tasks/_fields_gtfs_import.html.slim new file mode 100644 index 000000000..8c2ef8ed8 --- /dev/null +++ b/app/views/import_tasks/_fields_gtfs_import.html.slim @@ -0,0 +1,6 @@ += form.input :references_type, as: :select, :include_blank => t("import_tasks.new.all"), :input_html => { :title => t("formtastic.titles.import_task.references_type") } += form.input :object_id_prefix, :input_html => { :value => @referential.prefix } += form.input :max_distance_for_commercial , as: :number , :input_html => { :title => t("formtastic.titles.import_task.max_distance_for_commercial"), :value => 0 } += form.input :ignore_last_word , as: :boolean , :input_html => { :title => t("formtastic.titles.import_task.ignore_last_word"), :value => false } += form.input :ignore_end_chars , as: :number , :input_html => { :title => t("formtastic.titles.import_task.ignore_end_chars"), :value => 0 } += form.input :max_distance_for_connection_link , as: :number , :input_html => { :title => t("formtastic.titles.import_task.max_distance_for_connection_link"), :value => 0 }
\ No newline at end of file diff --git a/app/views/import_tasks/_fields_neptune_import.html.erb b/app/views/import_tasks/_fields_neptune_import.html.slim index e69de29bb..e69de29bb 100644 --- a/app/views/import_tasks/_fields_neptune_import.html.erb +++ b/app/views/import_tasks/_fields_neptune_import.html.slim diff --git a/app/views/import_tasks/_fields_netex_import.erb b/app/views/import_tasks/_fields_netex_import.slim index e69de29bb..e69de29bb 100644 --- a/app/views/import_tasks/_fields_netex_import.erb +++ b/app/views/import_tasks/_fields_netex_import.slim diff --git a/app/views/import_tasks/new.html.erb b/app/views/import_tasks/new.html.erb deleted file mode 100644 index 303299f73..000000000 --- a/app/views/import_tasks/new.html.erb +++ /dev/null @@ -1,40 +0,0 @@ -<%= title_tag t(".title") %> - -<ul class="nav nav-pills"> - <% ImportTask.data_formats.each do |format| %> - <li role="presentation"> - <a href="#<%= format %>" class='<%= @import_task.data_format == format ? "#{format} active" : "#{format}" %>' - title='<%= t(:"enumerize.data_format_detail.#{format}")%>' - data-toggle="tab"><%= t(:"enumerize.data_format.#{format}") %> - </a> - </li> - <% end %> -</ul> - -<div class="tab-content"> - <% @available_imports.each do |import_task| %> - <%= semantic_form_for [@referential, import_task], :as => :import_task, :url => referential_import_tasks_path(@referential), - :namespace => import_task.data_format, :html => { :id => "#{import_task.data_format}", - :class => "tab-pane highlight" } do |form| %> - <%= form.inputs do %> - <%= form.input :user_name, :as => :hidden, :input_html => { :value => current_user.name } %> - <%= form.input :user_id, :as => :hidden, :input_html => { :value => current_user.id } %> - <%= form.input :data_format, :as => :hidden %> - <%= form.input :referential_id, :as => :hidden, :input_html => { :value => @referential.id } %> - <%= form.input :name %> - <%= form.input :no_save, :as => :boolean %> - <%= form.input :rule_parameter_set_id, :as => :select, - :collection => @referential.organisation.rule_parameter_sets.map { |rps| [ rps.name, rps.id ] }, - :include_blank => true %> - <%= form.input :resources, :as => :file %> - <% end %> - <%= render partial: "fields_#{import_task.data_format}_import", :locals => { :form => form } %> - <%= form.actions do %> - <%= form.action :submit, :as => :button , :label => t( 'formtastic.import' ) %> - <%= form.action :cancel, :as => :link %> - <% end %> - <% end %> - <% end %> -</div> - -<%= javascript_include_tag new_referential_import_task_path(@referential, :format => :js) %> diff --git a/app/views/import_tasks/new.html.slim b/app/views/import_tasks/new.html.slim new file mode 100644 index 000000000..b4b77d344 --- /dev/null +++ b/app/views/import_tasks/new.html.slim @@ -0,0 +1,28 @@ += title_tag t(".title") + +ul.nav.nav-pills + - ImportTask.data_formats.each do |format| + li role="presentation" + a href="##{format}" class="#{@import_task.data_format == format ? "#{format} active" : "#{format}" }" title="#{t(:"enumerize.data_format_detail.#{format}")}" data-toggle="tab" + = t(:"enumerize.data_format.#{format}") + +.tab-content + - @available_imports.each do |import_task| + = semantic_form_for [@referential, import_task], as: :import_task, :url => referential_import_tasks_path(@referential), :namespace => import_task.data_format, :html => { :id => "#{import_task.data_format}", class: 'tab-pane highlight' } do |form| + = form.inputs do + = form.input :user_name, as: :hidden, :input_html => { :value => current_user.name } + = form.input :user_id, as: :hidden, :input_html => { :value => current_user.id } + = form.input :data_format, as: :hidden + = form.input :referential_id, as: :hidden, :input_html => { :value => @referential.id } + = form.input :name + = form.input :no_save, as: :boolean + = form.input :rule_parameter_set_id, as: :select, :collection => @referential.organisation.rule_parameter_sets.map { |rps| [ rps.name, rps.id ] }, :include_blank => true + = form.input :resources, as: :file + + = render partial: "fields_#{import_task.data_format}_import", :locals => { :form => form } + + = form.actions do + = form.action :submit, as: :button , :label => t( 'formtastic.import' ) + = form.action :cancel, as: :link + += javascript_include_tag new_referential_import_task_path(@referential, :format => :js)
\ No newline at end of file |
