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

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

diff --git a/app/views/browse/feature.html.erb b/app/views/browse/feature.html.erb
index 38657f4d1fb8f976868bb375b94e0feb206b7088..29f911f799302c703aafd6d66a90116032177d18 100644 (file)
--- a/app/views/browse/feature.html.erb
+++ b/app/views/browse/feature.html.erb
@@ -1,14 +1,32 @@
-<% set_title(t("browse.#{@type}.title", :name => printable_name(@feature))) %>
+<% set_title(t("browse.#{@type}.title_html", :name => printable_element_name(@feature))) %>
 
-<h2>
-  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= raw t("browse.#{@type}.title", :name => printable_name(@feature)) %>
-</h2>
+<%= render "sidebar_header", :title => t("browse.#{@type}.title_html", :name => printable_element_name(@feature)) %>
 
-<%= render :partial => @type, :object => @feature %>
+<%= render :partial => "browse/#{@type}", :object => @feature %>
 
+<% if @feature.visible? %>
+  <div class='secondary-actions'>
+    <%= link_to(t("browse.download_xml"), :controller => "api/#{@type.pluralize}", :action => :show) %>
+  </div>
+<% end %>
 <div class='secondary-actions'>
-  <%= link_to(t('browse.download_xml'), :controller => @type, :action => "read") %>
-  &middot;
-  <%= link_to(t('browse.view_history'), :action => "#{@type}_history") %>
+  <% if @feature.version > 1 %>
+    <%= link_to({ :controller => "old_#{@type.pluralize}", :action => :show, :version => 1 }, :class => "icon-link") do %>
+      <%= previous_page_svg_tag :height => 11, :count => 2 %>
+      <%= "#{t('browse.version')} #1" %>
+    <% end %>
+    &middot;
+  <% end %>
+    <%= link_to t("browse.view_history"), :controller => "old_#{@type.pluralize}" %>
+  <% if current_user&.moderator? %>
+    &middot;
+    <%= link_to(t("browse.view_unredacted_history"), :controller => "old_#{@type.pluralize}", :params => { :show_redactions => true }) %>
+  <% end %>
+  <% if @feature.version > 1 %>
+    &middot;
+    <%= link_to({ :controller => "old_#{@type.pluralize}", :action => :show, :version => @feature.version }, :class => "icon-link") do %>
+      <%= "#{t('browse.version')} ##{@feature.version}" %>
+      <%= next_page_svg_tag :height => 11, :count => 2 %>
+    <% end %>
+  <% end %>
 </div>