Moved note description to the sidebar header

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 7f863fef4fd66e14c6a6bbc5eb2e05243ff8cbad..f6db9f154c114c56e5c8aab28ba95ed9ba2f53a2 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -2,12 +2,13 @@
 
 <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>

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

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

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

   <div class="details">
   <div class="details">

+    <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
+      <br/>

     <%= 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/>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1e3da2ad78a452fb75fed8fd933e3f120bf0c370..0253a7f2124a4a92fc7ad2dc44777b054523d2fe 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -283,8 +283,8 @@ en:
     note:
       title: "Note"
       new_note: "Add a note"
     note:
       title: "Note"
       new_note: "Add a note"

-      open_title: "Unresolved note: %{note_name}"
-      closed_title: "Resolved note: %{note_name}"
+      open_title: "Unresolved note #%{note_name}"
+      closed_title: "Resolved note #%{note_name}"

       opened: "Opened"
       last_modified: "Last modified"
       closed: "Closed"
       opened: "Opened"
       last_modified: "Last modified"
       closed: "Closed"