From 1cded7d151f6af733c3760815a00b0a259d9ba17 Mon Sep 17 00:00:00 2001
From: Aaron Lidman <aaronlidman@gmail.com>
Date: Mon, 4 Nov 2013 15:24:50 -0800
Subject: [PATCH] Rejig changeset details in the style of danstowell

---
 app/assets/stylesheets/common.css.scss | 14 +++++++++
 app/views/browse/changeset.html.erb    | 39 +++++++++++++-------------
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 6a05ae1d3..cd6c7633c 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1015,6 +1015,20 @@ a.donate {
   }
 }
 
+/* Rules for the changeset details */
+
+#sidebar_content {
+  .browse-section.header {
+    padding: 20px;
+    border-bottom: 1px solid #CCC;
+
+    h2 {
+      padding: 0 0 5px 0;
+      border-bottom: none;
+    }
+  }
+}
+
 /* Rules for export information which appears in the popout sidebar */
 
 .export_bounds {
diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index f2f8b21fc..1970f568d 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -1,24 +1,23 @@
-<h2><%= t 'browse.changeset.changeset', :id => @changeset.id %></h2>
-
-<div class='browse-section common'>
-  <div class='browse-field'>
-    <h4><%= t 'browse.changeset_details.created_at' %></h4>
-    <p><%= l @changeset.created_at %></p>
-  </div>
-
-  <div class='browse-field'>
-    <h4><%= t 'browse.changeset_details.closed_at' %></h4>
-    <p><%= l @changeset.closed_at %></p>
-  </div>
-
-  <% if @changeset.user.data_public? %>
-    <div class='browse-field'>
-      <h4><%= t 'browse.changeset_details.belongs_to' %></h4>
-      <p><%= link_to h(@changeset.user.display_name), :controller => "user", :action => "view", :display_name => @changeset.user.display_name %></p>
-    </div>
-  <% end %>
+<div class="browse-section header">
+  <h2><%= t 'browse.changeset.changeset', :id => @changeset.id %></h2>
+    <p>
+      <% 
+      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 %>
+        <%= t 'browse.changeset_details.closed_at' %> 
+        <abbr title="<%= t 'browse.changeset_details.created_at' %>: <%= @changeset.created_at %> &#10;<%= t 'browse.changeset_details.closed_at' %>: <%= @changeset.closed_at %>">
+        <%= created_at %> ago</abbr> 
+      <% else %>
+        <%= t 'browse.changeset_details.created_at' %> <abbr title="<%= l @changeset.created_at %>"><%= created_at %> ago</abbr>, 
+        <%= t 'browse.changeset_details.closed_at' %> <abbr title="<%= l @changeset.closed_at %>"><%= closed_at %> ago<abbr> 
+      <% end %>
+      <% if @changeset.user.data_public? %>
+        by <%= link_to h(@changeset.user.display_name), :controller => "user", :action => "view", :display_name => @changeset.user.display_name %>
+      <% end %>
+    </p>
 </div>
-
+  
 <%= render :partial => "tag_details", :object => @changeset %>
 
 <% unless @nodes.empty? %>
-- 
2.43.2