Fix locales design and bugs Refs #0035551 #0035504

8 files changed, 19 insertions, 20 deletions

diff --git a/app/views/export_tasks/_fields_gtfs_export.html.erb b/app/views/export_tasks/_fields_gtfs_export.html.erb
index 3ec95c181..b5dca732b 100644
--- a/app/views/export_tasks/_fields_gtfs_export.html.erb
+++ b/app/views/export_tasks/_fields_gtfs_export.html.erb
@@ -1,2 +1,2 @@
-<%= form.input :time_zone, :as => :time_zone, :input_html => { :title => t("formtastic.titles.export.time_zone")} %>
-<%= form.input :object_id_prefix, :input_html => { :value => @referential.prefix ,:title => t("formtastic.titles.export.object_id_prefix")} %>
\ No newline at end of file
+<%= form.input :time_zone, :as => :time_zone, :input_html => { :title => t("formtastic.titles.export_task.time_zone")} %>
+<%= form.input :object_id_prefix, :input_html => { :value => @referential.prefix ,:title => t("formtastic.titles.export_task.object_id_prefix")} %>
diff --git a/app/views/export_tasks/_fields_hub_export.html.erb b/app/views/export_tasks/_fields_hub_export.html.erb
index fc7cf7112..48e9ef172 100644
--- a/app/views/export_tasks/_fields_hub_export.html.erb
+++ b/app/views/export_tasks/_fields_hub_export.html.erb
@@ -1,2 +1,2 @@
-<%= form.input :start_date, :as => :date_picker, :input_html => { :title => t("formtastic.titles.export.start_date")} %>
-<%= form.input :end_date, :as => :date_picker, :input_html => { :title => t("formtastic.titles.export.end_date")} %>
+<%= form.input :start_date, :as => :date_picker, :input_html => { :title => t("formtastic.titles.export_task.start_date")} %>
+<%= form.input :end_date, :as => :date_picker, :input_html => { :title => t("formtastic.titles.export_task.end_date")} %>
diff --git a/app/views/export_tasks/_fields_neptune_export.html.erb b/app/views/export_tasks/_fields_neptune_export.html.erb
index 57826d972..e1ef631a5 100644
--- a/app/views/export_tasks/_fields_neptune_export.html.erb
+++ b/app/views/export_tasks/_fields_neptune_export.html.erb
@@ -1,4 +1,4 @@
-<%= form.input :start_date, :as => :date_picker, :input_html => { :title => t("formtastic.titles.export.start_date")} %>
-<%= form.input :end_date, :as => :date_picker, :input_html => { :title => t("formtastic.titles.export.end_date")} %>
+<%= form.input :start_date, :as => :date_picker, :input_html => { :title => t("formtastic.titles.export_task.start_date")} %>
+<%= form.input :end_date, :as => :date_picker, :input_html => { :title => t("formtastic.titles.export_task.end_date")} %>
 <%= form.input :projection_type, :as => :hidden, :input_html => { :value => @referential.projection_type || "" } %>	  
 <%= form.input :extensions , :as => :boolean%>
diff --git a/app/views/exports/_export.erb b/app/views/exports/_export.erb
index 5cf924960..7d8e24e39 100644
--- a/app/views/exports/_export.erb
+++ b/app/views/exports/_export.erb
@@ -14,7 +14,7 @@
     </div>
   </div>
   <div class="panel-body">
-    <p><%= link_to( image_tag("icons/file_#{export.filename_extension}.png") + t("exports.show.exported_file"), exported_file_referential_export_path(@referential, export.id) ) if export.file_path %></p>
+    <p><%= link_to( font_awesome_classic_tag("fa-file-#{export.filename_extension}-o") + t("exports.show.exported_file"), exported_file_referential_export_path(@referential, export.id) ) if export.file_path %></p>
   </div>
   <div class="panel-footer">
     <div class="history">
diff --git a/app/views/exports/show.html.erb b/app/views/exports/show.html.erb
index 7852635aa..d79b3f3cf 100644
--- a/app/views/exports/show.html.erb
+++ b/app/views/exports/show.html.erb
@@ -4,7 +4,7 @@
 
 <div class="export_show">
   <div class="links">
-    <%= link_to( image_tag("icons/file_#{@export.filename_extension}.png") + t("exports.show.exported_file"), exported_file_referential_export_path(@referential, @export.id) ) if @export.file_path %>
+    <%= link_to( font_awesome_classic_tag("fa-file-#{@export.filename_extension}-o") + t("exports.show.exported_file"), exported_file_referential_export_path(@referential, @export.id) ) if @export.file_path %>
   </div>
   <%= render( :partial => "shared/ie_report.html", :locals => { :referential => @referential, :job => @export} ) %>
 </div>
diff --git a/app/views/imports/_import.erb b/app/views/imports/_import.erb
index 717e51b75..b74c59e17 100644
--- a/app/views/imports/_import.erb
+++ b/app/views/imports/_import.erb
@@ -14,9 +14,9 @@
     </div>
   </div>
   <div class="panel-body">
-    <p><%= link_to image_tag("icons/file_#{import.filename_extension}.png") + t("imports.show.imported_file"), imported_file_referential_import_path(@referential, import.id) if import.file_path  %></p>
-    <p><%= link_to image_tag("icons/link_page.png") + t("imports.show.rule_parameter_set"), rule_parameter_set_referential_import_path(@referential, import.id) if import.rule_parameter_set %></p>
-    <p><%= link_to image_tag("icons/link_page.png") + t("imports.show.compliance_check"), compliance_check_referential_import_path(@referential, import.id) if import.compliance_check %></p>
+    <p><%= 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?  %></p>
+    <p><%= link_to font_awesome_classic_tag("fa-external-link") + t("imports.show.rule_parameter_set"), rule_parameter_set_referential_import_path(@referential, import.id) if import.rule_parameter_set? %></p>
+    <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">  
     <div class="history">
diff --git a/app/views/imports/show.html.erb b/app/views/imports/show.html.erb
index 4e94f111d..025580c34 100644
--- a/app/views/imports/show.html.erb
+++ b/app/views/imports/show.html.erb
@@ -4,9 +4,9 @@
 
 <div class="import_show">
   <div class="links">
-    <%= link_to image_tag("icons/file_#{@import.filename_extension}.png") + t("imports.show.imported_file"), imported_file_referential_import_path(@referential, @import.id) if @import.file_path %>
-    <%= link_to image_tag("icons/link_page.png") + t("imports.show.rule_parameter_set"), rule_parameter_set_referential_import_path(@referential, @import.id) if @import.rule_parameter_set %>
-    <%= link_to image_tag("icons/link_page.png") + t("imports.show.compliance_check"), compliance_check_referential_import_path(@referential, @import.id) if @import.compliance_check %>
+    <%= 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? %>
+    <%= link_to font_awesome_classic_tag("fa-external-link") + t("imports.show.rule_parameter_set"), rule_parameter_set_referential_import_path(@referential, @import.id) if @import.rule_parameter_set? %>
+    <%= 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? %>
   </div>
   <%= render( :partial => "shared/ie_report.html", :locals => { :referential => @referential, :job => @import} ) %>
 </div>
diff --git a/app/views/shared/_ie_report.html.erb b/app/views/shared/_ie_report.html.erb
index b8d09ccd4..51cb51706 100644
--- a/app/views/shared/_ie_report.html.erb
+++ b/app/views/shared/_ie_report.html.erb
@@ -35,8 +35,8 @@
     <table class="table table-hover table-striped" data-label="<%= t('.graph.lines.objects_label') %>" data-total-lines="<%= job.report.lines %>" data-total-routes="<%= job.report.routes %>" data-total-connection_links="<%= job.report.connection_links %>", data-total-time_tables="<%= job.report.time_tables %>" data-total-stop_areas="<%= job.report.stop_areas %>" data-total-access_points="<%= job.report.access_points %>" data-total-vehicle_journeys="<%= job.report.vehicle_journeys %>" data-total-journey_patterns="<%= job.report.journey_patterns %>" >
       <thead>
         <tr>
+	  <th class="save"><%= t(".table.line.save") %></th>
           <th class="lines"><%= t(".table.line.lines") %></th>
-          <th class="save"><%= t(".table.line.save") %></th>
           <th class="routes"><%= t(".table.line.routes") %></th>
           <th class="connection_links"><%= t(".table.line.connection_links") %></th>
           <th class="time_tables"><%= t(".table.line.time_tables") %></th>
@@ -47,11 +47,10 @@
         </tr>
       </thead>
       <tbody>
-        <% job.report.line_items.each_with_index do |line_item, index| %>
-          <% tr_class = (line_item.status == "saved") ? '' : 'class=\'danger\''%>
-          <tr <%=  tr_class %>>
-            <td><%= line_item.name %></td>
-            <td><%= t(".table.line." + line_item.status ) %></td>
+        <% job.report.line_items.each_with_index do |line_item, index| %>          
+          <tr>
+	    <td><%= line_item.status ? font_awesome_classic_tag("fa-check") : font_awesome_classic_tag("fa-times")  %></td>
+            <td><%= line_item.name %></td>            
             <td><%= line_item.routes %></td>
             <td><%= line_item.connection_links %></td>
             <td><%= line_item.time_tables %></td>