X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/054f934f27e79ab0f7a25a89b6b719cc2cb0cb06..2ebe5de1a1cf247596f98cd82420cb00179cc477:/app/views/browse/note.html.erb

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 2d2560ef2..5c364e815 100644
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,48 +1,44 @@
-<h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %></h2>
+<% set_title("#{t('browse.note.title')} | #{@note.id}") %>
+
+<h2>
+  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
+</h2>
+<div class="browse-section">
+  <h4>
+    <%= note_event('open', @note.created_at, @note.author) %>
+    <% if @note.status == "closed" %>
+      <br/>
+      <%= note_event(@note.status, @note.closed_at, @note.comments.last.author) %>
+    <% end %>
+  </h4>
+</div>
 
 <% if @note.comments.find { |comment| comment.author.nil? } -%>
 <div class='browse-section common'>
-  <p class="warning"><%= t "javascripts.notes.show.anonymous_warning" %></p>
+  <p class='warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
 </div>
 <% end -%>
 
 <div class='browse-section common'>
-  <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 class='browse-field'>
-      <h4><%= t "browse.note.closed" %></h4>
-      <p><%= note_event(@note.closed_at, @note.comments.last.author) %></p>
-    </div>
-  <% elsif @note.comments.length > 1 %>
-    <div class='browse-field'>
-      <h4><%= t "browse.note.last_modified" %></h4>
-      <p><%= note_event(@note.updated_at, @note.comments.last.author) %></p>
-    </div>
-  <% end %>
-
   <div class='browse-field' id="c<%= @note.comments.first.id %>">
     <h4><%= t "browse.note.description" %></h4>
-    <p><%= h(@note.comments.first.body.to_html) %></p>
+    <%= h(@note.comments.first.body.to_html) %>
   </div>
 
   <div class='browse-field'>
     <h4><%= t "browse.node_details.coordinates" %></h4>
-    <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>
+    <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>
 
 <% if @note.comments.length > 1 %>
-  <div class='browse-section clearfix'>
-    <h4><%= t "browse.note.comments" %></h4>
+  <div class='browse-section clearfix note-comments'>
     <ul>
       <% @note.comments[1..-1].each do |comment| %>
         <li id="c<%= comment.id %>">
+          <small class='deemphasize'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
           <%= comment.body.to_html %>
-          <small class="deemphasize"><%= note_event(comment.created_at, comment.author) %></small>
         </li>
       <% end %>
     </ul>