X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/694fa065c0c943664072a80b552d4985967176f9..4b2bd4835dc36384f9085aa5cc115ed6dca8e031:/app/helpers/changeset_helper.rb?ds=sidebyside

diff --git a/app/helpers/changeset_helper.rb b/app/helpers/changeset_helper.rb
index 147624106..262500355 100644
--- a/app/helpers/changeset_helper.rb
+++ b/app/helpers/changeset_helper.rb
@@ -1,24 +1,33 @@
 module ChangesetHelper
-    def changeset_time_ago(changeset)
-        out = ''
-        created_at = distance_of_time_in_words_to_now(changeset.created_at)
-        closed_at = distance_of_time_in_words_to_now(changeset.closed_at)
-        if created_at == closed_at
-            out << t('browse.changeset_details.closed_at') + ' '
-            both_times = t('browse.changeset_details.created_at') + ': ' + l(changeset.created_at)
-            both_times << '&#10;'
-            both_times << t('browse.changeset_details.closed_at') + ': ' + l(changeset.closed_at)
-            out << content_tag(:abbr, t('browse.changeset_details.ago', :ago => created_at), title: both_times.html_safe)
-        else
-            out << t('browse.changeset_details.created_at') + ' '
-            out << content_tag(:abbr, t('browse.changeset_details.ago', :ago => created_at), title: l(changeset.created_at))
-            out << t('browse.changeset_details.closed_at') + ' '
-            out << content_tag(:abbr, t('browse.changeset_details.ago', :ago => closed_at), title: l(changeset.closed_at))
-        end
+  def changeset_details(changeset)
+    out = ''
+    created_at = distance_of_time_in_words_to_now(changeset.created_at)
+    closed_at = distance_of_time_in_words_to_now(changeset.closed_at)
+    date = ''
+    if changeset.closed_at > DateTime.now
+      date << t('browse.changeset_details.created_at') + ' '
+      date << content_tag(:abbr, t('browse.changeset_details.ago', :ago => created_at), title: l(changeset.created_at))
+    else
+      date << t('browse.changeset_details.closed_at') + ' '
+      both_times = t('browse.changeset_details.created_at') + ': ' + l(changeset.created_at)
+      both_times << '&#10;'
+      both_times << t('browse.changeset_details.closed_at') + ': ' + l(changeset.closed_at)
+      date << content_tag(:abbr, t('browse.changeset_details.ago', :ago => created_at), title: both_times.html_safe)
+    end
+    out << content_tag(:span, date.html_safe, class: 'date')
+    unless params.key?(:display_name)
+      userspan = ''
+      if changeset.user.data_public?
+        userspan << ' ' + t('browse.changeset_details.by') + ' '
         if changeset.user.data_public?
-            out << ' ' + t('browse.changeset_details.by') + ' '
-            out << link_to(h(changeset.user.display_name), :controller => "user", :action => "view", :display_name => changeset.user.display_name)
+          user = link_to changeset.user.display_name, user_path(changeset.user.display_name)
+        else
+          user = t('changeset.changeset.anonymous')
         end
-        return out.html_safe
+        userspan << content_tag(:span, user, class: 'user')
+      end
+      out << content_tag(:span, userspan.html_safe, class: 'user')
     end
+    return out.html_safe
+  end
 end