Fix merge conflict

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

diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb
index 167ac6959f02fb14aec6a301e3e40a8c2d62ba5a..3d6349151346c5ba54ad697d083aa6b7456eff82 100644 (file)
--- a/app/views/browse/way.html.erb
+++ b/app/views/browse/way.html.erb
@@ -2,16 +2,15 @@
 @name = printable_name @way
 @title = t('browse.way.way') + ' | ' + @name
 %>
 @name = printable_name @way
 @title = t('browse.way.way') + ' | ' + @name
 %>

-<% content_for :head do %>
-<%= stylesheet_link_tag 'browse' %>
-<% end %>
-<%= render :partial => "navigation" %>
-<h2><%= t'browse.way.way_title', :way_name => @name %></h2>
-<%= render :partial => "map", :object => @way %>
+<h2><%= t'browse.way.way_title', :way_name => @name %>
+    <span class="icon close"></span>
+</h2>
+

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

-<hr />
-<%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %>
-| <%= link_to(t('browse.way.view_history'), :action => "way_history") %>
-<% unless @midnode.nil? -%>
-| <%= link_to(t('browse.way.edit'), :controller => "site", :action => "edit", :way => @way.id, :lat => @midnode.lat, :lon => @midnode.lon, :zoom => 16) %>
-<% end -%>
+
+<div class='browse-section secondary-actions clearfix'> 
+  <span><%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %>
+    &middot;
+    <%= link_to(t('browse.way.view_history'), :action => "way_history") %>
+    </span>
+</div>