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 f6e8b7f0182d1121f8d48f5c200723f9d1e6cb30..3d6349151346c5ba54ad697d083aa6b7456eff82 100644 (file)
--- a/app/views/browse/way.html.erb
+++ b/app/views/browse/way.html.erb
@@ -2,21 +2,15 @@
 @name = printable_name @way
 @title = t('browse.way.way') + ' | ' + @name
 %>
 @name = printable_name @way
 @title = t('browse.way.way') + ' | ' + @name
 %>

+<h2><%= t'browse.way.way_title', :way_name => @name %>
+    <span class="icon close"></span>
+</h2>

 
 

-<% content_for :head do %>
-  <%= stylesheet_link_tag 'browse' %>
-  <%= javascript_include_tag 'index' %>
-<% end %>
+<%= render :partial => "way_details", :object => @way %>

 
 

-<% content_for :sidebar do %>
-  <h2><%= t'browse.way.way_title', :way_name => @name %></h2>
-
-  <%= render :partial => "way_details", :object => @way %>
-
-  <ul class='secondary-actions clearfix'>
-    <li><%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %></li>
-    <li><%= link_to(t('browse.way.view_history'), :action => "way_history") %></li>
-  </ul>
-<% end %>
-
-<%= render :template => 'layouts/map' %>
+<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>