Merge remote-tracking branch 'upstream/master' into routing-merge

[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 a377ada6a7d857735571478a19b7db473da50086..fa6f75ff9e01f40e5aaee8b93691a6e3269589e6 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,14 +1,17 @@
-<% set_title("#{t('browse.note.title')} | #{@note.id}") %>
+<% set_title(t('browse.note.title', :id => @note.id)) %>

 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>

-  <%= h(@note.comments.first.body.to_html) %>
+  <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>

 </h2>
 
 <div class="browse-section">
 </h2>
 
 <div class="browse-section">

-  <div class="details" data-coordinates="<%= number_with_delimiter(@note.lat) %>,<%=number_with_delimiter(@note.lon) %>" data-status="<%= @note.status %>">
-    <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
-      <br/>
+  <h4><%= t('browse.note.description') %></h4>
+  <div class="note-description">
+    <%= h(@note.comments.first.body.to_html) %>
+  </div>
+
+  <div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">

     <%= note_event('open', @note.created_at, @note.author) %>
     <% if @note.status == "closed" %>
       <br/>
     <%= note_event('open', @note.created_at, @note.author) %>
     <% if @note.status == "closed" %>
       <br/>