Merge branch 'master' into openid

[rails.git] / app / views / browse / _common_details.html.erb

diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb
index 0c486e0a716c789d94116e44282d52689d7294f0..07b44a94a7d1515c537a7d2c1c2bc346115b199a 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -1,11 +1,19 @@
 <tr>
 <tr>

-  <th><%= t 'browse.common_details.edited_at' %></th>
+  <% if common_details.visible? %>
+    <th><%= t 'browse.common_details.edited_at' %></th>
+  <% else %>
+    <th><%= t 'browse.common_details.deleted_at' %></th>
+  <% end %>

   <td><%= l common_details.timestamp %></td>
 </tr>
 
 <% if common_details.changeset.user.data_public? %>
   <tr>
   <td><%= l common_details.timestamp %></td>
 </tr>
 
 <% if common_details.changeset.user.data_public? %>
   <tr>

-    <th><%= t 'browse.common_details.edited_by' %></th>
+    <% if common_details.visible? %>
+      <th><%= t 'browse.common_details.edited_by' %></th>
+    <% else %>
+      <th><%= t 'browse.common_details.deleted_by' %></th>
+    <% end %>

     <td><%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %></td>
   </tr>
 <% end %>
     <td><%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %></td>
   </tr>
 <% end %>


@@ -23,7 +31,7 @@
 <% if common_details.changeset.tags['comment'] %>
   <tr>
     <th><%= t 'browse.common_details.changeset_comment' %></th>
 <% if common_details.changeset.tags['comment'] %>
   <tr>
     <th><%= t 'browse.common_details.changeset_comment' %></th>

-    <td><%= auto_link(h(common_details.changeset.tags['comment'])) %></td>
+    <td><%= linkify(h(common_details.changeset.tags['comment'])) %></td>

   </tr>
 <% end %>
 
   </tr>
 <% end %>