Fix double escaping of date markup in note feed

[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 5c42fddd632730b3f65240ac3a912b5efac400a0..fa587104eb0309f8d4f9393228582dc8daab18b6 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,83 +1,67 @@
-<table width="100%">
-  <tr>
-    <td width="100%">
-      <h2>
-        <% if @note.status == "closed" %>
-          <%= image_tag("closed_note_marker.png", :alt => 'closed') %>
-          <%= t 'browse.note.closed_title', :note_name => @note.id %>
-        <% else %>
-          <%= image_tag("open_note_marker.png", :alt => 'open') %>
-          <%= t 'browse.note.open_title', :note_name => @note.id %>
-        <% end %>
-      </h2>
-    </td>
-    <td>
-      <%= render :partial => "navigation" %>
-    </td>
-  </tr>
-  <tr valign="top">
-    <td>
-      <table>
-        <tr>
-          <th><%= t 'browse.note.created_at' %></th>
-          <td><%= l @note.created_at %></td>
-        </tr>  
-       <tr>
-         <th><%= t 'browse.note.edited_at' %></th>
-         <td><%= l @note.updated_at %></td>
-       </tr>
-       <% if @note.status == "closed" %>
-         <tr>
-           <th><%= t 'browse.note.closed_at' %></th>
-           <td><%= l @note.closed_at %></td>
-         </tr>
-       <% end %>
-       <tr>
-         <th><%= t 'browse.note.opened_by' %></th>
-         <% if @note.author.nil? %>
-           <td> <%= @note.author_name %> </td>
-         <% else %>
-           <td><%= link_to h(@note.author_name), :controller => "user", :action => "view", :display_name => @note.author_name %></td>
-         <% end %>
-       </tr>
-       <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>
-    </table>
+<% content_for :head do %>
+<%= stylesheet_link_tag 'browse' %>
+<% end %>
+
+<% content_for :heading do %>
+  <h2>
+    <%= image_tag "#{@note.status}_note_marker.png", :alt => @note.status %>
+    <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
+  </h2>
+<% end %>
+
+<%= render :partial => "navigation" %>
+
+<%= render :partial => "map", :object => @note %>
+
+<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 -%>

 
 

-    <br />
+  <div class='browse-section common'>
+    <div>
+      <h4><%= t "browse.note.opened" %></h4>
+      <p><%= note_event(@note.created_at, @note.author) %></p>
+    </div>

 
 

-    <% if @note.comments.length > 1 %>
-      <table>
-        <tr>
-          <th width="20%"> <%= t 'browse.note.comment_by' %></th>
-          <th width="60%"> <%= t 'browse.note.comment' %></th>
-          <th width="20%"> <%= t 'browse.note.date' %></th> 
-        </tr>
+    <% if @note.status == "closed" %>
+      <div>
+        <h4><%= t "browse.note.closed" %></h4>
+        <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>
+        <p><%= note_event(@note.updated_at, @note.comments.last.author) %></p>
+      </div>  
+    <% end %>
+
+    <div>
+      <h4><%= t "browse.note.description" %></h4>
+      <p><%= h(@note.comments.first.body) %></p>
+    </div>
+
+    <div>
+      <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| %>
         <% @note.comments[1..-1].each do |comment| %>

-          <tr>
-            <td>
-              <% if comment.author.nil? %>
-                <%= comment.author_name %>
-              <% else %>
-                <%= link_to h(comment.author.display_name), :controller => "user", :action => "view", :display_name => comment.author.display_name %>                                  
-              <% end %>
-            </td>
-            <td> <%= h(comment.body) %> </td>
-            <td> <%= l comment.created_at %> </td>
-          </tr>
+          <li>
+            <%= comment.body.to_html %>
+            <small class="deemphasize"><%= note_event(comment.created_at, comment.author) %></small>
+          </li>

         <% end %>
         <% end %>

-      </table>
-    <% end %>
-       
-    <hr />
-    </td>
+      </ul>
+    </div>
+  <% end %>

 
 

-    <%= render :partial => "map", :object => @note %>
-  </tr>
-</table>
+</div>