X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/16a0f14f4aa3cad2d38fe35d61afa1f6a236302b..99775524b35017256203903962990c9dd212dbb4:/app/views/browse/note.html.erb

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 740646efb..90c1f358d 100644
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,52 +1,43 @@
 <% content_for :head do %>
-<%= stylesheet_link_tag 'browse' %>
+  <%= stylesheet_link_tag 'browse' %>
+  <%= javascript_include_tag 'index' %>
 <% end %>
 
-<% content_for :heading do %>
-  <h2>
-    <%= image_tag "#{@note.status}_note_marker.png", :alt => @note.status %>
-    <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
-  </h2>
-<% end %>
-
-<%= render :partial => "navigation" %>
-
-<%= render :partial => "map", :object => @note %>
-
-<div class='column-1'>
+<% content_for :sidebar do %>
+  <h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %></h2>
 
   <% if @note.comments.find { |comment| comment.author.nil? } -%>
-  <div class='browse-section common warning'>
-    <%= t "javascripts.notes.show.anonymous_warning" %>
+  <div class='browse-section common'>
+    <p class="warning"><%= t "javascripts.notes.show.anonymous_warning" %></p>
   </div>
   <% end -%>
 
   <div class='browse-section common'>
-    <div>
+    <div class='browse-field'>
       <h4><%= t "browse.note.opened" %></h4>
       <p><%= note_event(@note.created_at, @note.author) %></p>
     </div>
 
     <% if @note.status == "closed" %>
-      <div>
+      <div class='browse-field'>
         <h4><%= t "browse.note.closed" %></h4>
         <p><%= note_event(@note.closed_at, @note.comments.last.author) %></p>
-      </div>  
+      </div>
     <% elsif @note.comments.length > 1 %>
-      <div>
+      <div class='browse-field'>
         <h4><%= t "browse.note.last_modified" %></h4>
         <p><%= note_event(@note.updated_at, @note.comments.last.author) %></p>
-      </div>  
+      </div>
     <% end %>
 
-    <div>
+    <div class='browse-field' id="c<%= @note.comments.first.id %>">
       <h4><%= t "browse.note.description" %></h4>
-      <p><%= h(@note.comments.first.body) %></p>
+      <p><%= h(@note.comments.first.body.to_html) %></p>
     </div>
 
-    <div>
+    <div class='browse-field'>
       <h4><%= t "browse.node_details.coordinates" %></h4>
-      <p><div class="geo"><%= link_to ("<span class='latitude'>#{number_with_delimiter(@note.lat)}</span>, <span class='longitude'>#{number_with_delimiter(@note.lon)}</span>".html_safe), {:controller => 'site', :action => 'index', :lat => h(@note.lat), :lon => h(@note.lon), :zoom => "18"} %></div></p>
+      <p class="geo"><%= link_to ("<span class='latitude'>#{number_with_delimiter(@note.lat)}</span>, <span class='longitude'>#{number_with_delimiter(@note.lon)}</span>".html_safe), {:controller => 'site', :action => 'index', :lat => h(@note.lat), :lon => h(@note.lon), :zoom => "18"} %></p>
     </div>
   </div>
 
@@ -55,7 +46,7 @@
       <h4><%= t "browse.note.comments" %></h4>
       <ul>
         <% @note.comments[1..-1].each do |comment| %>
-          <li>
+          <li id="c<%= comment.id %>">
             <%= comment.body.to_html %>
             <small class="deemphasize"><%= note_event(comment.created_at, comment.author) %></small>
           </li>
@@ -63,5 +54,6 @@
       </ul>
     </div>
   <% end %>
+<% end %>
 
-</div>
+<%= render :template => 'layouts/map' %>