Merge remote-tracking branch 'osmlab/map-ui'

[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 ec4f8d3ae60667e5cf837a522d9d290ec4520b71..31fd00f014255e8bbcc53af55e2d940037e4ac5f 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -15,32 +15,38 @@
 
 <div class='column-1'>
 
 
 <div class='column-1'>
 

+  <% 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>
       <h4><%= t "browse.note.opened" %></h4>
   <div class='browse-section common'>
     <div>
       <h4><%= t "browse.note.opened" %></h4>

-      <p><%= t "browse.note.at_by_html", :when => friendly_date(@note.created_at), :user => note_author(@note) %></p>
+      <p><%= note_event(@note.created_at, @note.author) %></p>

     </div>
 
     <% if @note.status == "closed" %>
       <div>
         <h4><%= t "browse.note.closed" %></h4>
     </div>
 
     <% if @note.status == "closed" %>
       <div>
         <h4><%= t "browse.note.closed" %></h4>

-        <p><%= t "browse.note.at_by_html", :when => friendly_date(@note.closed_at), :user => note_author(@note.comments.last) %></p>
+        <p><%= note_event(@note.closed_at, @note.comments.last.author) %></p>

       </div>  
     <% elsif @note.comments.length > 1 %>
       <div>
         <h4><%= t "browse.note.last_modified" %></h4>
       </div>  
     <% elsif @note.comments.length > 1 %>
       <div>
         <h4><%= t "browse.note.last_modified" %></h4>

-        <p><%= t "browse.note.at_by_html", :when => friendly_date(@note.updated_at), :user => note_author(@note.comments.last) %></p>
+        <p><%= note_event(@note.updated_at, @note.comments.last.author) %></p>

       </div>  
     <% end %>
 
       </div>  
     <% end %>
 

-    <div>
+    <div id="c<%= @note.comments.first.id %>">

       <h4><%= t "browse.note.description" %></h4>
       <h4><%= t "browse.note.description" %></h4>

-      <p><%= h(@note.comments.first.body) %></p>
+      <p><%= h(@note.comments.first.body.to_html) %></p>

     </div>
 
     <div>
       <h4><%= t "browse.node_details.coordinates" %></h4>
     </div>
 
     <div>
       <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>
 
     </div>
   </div>
 


@@ -49,9 +55,9 @@
       <h4><%= t "browse.note.comments" %></h4>
       <ul>
         <% @note.comments[1..-1].each do |comment| %>
       <h4><%= t "browse.note.comments" %></h4>
       <ul>
         <% @note.comments[1..-1].each do |comment| %>

-          <li>
+          <li id="c<%= comment.id %>">

             <%= comment.body.to_html %>
             <%= comment.body.to_html %>

-            <small class="deemphasize"><%= t "browse.note.at_by_html", :when => friendly_date(comment.created_at), :user => note_author(comment) %></small>
+            <small class="deemphasize"><%= note_event(comment.created_at, comment.author) %></small>

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