Improve display of anonymous note comments

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 9676e6ee16a234d9255175367850e19381cf0481..3771acf3726746cbc44f99a5cc91af5c43c2c14b 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -99,12 +99,4 @@ module ApplicationHelper
   def friendly_date(date)
     content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly))
   end
   def friendly_date(date)
     content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly))
   end

-
-  def note_author(object, link_options = {})
-    if object.author.nil?
-      ""
-    else
-      link_to h(object.author.display_name), link_options.merge({:controller => "user", :action => "view", :display_name => object.author.display_name})
-    end
-  end

 end
 end

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
new file mode 100644 (file)
index 0000000..bfd7f49
--- /dev/null
+++ b/app/helpers/note_helper.rb
@@ -0,0 +1,13 @@
+module NoteHelper
+  def note_event(at, by)
+    if by.nil?
+      I18n.t("browse.note.at_html", :when => friendly_date(at)).html_safe
+    else
+      I18n.t("browse.note.at_by_html", :when => friendly_date(at), :user => note_author(by)).html_safe
+    end
+  end
+
+  def note_author(author, link_options = {})
+    link_to h(author.display_name), link_options.merge({:controller => "user", :action => "view", :display_name => author.display_name})
+  end
+end

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index ec4f8d3ae60667e5cf837a522d9d290ec4520b71..a89ad07e5e543ee63af633c68bb5664b7b09848b 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -18,18 +18,18 @@
   <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 %>
 


@@ -51,7 +51,7 @@
         <% @note.comments[1..-1].each do |comment| %>
           <li>
             <%= comment.body.to_html %>
         <% @note.comments[1..-1].each do |comment| %>
           <li>
             <%= 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>

diff --git a/app/views/notes/_description.html.erb b/app/views/notes/_description.html.erb
index 596d63269fea0799a98fc0944694e5cfe4ee5a4c..435f263c691f7f84881dcbfab11fb70b49115e8a 100644 (file)
--- a/app/views/notes/_description.html.erb
+++ b/app/views/notes/_description.html.erb
@@ -1,7 +1,11 @@
 <div>
   <% description.comments.each do |comment| -%>
   <div class="note-comment" style="margin-top: 5px">
 <div>
   <% description.comments.each do |comment| -%>
   <div class="note-comment" style="margin-top: 5px">

-    <div class="note-comment-description" style="font-size: smaller; color: #999999"><%= t "note.description.#{comment.event}_at_by", :when => friendly_date(comment.created_at), :user => note_author(comment, :only_path => false) %></div>
+    <% if comment.author.nil> -%>
+    <div class="note-comment-description" style="font-size: smaller; color: #999999"><%= t "note.description.#{comment.event}_at", :when => friendly_date(comment.created_at) %></div>
+    <% else -%>
+    <div class="note-comment-description" style="font-size: smaller; color: #999999"><%= t "note.description.#{comment.event}_at_by", :when => friendly_date(comment.created_at), :user => note_author(comment.author, :only_path => false) %></div>
+    <% end -%>

     <div class="note-comment-text"><%= comment.body %></div>
   </div>
   <% end -%>
     <div class="note-comment-text"><%= comment.body %></div>
   </div>
   <% end -%>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8d45dfe2622a1741721c23cbea4e343d64b3ba87..f64b833b06f7488d0272672f84ea68ed3c2fe9c2 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -288,6 +288,7 @@ en:
       opened: "Opened:"
       last_modified: "Last modified:"
       closed: "Closed:"
       opened: "Opened:"
       last_modified: "Last modified:"
       closed: "Closed:"

+      at_html: "%{when} ago"

       at_by_html: "%{when} ago by %{user}"
       description: "Description:"
       comments: "Comments:"
       at_by_html: "%{when} ago by %{user}"
       description: "Description:"
       comments: "Comments:"


@@ -1979,9 +1980,13 @@ en:
       needs_view: "The user needs to log in before this block will be cleared."
   note:
     description:
       needs_view: "The user needs to log in before this block will be cleared."
   note:
     description:

+      opened_at: "Created %{when} ago"

       opened_at_by: "Created %{when} ago by %{user}"
       opened_at_by: "Created %{when} ago by %{user}"

+      commented_at: "Updated %{when} ago"

       commented_at_by: "Updated %{when} ago by %{user}"
       commented_at_by: "Updated %{when} ago by %{user}"

+      closed_at: "Resolved %{when} ago"

       closed_at_by: "Resolved %{when} ago by %{user}"
       closed_at_by: "Resolved %{when} ago by %{user}"

+      reopened_at: "Reactivated %{when} ago"

       reopened_at_by: "Reactivated %{when} ago by %{user}"
     rss:
       title: "OpenStreetMap Notes"
       reopened_at_by: "Reactivated %{when} ago by %{user}"
     rss:
       title: "OpenStreetMap Notes"