X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22..35458c009652645972a9167d80aba1c4fdce82cf:/app/views/browse/note.html.erb?ds=sidebyside

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 59c96c4aa..2d2560ef2 100644
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,58 +1,50 @@
-<%= render :partial => "navigation" %>
+<h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %></h2>
 
-<h2>
-  <%= image_tag "#{@note.status}_note_marker.png", :alt => @note.status %>
-  <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
-</h2>
+<% if @note.comments.find { |comment| comment.author.nil? } -%>
+<div class='browse-section common'>
+  <p class="warning"><%= t "javascripts.notes.show.anonymous_warning" %></p>
+</div>
+<% end -%>
 
-<%= render :partial => "map", :object => @note %>
-
-<table class="browse_details">
-
-  <tr>
-    <th><%= t "browse.note.opened" %></th>
-    <td><%= t "browse.note.at_by", :when => friendly_date(@note.created_at), :user => note_author(@note) %></td>
-  </tr>  
+<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" %>
-    <tr>
-      <th><%= t "browse.note.closed" %></th>
-      <td><%= t "browse.note.at_by", :when => friendly_date(@note.closed_at), :user => note_author(@note.comments.last) %></td>
-    </tr>  
+    <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 %>
-    <tr>
-      <th><%= t "browse.note.last_modified" %></th>
-      <td><%= t "browse.note.at_by", :when => friendly_date(@note.updated_at), :user => note_author(@note.comments.last) %></td>
-    </tr>  
-  <% end %>
-
-  <tr>
-    <th><%= t "browse.note.description" %></th>
-    <td><%= h(@note.comments.first.body) %></td>
-  </tr>
-
-  <tr>
-    <th><%= t "browse.node_details.coordinates" %></th>
-    <td><div class="geo"><%= link_to ("<span class='latitude'>#{number_with_delimiter(@note.lat)}</span>, <span class='longitude'>#{number_with_delimiter(@note.lon)}</span>"), {:controller => 'site', :action => 'index', :lat => h(@note.lat), :lon => h(@note.lon), :zoom => "18"} %></div></td>
-  </tr>
-
-  <% if @note.comments.length > 1 %>
-    <tr valign="top">
-      <th><%= t "browse.note.comments" %></th>
-      <td class="browse_comments">
-        <table>
-          <% @note.comments[1..-1].each do |comment| %>
-            <tr>
-              <td>
-                <%= h(comment.body) %>
-                <br />
-                <span class="by"><%= t "browse.note.at_by", :when => friendly_date(comment.created_at), :user => note_author(comment) %></span>
-              </td>
-            </tr>
-          <% end %>
-        </table>
-      </td>
-    </tr>
+    <div class='browse-field'>
+      <h4><%= t "browse.note.last_modified" %></h4>
+      <p><%= note_event(@note.updated_at, @note.comments.last.author) %></p>
+    </div>
   <% end %>
 
-</table>
+  <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>
+  </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>
+  </div>
+</div>
+
+<% if @note.comments.length > 1 %>
+  <div class='browse-section clearfix'>
+    <h4><%= t "browse.note.comments" %></h4>
+    <ul>
+      <% @note.comments[1..-1].each do |comment| %>
+        <li id="c<%= comment.id %>">
+          <%= comment.body.to_html %>
+          <small class="deemphasize"><%= note_event(comment.created_at, comment.author) %></small>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>