From d1cc387080152269cb142d150e06b0a27f8b98be Mon Sep 17 00:00:00 2001
From: Aaron Lidman <aaronlidman@gmail.com>
Date: Tue, 5 Nov 2013 18:28:11 -0800
Subject: [PATCH] Improve changeset template

---
 app/assets/stylesheets/common.css.scss    |  5 ++
 app/views/browse/_common_details.html.erb |  2 +-
 app/views/browse/_tag_details.html.erb    |  4 +-
 app/views/browse/changeset.html.erb       | 58 ++++++++++++++---------
 app/views/browse/way_history.html.erb     |  1 +
 app/views/changeset/_changeset.html.erb   | 20 ++++----
 config/locales/en.yml                     |  4 +-
 7 files changed, 57 insertions(+), 37 deletions(-)

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index c43870f4d..6bb0a5887 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1026,6 +1026,11 @@ a.donate {
 
     &.selected { background: lighten($green, 35%); }
   }
+
+  .comment a {
+    font-weight: bold;
+    color: #000;
+  }
 }
 
 /* Rules for the data browser */
diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb
index 95ddafcd5..f336671f3 100644
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -29,4 +29,4 @@
   </div>
 </div>
 
-<%= render :partial => "tag_details", :object => common_details %>
+<%= render :partial => "tag_details", :object => common_details.tags %>
diff --git a/app/views/browse/_tag_details.html.erb b/app/views/browse/_tag_details.html.erb
index cd087bc7f..eaf98b57b 100644
--- a/app/views/browse/_tag_details.html.erb
+++ b/app/views/browse/_tag_details.html.erb
@@ -1,8 +1,8 @@
-<% unless tag_details.tags.empty? %>
+<% unless tag_details.empty? %>
   <div class='browse-section'>
     <h4><%= t'browse.tag_details.tags' %></h4>
     <ul class='browse-tag-list'>
-      <%= render :partial => "tag", :collection => tag_details.tags.sort %>
+      <%= render :partial => "tag", :collection => tag_details.sort %>
     </ul>
   </div>
 <% end %>
diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 1227c0dd6..ac8a47069 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -1,29 +1,41 @@
-<div class='browse-section header'>
-  <h2><%= t 'browse.changeset.changeset', :id => @changeset.id %>
-    <span class="icon close"></span>
-  </h2>
-    <p>
-      <% 
+<h2><%= t 'browse.changeset.changeset', :id => @changeset.id %>
+  <span class="icon close"></span>
+</h2>
+<div class="browse-section">
+  <p>
+    <%=
+      if @changeset.tags['comment'].to_s != ''
+        @changeset.tags['comment'].to_s
+      else
+        t ('browse.changeset_details.no_comment')
+      end
+    %>
+  </p>
+  <span>
+    <%
       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>
+      if created_at == closed_at
+    %>
+      <%= t 'browse.changeset_details.closed_at' %> 
+      <abbr title="<%= t 'browse.changeset_details.created_at' %>: <%= l @changeset.created_at %> &#10;<%= t 'browse.changeset_details.closed_at' %>: <%= l @changeset.closed_at %>">
+      <%= t('browse.changeset_details.ago', :ago => created_at) %></abbr> 
+    <% else %>
+      <%= t 'browse.changeset_details.created_at' %> <abbr title="<%= l @changeset.created_at %>"><%= t('browse.changeset_details.ago', :ago => created_at) %></abbr>, 
+      <%= t 'browse.changeset_details.closed_at' %> <abbr title="<%= l @changeset.closed_at %>"><%= t('browse.changeset_details.ago', :ago => closed_at) %><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 %>
+  </span>
 </div>
   
-<%= render :partial => "tag_details", :object => @changeset %>
+<%=
+  render :partial => "tag_details", :object => @changeset.tags.except('comment')
+%>
 
 <% unless @nodes.empty? %>
-  <div class='browse-section clearfix paginate'>
+  <div class='browse-section paginate'>
     <h4><%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %></h4>
     <ul>
       <% @nodes.each do |node| %>
@@ -35,7 +47,7 @@
 <% end %>
 
 <% unless @ways.empty? %>
-  <div class='browse-section clearfix  paginate'>
+  <div class='browse-section  paginate'>
     <h4><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></h4>
     <ul>
       <% @ways.each do |way| %>
@@ -47,7 +59,7 @@
 <% end %>
 
 <% unless @relations.empty? %>
-  <div class='browse-section clearfix  paginate'>
+  <div class='browse-section  paginate'>
     <h4><%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %></h4>
       <ul>
         <% @relations.each do |relation| %>
@@ -58,7 +70,7 @@
   </div>
 <% end %>
 
-<div class='browse-section secondary-actions clearfix'> 
+<div class='browse-section secondary-actions'> 
   <span><%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %>
   &middot;
   <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %></span>
diff --git a/app/views/browse/way_history.html.erb b/app/views/browse/way_history.html.erb
index 7d16f191a..79c1a99a4 100644
--- a/app/views/browse/way_history.html.erb
+++ b/app/views/browse/way_history.html.erb
@@ -15,5 +15,6 @@
 
 <div class='secondary-actions clearfix'>
   <span><%= link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history") %>
+    &middot;
   <%= link_to(t('browse.way_history.view_details'), :action => "way") %></span>
 </div>
diff --git a/app/views/changeset/_changeset.html.erb b/app/views/changeset/_changeset.html.erb
index d04032c17..4bccbe516 100644
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -13,7 +13,15 @@
 %>
 
 <%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
-  #<%= link_to(changeset.id, changeset_path(changeset.id), :class => :changeset_id) %>
+  <p class="comment">
+      <a class="changeset_id" href="<%= changeset_path(changeset.id) %>">
+        <% if changeset.tags['comment'].to_s != '' %>
+          <%= linkify(h(changeset.tags['comment'])) %>
+        <% else %>
+          <%= t 'changeset.changeset.no_comment' %>
+        <% end %>
+      </a>
+  </p>
 
   <span class='date'>
     <% if changeset.closed_at > DateTime.now %>
@@ -25,7 +33,7 @@
   </span>
 
   <% unless params.key?(:display_name) %>
-    <span class="user">
+    <span class="user"> by 
       <% if changeset.user.data_public? %>
         <%= link_to changeset.user.display_name, user_path(changeset.user.display_name) %>
       <% else %>
@@ -33,12 +41,4 @@
       <% end %>
     </span>
   <% end %>
-
-  <p class="comment deemphasize">
-    <% if changeset.tags['comment'].to_s != '' %>
-      <%= linkify(h(changeset.tags['comment'])) %>
-    <% else %>
-      <%= t 'changeset.changeset.no_comment' %>
-    <% end %>
-  </p>
 <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0192641e1..56890371c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -133,6 +133,8 @@ en:
       has_nodes: "Nodes (%{count})"
       has_ways: "Ways (%{count})"
       has_relations: "Relations (%{count})"
+      no_comment: "(no comment)"
+      ago: "%{ago} ago"
     common_details:
       edited: "Edited"
       deleted: "Deleted"
@@ -297,7 +299,7 @@ en:
     changeset:
       still_editing: "(still editing)"
       anonymous: "Anonymous"
-      no_comment: "(none)"
+      no_comment: "(no comment)"
       no_edits: "(no edits)"
       show_area_box: "show area box"
       big_area: "(big)"
-- 
2.43.2