From 4b2bd4835dc36384f9085aa5cc115ed6dca8e031 Mon Sep 17 00:00:00 2001
From: Aaron Lidman <aaronlidman@gmail.com>
Date: Thu, 7 Nov 2013 12:18:52 -0800
Subject: [PATCH] Fixed changeset time inconsistencies

---
 app/assets/stylesheets/common.css.scss  |  6 ++++-
 app/helpers/changeset_helper.rb         | 33 ++++++++++++++++---------
 app/views/browse/changeset.html.erb     |  2 +-
 app/views/changeset/_changeset.html.erb | 20 +--------------
 4 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 8e43e0d09..21ed6930b 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -644,7 +644,7 @@ nav.secondary {
       padding: $lineheight $lineheight $lineheight/2;
     }
 
-    h4, span.user, span.date {
+    h4 {
       font-weight: normal;
       color: #666;
       font-size: 12px;
@@ -1053,6 +1053,10 @@ a.donate {
 
     &.selected { background: #FFFFE6; }
     /* color is derived from changeset bbox fillColor in history.js */
+
+    h4 {
+      padding: 0;
+    }
   }
 
   .comment a {
diff --git a/app/helpers/changeset_helper.rb b/app/helpers/changeset_helper.rb
index b71c35371..262500355 100644
--- a/app/helpers/changeset_helper.rb
+++ b/app/helpers/changeset_helper.rb
@@ -1,23 +1,32 @@
 module ChangesetHelper
-  def changeset_time_ago(changeset)
+  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)
-    if created_at == closed_at
-      out << t('browse.changeset_details.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)
-      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))
+      date << content_tag(:abbr, t('browse.changeset_details.ago', :ago => created_at), title: both_times.html_safe)
     end
-    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)
+    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?
+          user = link_to changeset.user.display_name, user_path(changeset.user.display_name)
+        else
+          user = t('changeset.changeset.anonymous')
+        end
+        userspan << content_tag(:span, user, class: 'user')
+      end
+      out << content_tag(:span, userspan.html_safe, class: 'user')
     end
     return out.html_safe
   end
diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 3a9136f52..4e74c5ee0 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -5,7 +5,7 @@
 
 <div class="browse-section">
   <p><%= @changeset.tags['comment'].to_s.presence || t('browse.changeset_details.no_comment') %></p>
-  <h4><%= changeset_time_ago(@changeset) %></h4>
+  <h4><%= changeset_details(@changeset) %></h4>
 </div>
 
 <%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %>
diff --git a/app/views/changeset/_changeset.html.erb b/app/views/changeset/_changeset.html.erb
index 4bccbe516..3f2cb319b 100644
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -22,23 +22,5 @@
         <% end %>
       </a>
   </p>
-
-  <span class='date'>
-    <% if changeset.closed_at > DateTime.now %>
-      <%= t 'changeset.changeset.still_editing' %>
-    <% else %>
-      <% closed_at = l changeset.closed_at, :format => :long %>
-      <abbr title='<%= closed_at %>'><%= distance_of_time_in_words_to_now(closed_at) %></abbr>
-    <% end %>
-  </span>
-
-  <% unless params.key?(:display_name) %>
-    <span class="user"> by 
-      <% if changeset.user.data_public? %>
-        <%= link_to changeset.user.display_name, user_path(changeset.user.display_name) %>
-      <% else %>
-        <i><%= t 'changeset.changeset.anonymous' %></i>
-      <% end %>
-    </span>
-  <% end %>
+  <h4><%= changeset_details(changeset) %></h4>
 <% end %>
-- 
2.39.5