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

[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 1e0f118d83803978883640a17479d60e59811da9..86b9020a209e7b7823bb92361c7d63f666e8d644 100644 (file)
--- a/app/views/browse/feature.html.erb
+++ b/app/views/browse/feature.html.erb
@@ -1,14 +1,13 @@
-<% set_title(t("browse.#{@type}.title", :name => printable_name(@feature))) %>
+<% set_title(t("browse.#{@type}.title_html", :name => printable_name(@feature))) %>
 
-<h2>
-  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= t("browse.#{@type}.title", :name => printable_name(@feature)) %>
-</h2>
+<%= render "sidebar_header", :title => t("browse.#{@type}.title_html", :name => printable_name(@feature)) %>
 
 <%= render :partial => @type, :object => @feature %>
 
 <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.visible? %>
+    <%= link_to(t("browse.download_xml"), :controller => "api/#{@type.pluralize}", :action => :show) %>
+    &middot;
+  <% end %>
+  <%= link_to(t("browse.view_history"), :action => "#{@type}_history") %>
 </div>