Merge branch 'master' of github.com:afimb/chouette2

6 files changed, 18 insertions, 26 deletions

diff --git a/app/views/devise/mailer/invitation_instructions.html.erb b/app/views/devise/mailer/invitation_instructions.html.erb
deleted file mode 100644
index a3fa4e314..000000000
--- a/app/views/devise/mailer/invitation_instructions.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<p>Hello <%= @resource.email %>!</p>
-
-<p>Someone has invited you to <%= root_url %>, you can accept it through the link below.</p>
-
-<p><%= link_to 'Accept invitation', accept_invitation_url(@resource, :invitation_token => @resource.invitation_token) %></p>
-
-<p>If you don't want to accept the invitation, please ignore this email.<br />
-Your account won't be created until you access the link above and set your password.</p>
diff --git a/app/views/import_tasks/_import_task.erb b/app/views/import_tasks/_import_task.erb
index 5f2326209..d6c27e3b3 100644
--- a/app/views/import_tasks/_import_task.erb
+++ b/app/views/import_tasks/_import_task.erb
@@ -8,7 +8,7 @@
       <li class="remove"><%= link_to "<i class='fa fa-trash-o'></i>".html_safe, referential_import_task_path(@referential, import_task), :method => :delete, :class => "delete", :data => {:confirm =>  t('import_tasks.actions.destroy_confirm')} %></li>
     </ul>
     <div class="links">
-      <p><%= link_to image_tag("icons/file_#{import_task.file_path_extension}.png") + t("import_tasks.index.imported_file"), file_to_import_referential_import_task_path(@referential, import_task) %></p>
+      <p><%= link_to image_tag("icons/file_#{import_task.file_path_extension}.png") + t("import_tasks.show.imported_file"), file_to_import_referential_import_task_path(@referential, import_task) %></p>
       <% if import_task.compliance_check_task.present? %>
         <p><%= link_to image_tag( compliance_icon( import_task)) + t("import_tasks.compliance_check_task"), referential_compliance_check_task_path(@referential, import_task.compliance_check_task) %></p>
       <% end %>
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index 86f141428..387221103 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -12,13 +12,13 @@
   </style>
 
   <h1 style="background: #61970B; height: 75px; font-size: 24px; font-weight: normal; color: white; padding: 20px 0 0 30px;">Chouette</h1>
-  
+
   <div style="background: white; margin-bottom: 10px; padding: 15px; -moz-box-shadow: 3px 3px 4px #bbbbbb; -webkit-box-shadow: 3px 3px 4px #BBB; box-shadow: 3px 3px 4px #BBB; border-right: 1px solid #BBB; border-bottom: 1px solid #BBB;">
     <%= yield %>
   </div>
 
   <div style="color: #333333; text-align:center; font-size: 10px;">
-    Envoyé par <a href="/">Chouette</a>
+    Envoyé par <%= link_to root_url, "Chouette" %>
   </div>
 </body>
 </html>
diff --git a/app/views/lines/index.html.erb b/app/views/lines/index.html.erb
index 3014827af..5f8f756d8 100644
--- a/app/views/lines/index.html.erb
+++ b/app/views/lines/index.html.erb
@@ -1,4 +1,4 @@
-<%= title_tag t('lines.index.title') %> 
+<%= title_tag t('lines.index.title') %>
 
 <%= search_form_for @q, :url => referential_lines_path(@referential), :html => {:method => :get} do |f| %>
   <%= f.label :name_or_number_cont, "#{t('.name_or_number')} :" %>
@@ -42,7 +42,7 @@
 
 <% content_for :sidebar do %>
 <ul class="actions">
-  <li><%= link_to t('lines.actions.new'), new_referential_line_path(@referential), :class => "add" %></li> 
+  <li><%= link_to t('lines.actions.new'), new_referential_line_path(@referential), :class => "add" %></li>
 </ul>
 
 <h4><%= t(".selection") %></h4>
@@ -67,7 +67,6 @@
 
 <% if  @referential.group_of_lines.count > 0 %>
 	<h5><%= Chouette::GroupOfLine.model_name.human.pluralize %></h5>
-	
 	<ul class="selection">
 	<% @referential.group_of_lines.each do |group_of_line| %>
 	<li><%= link_with_search group_of_line.name, "group_of_lines_id_eq" => group_of_line.id %></li>
@@ -84,13 +83,13 @@
 
   <div class="enabled" style="display: none;">
     <a class="disable" href="#"><%= t(".multi_selection_disable") %></a>
-    
+
     <ul class="actions">
-       <li><%= link_to t(".delete_selected"), referential_lines_path(@referential), "data-multiple-method" => "delete", :class => "remove" %></li>
+      <%= link_to t(".delete_selected"), referential_lines_path(@referential), "data-multiple-method" => "delete", :class => "remove", :confirm => t("lines.actions.destroy_selection_confirm") %>
     </ul>
 
     <a class="select_all" href="#"><%= t(".select_all") %></a> | <a class="deselect_all" href="#"><%= t(".deselect_all") %></a>
-  </div> 
+  </div>
 </div>
 
 <% end %>
diff --git a/config/locales/import_tasks.yml b/config/locales/import_tasks.yml
index 7ae667830..f927a1f4b 100644
--- a/config/locales/import_tasks.yml
+++ b/config/locales/import_tasks.yml
@@ -99,7 +99,6 @@ fr:
     index:
       title: "Imports"
       warning: ""
-      imported_file: "Fichier importé"
     show:
       report: "Rapport"
       not_yet_started: "En file d'attente"
diff --git a/config/locales/lines.yml b/config/locales/lines.yml
index 2fd55d4bc..ade5bb2cf 100644
--- a/config/locales/lines.yml
+++ b/config/locales/lines.yml
@@ -5,6 +5,7 @@ en:
       edit: "Edit this line"
       destroy: "Remove this line"
       destroy_confirm: "Are you sure you want destroy this line?"
+      destroy_selection_confirm: "Are you sure you want destroy those lines?"
       import: "Import lines"
       export_kml: "Export KML line"
       export__kml_all: "Export KML lines"
@@ -33,9 +34,9 @@ en:
       group_of_lines: "Associated groups of lines"
       no_group_of_line: "No group of line"
       several_group_of_lines: "%{count} groups of lines"
-  activerecord:        
-    models:        
-      line: 
+  activerecord:
+    models:
+      line:
         zero:  "line"
         one:   "line"
         other: "lines"
@@ -53,11 +54,11 @@ en:
         objectid: "Neptune identifier"
         object_version: "Version"
         creation_time: "Created on"
-        creator_id: "Created by" 
+        creator_id: "Created by"
   formtastic:
     hints:
       line:
-        registration_number: "only alphanumerical or underscore characters" 
+        registration_number: "only alphanumerical or underscore characters"
         objectid: "[prefix]:Line:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
 
 fr:
@@ -67,6 +68,7 @@ fr:
       edit: "Modifier cette ligne"
       destroy: "Supprimer cette ligne"
       destroy_confirm: "Etes vous sûr de supprimer cette ligne ?"
+      destroy_selection_confirm: "Etes vous sûr de supprimer cette sélection de lignes ?"
       import: "Importer des lignes"
       export_kml: "Export KML de la ligne"
       export_kml_all: "Export KML des lignes"
@@ -95,8 +97,8 @@ fr:
       group_of_lines: "Groupes de lignes associés"
       no_group_of_line: "Aucun groupe de lignes"
       several_group_of_lines: "%{count} groupes of lignes"
-  activerecord:        
-    models:        
+  activerecord:
+    models:
       line:
         zero:  "ligne"
         one:   "ligne"
@@ -119,5 +121,5 @@ fr:
   formtastic:
     hints:
       line:
-        registration_number: "caractères autorisés : alphanumériques et 'souligné'" 
+        registration_number: "caractères autorisés : alphanumériques et 'souligné'"
         objectid: "[prefixe]:Line:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"