Merge 8377:8381 from trunk.

[rails.git] / app / views / browse / _common.rhtml

diff --git a/app/views/browse/_common.rhtml b/app/views/browse/_common.rhtml
index d400405c37ada15e9b63da9f78d4624b56c929ae..f237bfe155ab01a66d8ac28702b8eb2d54bbf482 100644 (file)
--- a/app/views/browse/_common.rhtml
+++ b/app/views/browse/_common.rhtml
@@ -1,9 +1,13 @@
+<% if obj.visible %>
 <%= render :partial => 'map', :locals => { :type => type, :id => obj.id } %>
+<% else %>
+Deleted
+<% end %>
 <ul>
-<li><%= link_to h("API"), :controller => "api/#{API_VERSION}/"+type, :id => obj.id %></li>
-<li><%= link_to h("History"), :controller => "api/#{API_VERSION}/"+type, :id => obj.id, :action => "history" %></li>
-</ul>
-Last edited: <%= h(obj.timestamp) %>
-<% if obj.user.data_public %>
-by <%= link_to h(obj.user.display_name), :controller => 'user', :action => 'view' , :display_name => obj.user.display_name %>
+<% if obj.visible %>
+<li><%= link_to h("API"), :controller => type, :action => "read", :id => obj.id %></li>
 <% end %>
+<li><%= link_to h("History"), :controller => "old_" + type, :action => "history", :id => obj.id %> 
+    (<%= link_to h("HTML"), :action => type+"_history", :id => obj.id %>)</li>
+</ul>
+<%= render :partial => 'common_editedby', :locals => { :obj => obj } %>