Merge remote-tracking branch 'upstream/pull/5434'

[rails.git] / app / views / old_ways / show.html.erb

diff --git a/app/views/old_ways/show.html.erb b/app/views/old_ways/show.html.erb
index d4e82b8a46f16f863a16ae93dc7691fcaf66af3f..1e4d14c805ceb079d53d3eeba02d858e445d2ac8 100644 (file)
--- a/app/views/old_ways/show.html.erb
+++ b/app/views/old_ways/show.html.erb
@@ -1,23 +1,7 @@
-<% set_title t("browse.way.title_html", :name => printable_name(@feature)) %>
+<% set_title t("browse.way.title_html", :name => printable_element_name(@feature)) %>

 
 

-<%= render "sidebar_header", :title => t("browse.way.title_html", :name => printable_name(@feature)) %>
+<%= render "sidebar_header", :title => t("browse.way.title_html", :name => printable_element_name(@feature)) %>

 
 <%= render :partial => "browse/way", :object => @feature %>
 
 
 <%= render :partial => "browse/way", :object => @feature %>
 

-<% unless @feature.redacted? %>
-  <div class='secondary-actions'>
-    <%= link_to t("browse.download_xml"), way_version_path(*@feature.id) %>
-  </div>
-<% end %>
-
-<div class='secondary-actions'>
-  <% if @feature.version > 1 %>
-    <%= link_to "<< #{t('browse.version')} ##{@feature.version - 1}", old_way_path(@feature.way_id, @feature.version - 1) %>
-    &middot;
-  <% end %>
-  <%= link_to t("browse.view_history"), way_history_path(@feature.way_id) %>
-  <% if @feature.version < @feature.current_way.version %>
-    &middot;
-    <%= link_to "#{t('browse.version')} ##{@feature.version + 1} >>", old_way_path(@feature.way_id, @feature.version + 1) %>
-  <% end %>
-</div>
+<%= render :partial => "browse/version_actions" %>