Fix feedback loop between L.hash and popstate

[rails.git] / app / views / browse / note.html.erb

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 2d2560ef2ff51a5e52b584cc07962f0b8b3a034e..c91005b602d1e8d560e52f5055dfb0c8b8790421 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,17 +1,31 @@
-<h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %></h2>
+<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" %>
+      </span><span>
+      <%= t "browse.note.closed" %>:
+      <abbr><%= note_event(@note.closed_at, @note.author) %></abbr> by 
+      <%= @note.comments.last.author %>
+    <% end %>
+  </span>
+</div>

 
 <% if @note.comments.find { |comment| comment.author.nil? } -%>
 <div class='browse-section common'>
 
 <% 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>
 <% 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>
   <% if @note.status == "closed" %>
     <div class='browse-field'>
       <h4><%= t "browse.note.closed" %></h4>


@@ -26,23 +40,24 @@
 
   <div class='browse-field' id="c<%= @note.comments.first.id %>">
     <h4><%= t "browse.note.description" %></h4>
 
   <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) %>
+    <!-- this provides it's own <p> tags -->

   </div>
 
   <div class='browse-field'>
     <h4><%= t "browse.node_details.coordinates" %></h4>
   </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>
 </div>
 
 <% if @note.comments.length > 1 %>

-  <div class='browse-section clearfix'>
+  <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 %>
     <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>
+          <small class='deemphasize'><%= note_event(comment.created_at, comment.author) %></small>

         </li>
       <% end %>
     </ul>
         </li>
       <% end %>
     </ul>