From: Aaron Lidman <aaronlidman@gmail.com>
Date: Tue, 5 Nov 2013 21:31:50 +0000 (-0800)
Subject: Merge branch 'redesign' of github.com:osmlab/openstreetmap-website into redesign
X-Git-Tag: live~4629^2~199
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bc27347b8f8333b65962b8c00f76dc99a1095a8a?hp=0f799186abfb97b2d3b056f9bc76996a87aa6fd8

Merge branch 'redesign' of github.com:osmlab/openstreetmap-website into redesign
---

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 3740dd300..13910e565 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1031,7 +1031,7 @@ a.donate {
     }
   }
 
-  .paginate ul {
+  .paginate ul, .note-comments ul {
     padding-left: 20px;
   }
 
@@ -1095,7 +1095,7 @@ a.donate {
 #sidebar_content {
   .browse-section.header {
     padding: 20px;
-    border-bottom: $keyline;
+    border-bottom: 1px solid #ccc;
 
     h2 {
       padding: 0 0 5px 0;
diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index dbf384799..8e277d25f 100644
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,5 +1,20 @@
 <div class='browse-section header'>
   <h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %></h2>
+  <span>
+    <%= t "browse.note.opened" %>: 
+    <abbr><%= note_event(@note.created_at, @note.author) %></abbr> by 
+    <% if @note.author.nil? %>
+      <%= t "browse.note.anonymous" %>
+    <% else %>
+      <%= note_author(@note.author) %>
+    <% end %>
+    <% if @note.status == "closed" %>
+      </span><span>
+      <%= t "browse.note.closed" %>:
+      <abbr><%= note_event(@note.closed_at, @note.author) %></abbr> by 
+      <%= @note.comments.last.author %>
+    <% end %>
+  </span>
 </div>
 
 <% if @note.comments.find { |comment| comment.author.nil? } -%>
@@ -9,11 +24,6 @@
 <% end -%>
 
 <div class='browse-section common'>
-  <div class='browse-field'>
-    <h4><%= t "browse.note.opened" %></h4>
-    <p><%= note_event(@note.created_at, @note.author) %></p>
-  </div>
-
   <% if @note.status == "closed" %>
     <div class='browse-field'>
       <h4><%= t "browse.note.closed" %></h4>
@@ -28,7 +38,8 @@
 
   <div class='browse-field' id="c<%= @note.comments.first.id %>">
     <h4><%= t "browse.note.description" %></h4>
-    <p><%= h(@note.comments.first.body.to_html) %></p>
+    <%= h(@note.comments.first.body.to_html) %>
+    <!-- this provides it's own <p> tags -->
   </div>
 
   <div class='browse-field'>
@@ -38,7 +49,7 @@
 </div>
 
 <% if @note.comments.length > 1 %>
-  <div class='browse-section clearfix'>
+  <div class='browse-section clearfix note-comments'>
     <h4><%= t "browse.note.comments" %></h4>
     <ul>
       <% @note.comments[1..-1].each do |comment| %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 808234cea..0192641e1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -288,6 +288,7 @@ en:
       at_by_html: "%{when} ago by %{user}"
       description: "Description"
       comments: "Comments"
+      anonymous: "anonymous"
   changeset:
     changeset_paging_nav:
       showing_page: "Page %{page}"