Merge remote-tracking branch 'osmlab/map-ui'

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

diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb
index 5b222396db1eff45c6d7ea2f76f7f0d9b7339a47..3ba355054896c13cec6a8eaffbf468877ca6379b 100644 (file)
--- a/app/views/browse/relation.html.erb
+++ b/app/views/browse/relation.html.erb
@@ -5,10 +5,17 @@
 <% content_for :head do %>
 <%= stylesheet_link_tag 'browse' %>
 <% end %>
 <% content_for :head do %>
 <%= stylesheet_link_tag 'browse' %>
 <% end %>

+
+<% content_for :heading do %>
+  <h2><%= t'browse.relation.relation_title', :relation_name => @name %></h2>
+  <ul class='secondary-actions clearfix'>
+    <li><%= link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read") %></li>
+    <li><%= link_to(t('browse.relation.view_history'), :action => "relation_history") %></li>
+  </ul>
+<% end %>

 <%= render :partial => "navigation" %>
 <%= render :partial => "navigation" %>

-<h2><%= t'browse.relation.relation_title', :relation_name => h(@name) %></h2>

 <%= render :partial => "map", :object => @relation %>
 <%= render :partial => "map", :object => @relation %>

-<%= render :partial => "relation_details", :object => @relation %>
-<hr />
-<%= raw t'browse.relation.download', :download_xml_link => link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read"),
-                                     :view_history_link => link_to(t('browse.relation.view_history'), :action => "relation_history") %>
+
+<div class='column-1'>
+  <%= render :partial => "relation_details", :object => @relation %>
+</div>
\ No newline at end of file