X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4cc2b63d5c38158e6beb114147be723425ec412e..4bb0785ad5bdad8fc8fcbbe35c61f585f58f4cce:/app/views/browse/note.html.erb

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 8ccd525a3..c91005b60 100644
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,58 +1,65 @@
-<% content_for :head do %>
-  <%= stylesheet_link_tag 'browse' %>
-<% end %>
-
-<% 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'>
-    <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>
-
+<h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
+  <span class="icon close"></span>
+</h2>
+<div class="browse-section">
+  <span>
+    <%= t "browse.note.opened" %>: 
+    <abbr><%= note_event(@note.created_at, @note.author) %></abbr> by 
+    <% if @note.author.nil? %>
+      <%= t "browse.note.anonymous" %>
+    <% else %>
+      <%= note_author(@note.author) %>
+    <% end %>
     <% 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>
+      </span><span>
+      <%= t "browse.note.closed" %>:
+      <abbr><%= note_event(@note.closed_at, @note.author) %></abbr> by 
+      <%= @note.comments.last.author %>
     <% end %>
+  </span>
+</div>
 
-    <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>
+<% 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 -%>
 
+<div class='browse-section common'>
+  <% if @note.status == "closed" %>
     <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>
+      <h4><%= t "browse.note.closed" %></h4>
+      <p><%= note_event(@note.closed_at, @note.comments.last.author) %></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>
+  <% 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 %>
-<% end %>
 
-<%= render :template => 'layouts/map' %>
+  <div class='browse-field' id="c<%= @note.comments.first.id %>">
+    <h4><%= t "browse.note.description" %></h4>
+    <%= h(@note.comments.first.body.to_html) %>
+    <!-- this provides it's own <p> tags -->
+  </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 note-comments'>
+    <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 %>