Merge branch 'master' into notes

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

diff --git a/app/views/browse/way_history.html.erb b/app/views/browse/way_history.html.erb
index e653c021a85ff795ac234e8535e4099b49bbd3fb..296ebb3ddbff996c5fe4d59da1d59be58b971f5e 100644 (file)
--- a/app/views/browse/way_history.html.erb
+++ b/app/views/browse/way_history.html.erb
@@ -2,11 +2,18 @@
 @name = printable_name @way
 @title = t('browse.way_history.way_history') + ' | ' + @name
 %>
 @name = printable_name @way
 @title = t('browse.way_history.way_history') + ' | ' + @name
 %>

-<h2><%= t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %></h2>
+
+<% content_for :heading do %>
+  <h2><%= raw t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %></h2>
+  <ul class='secondary-actions clearfix'>
+    <li><%= link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history") %></li>
+    <li><%= link_to(t('browse.way_history.view_details'), :action => "way") %></li>
+  </ul>
+<% end %>
+

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

+<div class='column-1'>

 <% @way.old_ways.reverse.each do |way| %>
   <%= render :partial => "way_details", :object => way %>
 <% @way.old_ways.reverse.each do |way| %>
   <%= render :partial => "way_details", :object => way %>

-  <hr />

 <% end %>
 <% end %>

-<%= t'browse.way_history.download', :download_xml_link => link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history"), 
-                                    :view_details_link => link_to(t('browse.way_history.view_details'), :action => "way") %>
+</div>
\ No newline at end of file