Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2

10 files changed, 49 insertions, 11 deletions

diff --git a/app/views/connection_links/show.html.erb b/app/views/connection_links/show.html.erb
index 273d9102e..abc2db3de 100644
--- a/app/views/connection_links/show.html.erb
+++ b/app/views/connection_links/show.html.erb
@@ -1,7 +1,7 @@
 <%= title_tag t('connection_links.show.title', :connection_link => @connection_link.name ) %>
 
 <div class="connection_link_show">
-  <%= @map.to_html.html_safe %>
+  <%= @map.to_html %>
   
   <div class="summary">
     <p>
diff --git a/app/views/imports/_import.erb b/app/views/imports/_import.erb
index 643b3f18b..6ccd5bb23 100644
--- a/app/views/imports/_import.erb
+++ b/app/views/imports/_import.erb
@@ -1,8 +1,8 @@
 <%= div_for(import) do %>
-  <%= link_to("#", :class => "preview") do %>
+  <%= link_to(referential_import_path(@referential, import), :class => "preview") do %>
     <%= image_tag "import-#{import.status}.png" %>
   <% end %>
-  <%= Import.model_name.humanize %> <%= import.id %>
+  <%= link_to(import.name, referential_import_path(@referential, import)) %>
   <div class="info">
     <%= l import.created_at %>
 
diff --git a/app/views/imports/show.html.erb b/app/views/imports/show.html.erb
new file mode 100644
index 000000000..fe2c89a39
--- /dev/null
+++ b/app/views/imports/show.html.erb
@@ -0,0 +1,38 @@
+<%= title_tag @import.name %>
+
+<div class="import_show">
+  <div class="summary">
+    <p>
+      <label><%= Import.human_attribute_name(:created_at) %>: </label>
+      <%= l @import.created_at %>
+    </p>
+    <p>
+      <label><%= Import.human_attribute_name(:status) %>: </label>
+      <%= t @import.status, :scope => "imports.statuses" %>
+    </p>
+  </div>
+
+  <h3><%= t(".report") %></h3>
+  <table>
+    <tr>
+      <th></th>
+      <th><%= ImportLogMessage.human_attribute_name(:created_at) %></th>
+      <th><%= ImportLogMessage.human_attribute_name(:position) %></th>
+      <th><%= ImportLogMessage.human_attribute_name(:full_message) %></th>
+    </tr>
+    <% @import.log_messages.each do |message| %>
+    <tr>
+      <td class="severity"><%= image_tag "severity-#{message.severity}.png", :alt => t(message.severity, :scope => "import_log_messages.severities") %></td>
+      <td class="created_at"><%= l message.created_at, :format => :short %></td>
+      <td class="position"><%= message.position %></td>
+      <td class="message"><%= message.full_message %></td>
+    </tr>
+    <% end %>
+  </table>
+</div>
+
+<% content_for :sidebar do %>
+<ul class="actions">
+  <li><%= link_to  t('imports.actions.destroy'), referential_import_path(@referential, @import), :method => :delete, :confirm =>  t('imports.actions.destroy_confirm'), :class => "remove" %></li>
+</ul>
+<% end %>
diff --git a/app/views/lines/_line.erb b/app/views/lines/_line.erb
index 5405bcbb5..3565966fb 100644
--- a/app/views/lines/_line.erb
+++ b/app/views/lines/_line.erb
@@ -2,11 +2,11 @@
   <%= link_to([@referential, line], :class => "preview", :title => "Ligne #{line.number}") do %>
     <div class="color">
       <% if line.number and line.number.length <= 3 %>
-      <div class="number"><%= line.number %></div>
+        <div class="number"><%= line.number %></div>
       <% end %>
-      <%= check_box_tag "ids[]", line.id, false, :class => "multiple_selection", :style => "display: none;" %>
     </div>
   <% end %>
+  <%= check_box_tag "ids[]", line.id, false, :class => "multiple_selection", :style => "display: none;" %>
   <%= link_to truncate(line.name, :length => 30), [@referential, line], :title => "Ligne #{line.name}" %>
   <div class="info">
     <%= line.human_attribute_name('network') %> <%= link_to_if line.network, line.network.name, referential_network_path(@referential, line.network), :title => "#{line.human_attribute_name('network')} #{line.network.name}" %> -
diff --git a/app/views/lines/index.html.erb b/app/views/lines/index.html.erb
index c39e94cbd..8c9766866 100644
--- a/app/views/lines/index.html.erb
+++ b/app/views/lines/index.html.erb
@@ -75,7 +75,7 @@
     <a class="disable" href="#"><%= t(".multi_selection_disable") %></a>
     
     <ul class="actions">
-      <li><a href="#" class="remove"><%= t(".delete_selected") %></a></li>
+      <%= link_to t(".delete_selected"), referential_lines_path(@referential), "data-multiple-method" => "delete", :class => "remove" %>
       <li><a href="#" class="export"><%= t(".export_selected") %></a></li>
     </ul>
 
diff --git a/app/views/lines/show.html.erb b/app/views/lines/show.html.erb
index 8d6157cc7..5e210ff5e 100644
--- a/app/views/lines/show.html.erb
+++ b/app/views/lines/show.html.erb
@@ -1,7 +1,7 @@
 <%= title_tag t('lines.show.title', :line => @line.name ) %>
 
 <div class="line_show">
-  <%= @map.to_html.html_safe %>
+  <%= @map.to_html %>
 
   <div class="summary">
     <p>
diff --git a/app/views/networks/show.html.erb b/app/views/networks/show.html.erb
index b11cde17d..8c68f7a31 100644
--- a/app/views/networks/show.html.erb
+++ b/app/views/networks/show.html.erb
@@ -1,7 +1,7 @@
 <%= title_tag t('networks.show.title', :network => @network.name )%>
 
 <div class="network_show">
-  <%= @map.to_html.html_safe %>
+  <%= @map.to_html %>
   <div class="summary">
     <p>
       <label><%= Chouette::Network.human_attribute_name("name") %>: </label>
diff --git a/app/views/routes/show.html.erb b/app/views/routes/show.html.erb
index 2ecbd0ada..72524846b 100644
--- a/app/views/routes/show.html.erb
+++ b/app/views/routes/show.html.erb
@@ -1,7 +1,7 @@
 <%= title_tag t('routes.show.title', :route => @route.name, :line => @route.line.name ) %>
 
 <div class="route_show">
-  <%= @map.to_html.html_safe %>
+  <%= @map.to_html %>
 
   <div class="summary">
     <p>
diff --git a/app/views/stop_areas/edit.html.erb b/app/views/stop_areas/edit.html.erb
index be09d94e0..1ec77056d 100644
--- a/app/views/stop_areas/edit.html.erb
+++ b/app/views/stop_areas/edit.html.erb
@@ -1,5 +1,5 @@
 <%= title_tag t('stop_areas.edit.title', :stop_area => @stop_area.name ) %>
 
-<%= @map.to_html.html_safe %>
+<%= @map.to_html %>
 
 <%= render "form" %>
diff --git a/app/views/stop_areas/show.html.erb b/app/views/stop_areas/show.html.erb
index 992a4050b..41d7576b5 100644
--- a/app/views/stop_areas/show.html.erb
+++ b/app/views/stop_areas/show.html.erb
@@ -1,7 +1,7 @@
 <%= title_tag t('stop_areas.show.title', :stop_area => @stop_area.name ) %>
 
 <div class="stop_area_show">
-  <%= @map.to_html.html_safe %>
+  <%= @map.to_html %>
   <div class="summary">
     <p>
       <label><%= @stop_area.human_attribute_name("name") %>: </label>