Create ImportsHelper#import_attributes_tag and use it in imports#show

4 files changed, 56 insertions, 22 deletions

diff --git a/app/assets/stylesheets/main/imports.css.scss b/app/assets/stylesheets/main/imports.css.scss
index 46942feee..bd11332f6 100644
--- a/app/assets/stylesheets/main/imports.css.scss
+++ b/app/assets/stylesheets/main/imports.css.scss
@@ -3,10 +3,6 @@
         .panel-footer {
             min-height: 5.5em;
 
-            .save-mode, .format {
-                display: inline-block;
-            }
-
             .save-mode {
                 color: $brand-info;
                 .fa-lg {
@@ -24,9 +20,33 @@
     }
 }
 
+#workspace.imports.index, #workspace.imports.show {
+    .import-attributes {
+        .save-mode, .format {
+            display: inline-block;
+        }
+
+        .save-mode {
+            color: $brand-info;
+            .fa-ban {
+                opacity: 0.6;
+            }
+            .fa-stack {
+                font-size: 0.9em;
+            }
+            margin-left: 0.3em;
+        }
+    }
+}
+
 #workspace.imports.show {
     @import "../partials/ie_report";
     @import "../modules/job_status_colors";
     @import "../modules/job_status_title";
     @import "../modules/links";
+
+    .import-attributes {
+        font-size: 1.7em;
+        margin-top: 20px;
+    }
 }
diff --git a/app/helpers/imports_helper.rb b/app/helpers/imports_helper.rb
index 5f771f77f..5f9db3fb1 100644
--- a/app/helpers/imports_helper.rb
+++ b/app/helpers/imports_helper.rb
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 module ImportsHelper
-  
+
   def fields_for_import_task_format(form)
     begin
       render :partial => import_partial_name(form), :locals => { :form => form }
@@ -8,11 +8,11 @@ module ImportsHelper
       ""
     end
   end
-  
+
   def import_partial_name(form)
     "fields_#{form.object.format.underscore}_import"
   end
-  
+
   def compliance_icon( import_task)
     return nil unless import_task.compliance_check_task
     import_task.compliance_check_task.tap do |cct|
@@ -22,6 +22,25 @@ module ImportsHelper
         return 'icons/link_page.png'
       end
     end
-  end    
+  end
+
+  def import_attributes_tag(import)
+    content_tag :div, class: "import-attributes" do
+      [].tap do |parts|
+        if import.format.present?
+          parts << bh_label(t("enumerize.data_format.#{import.format}"))
+        end
+        parts << content_tag(:div, import_save_mode_icon_tag(import), class: "save-mode")
+      end.join.html_safe
+    end
+  end
+
+  def import_save_mode_icon_tag(import)
+    if import.no_save?
+      fa_stacked_icon "database", base: "ban"
+    else
+      fa_icon "database"
+    end
+  end
 
 end
diff --git a/app/views/imports/_import.erb b/app/views/imports/_import.erb
index 744fbcbdb..52ef5fc3d 100644
--- a/app/views/imports/_import.erb
+++ b/app/views/imports/_import.erb
@@ -18,17 +18,7 @@
     <p><%= link_to font_awesome_classic_tag("fa-external-link") + t("imports.show.compliance_check"), compliance_check_referential_import_path(@referential, import.id) if import.compliance_check? %></p>
   </div>
   <div class="panel-footer">
-    <% if import.format.present? %>
-      <div class="format"><span class='label label-default'><%= t("enumerize.data_format.#{import.format}") %></span></div>
-    <% end %>
-
-    <div class="save-mode">
-      <% if import.no_save? %>
-      <span class="fa-stack fa-lg"><i class="fa fa-database fa-stack-1x"></i><i class="fa fa-ban fa-stack-2x"></i></span>
-      <% else %>
-      <span class="fa-lg"><i class="fa fa-database"></i></span>
-      <% end %>
-    </div>
+    <%= import_attributes_tag(import) %>
 
     <div class="history">
       <%=  l(import.created_at, :format => "%d/%m/%Y %H:%M") if import.created_at %> | <%= import.user_name %>
diff --git a/app/views/imports/show.html.erb b/app/views/imports/show.html.erb
index 226c9ea77..3bdae3e2a 100644
--- a/app/views/imports/show.html.erb
+++ b/app/views/imports/show.html.erb
@@ -1,5 +1,10 @@
-<div class="test">
-  <%= title_tag job_status_title(@import) %>
+<div class="title row">
+  <div class="col-md-8">
+    <%= title_tag job_status_title(@import) %>
+  </div>
+  <div class="col-md-4">
+    <%= import_attributes_tag(@import) %>
+  </div>
 </div>
 <% if @import.report.failure_code? %>
 <div class="alert alert-danger">
@@ -8,7 +13,7 @@
 <% end %>
 <div class="progress_bars">
   <%= progress_bar_tag(@import) %>
-</div>  
+</div>
 <div class="import_show">
   <div class="links">
     <%= link_to font_awesome_classic_tag("fa-file-#{@import.filename_extension}-o") + t("imports.show.imported_file"), imported_file_referential_import_path(@referential, @import.id) if @import.file_path? %>