Merge branch 'master' into notes

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

diff --git a/app/views/browse/relation_history.html.erb b/app/views/browse/relation_history.html.erb
index 03aa3524869104afa47d825d88f5e5b06470f704..022248fba509f5db8cba9f45a0313fcf344b0ab6 100644 (file)
--- a/app/views/browse/relation_history.html.erb
+++ b/app/views/browse/relation_history.html.erb
@@ -2,11 +2,18 @@
 @name = printable_name @relation
 @title = t('browse.relation_history.relation_history') + ' | ' + @name
 %>
-<h2><%= t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %></h2>
+
+<% content_for :heading do %>
+  <h2><%= raw t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %></h2>
+  <ul class='secondary-actions clearfix'>
+    <li><%= link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history") %></li>
+    <li><%= link_to(t('browse.relation_history.view_details'), :action => "relation") %></li>
+  </ul>
+<% end %>
+
 <%= render :partial => "map", :object => @relation %>
+<div class='column-1'>
 <% @relation.old_relations.reverse.each do |relation| %>
   <%= render :partial => "relation_details", :object => relation %>
-  <hr />
 <% end %>
-<%= raw t'browse.relation_history.download', :download_xml_link => link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history"), 
-                                             :view_details_link => link_to(t('browse.relation_history.view_details'), :action => "relation") %>
+</div>
\ No newline at end of file