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 f6a3b2308f1de81f9c355770eed9419672ddf644..3d6349151346c5ba54ad697d083aa6b7456eff82 100644 (file)
--- a/app/views/browse/way.html.erb
+++ b/app/views/browse/way.html.erb
@@ -2,24 +2,15 @@
 @name = printable_name @way
 @title = t('browse.way.way') + ' | ' + @name
 %>
-<table width="100%">
-  <tr>
-    <td>
-      <h2><%= t'browse.way.way_title', :way_name => h(@name) %></h2>
-    </td>
-    <td>
-      <%= render :partial => "navigation" %>
-    </td>
-  </tr>
-  <tr valign="top">
-    <td>
-      <%= render :partial => "way_details", :object => @way %>
-      <hr />
-      <%= t'browse.way.download', :download_xml_link => link_to(t('browse.way.download_xml'), :controller => "way", :action => "read"), 
-                                  :view_history_link => link_to(t('browse.way.view_history'), :action => "way_history"),
-                                  :edit_link => link_to(t('browse.way.edit'), :controller => "site", :action => "edit", :way => @way.id, :lat => @midnode.lat, :lon => @midnode.lon, :zoom => 16)
-      %>
-    </td>
-    <%= render :partial => "map", :object => @way %>
-  </tr>
-</table>
+<h2><%= t'browse.way.way_title', :way_name => @name %>
+    <span class="icon close"></span>
+</h2>
+
+<%= render :partial => "way_details", :object => @way %>
+
+<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>