8 files changed, 31 insertions, 21 deletions
diff --git a/app/views/import_tasks/_fields_csv_import.erb b/app/views/import_tasks/_fields_csv_import.erb
deleted file mode 100644
index b4ae719a5..000000000
--- a/app/views/import_tasks/_fields_csv_import.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= form.input :object_id_prefix, :input_html => { :value => @referential.prefix } %>
diff --git a/app/views/import_tasks/_fields_gtfs_import.erb b/app/views/import_tasks/_fields_gtfs_import.html.erb
index 8b9dabcc5..1fef43584 100644
--- a/app/views/import_tasks/_fields_gtfs_import.erb
+++ b/app/views/import_tasks/_fields_gtfs_import.html.erb
@@ -1,3 +1,4 @@
+<%= form.input :references_type, :as => :select, :include_blank => false, :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 }%>
diff --git a/app/views/import_tasks/_fields_neptune_import.html.erb b/app/views/import_tasks/_fields_neptune_import.html.erb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/app/views/import_tasks/_fields_neptune_import.html.erb
diff --git a/app/views/import_tasks/_fields_netex_import.erb b/app/views/import_tasks/_fields_netex_import.erb
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/app/views/import_tasks/_fields_netex_import.erb
diff --git a/app/views/import_tasks/_import_task.html.erb b/app/views/import_tasks/_import_task.html.erb
deleted file mode 100644
index c277d429a..000000000
--- a/app/views/import_tasks/_import_task.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<%= form.input :referential_id, :as => :hidden, :value => @referential.id %>
-<%= form.input :user_id, :as => :hidden, :value => current_user.id %>
-<%= form.input :user_name, :as => :hidden, :value => current_user.name %>  
-<%= form.input :format, :as => :hidden %>
-<%= form.input :name %>      
-<%= form.input :no_save, :as => :boolean, :collection => [true, false] %>  
-<%= 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 %>
-<% unless import_task.references_types.empty? %>
-  <p class="warning"><%= t('.'+import_partial_name(form)+'.warning')%></p>
-  <%= form.input :references_type, :as => :select, :collection => import_task.references_types.map { |c| [ c.model_name.human.capitalize.pluralize, c.name ] }, :include_blank => t(".all") %>
-<% end %>    
diff --git a/app/views/import_tasks/_neptune_import.html.erb b/app/views/import_tasks/_neptune_import.html.erb
deleted file mode 100644
index 37f0bddbd..000000000
--- a/app/views/import_tasks/_neptune_import.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= yield %>
diff --git a/app/views/import_tasks/new.html.erb b/app/views/import_tasks/new.html.erb
index e1bbe34f8..b0155cd9f 100644
--- a/app/views/import_tasks/new.html.erb
+++ b/app/views/import_tasks/new.html.erb
@@ -1,11 +1,33 @@
 <%= title_tag t(".title") %>
 
-<%= semantic_form_for [@referential, @neptune_import], :as => :import_task, :url => referential_import_tasks_path(@referential), :html => { :id => "neptune_import_new" }, multipart: true do |form| %>
+<ul class="nav nav-pills">
+  <% ImportTask.data_formats.each do |format| %>  
+  <li role="presentation"><a href="#<%= format %>" class="<%= 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 :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 %>
 
-  <%= render :partial => "import_task", :layout => "neptune_import", :locals => { :import_task => @neptune_import, :form => form } %>
-	
-  <%= form.actions do %>
-    <%= form.action :submit, :as => :button , :label => t( 'formtastic.import' ) %>
-    <%= form.action :cancel, :as => :link %>
   <% end %>
 <% end %>
+</div>
+
+<%= javascript_include_tag new_referential_import_task_path(@referential, :format => :js) %>
diff --git a/app/views/import_tasks/new.js.coffee b/app/views/import_tasks/new.js.coffee
new file mode 100644
index 000000000..9bd560b16
--- /dev/null
+++ b/app/views/import_tasks/new.js.coffee
@@ -0,0 +1,2 @@
+jQuery ->
+  $('#workspace.import_tasks .nav a:first').tab('show')