From: Aaron Lidman <aaronlidman@gmail.com>
Date: Mon, 11 Nov 2013 07:23:40 +0000 (-0800)
Subject: Fix note formatting issues
X-Git-Tag: live~4653^2~128
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2ebe5de1a1cf247596f98cd82420cb00179cc477?ds=inline

Fix note formatting issues
---

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index d00aa9682..081f0945f 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1091,7 +1091,7 @@ a.donate {
     }
   }
 
-  .paginate ul, .note-comments ul {
+  .paginate ul {
     padding-left: 20px;
   }
 
diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index ed13f97c7..5c364e815 100644
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -6,8 +6,7 @@
 </h2>
 <div class="browse-section">
   <h4>
-    <%= @note.author %>
-    <%= note_event(@note.status, @note.created_at, @note.author) %>
+    <%= note_event('open', @note.created_at, @note.author) %>
     <% if @note.status == "closed" %>
       <br/>
       <%= note_event(@note.status, @note.closed_at, @note.comments.last.author) %>
@@ -35,7 +34,6 @@
 
 <% if @note.comments.length > 1 %>
   <div class='browse-section clearfix note-comments'>
-    <h4><%= t "browse.note.comments" %></h4>
     <ul>
       <% @note.comments[1..-1].each do |comment| %>
         <li id="c<%= comment.id %>">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5cbbf8cd8..2a546abce 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -292,14 +292,14 @@ en:
       description: "Description"
       comments: "Comments"
       anonymous: "anonymous"
-      open_by: "Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr> ago"
-      open_by_anonymous: "Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr> ago"
-      commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr> ago"
-      commented_by_anonymous: "Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr> ago"
-      closed_by: "Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr> ago"
-      closed_by_anonymous: "Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr> ago"
-      reopened_by: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr> ago"
-      reopened_by_anonymous: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr> ago"
+      open_by: "Created by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      open_by_anonymous: "Created by anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      commented_by_anonymous: "Comment from anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      closed_by: "Resolved by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      closed_by_anonymous: "Resolved by anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      reopened_by: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      reopened_by_anonymous: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
   changeset:
     changeset_paging_nav:
       showing_page: "Page %{page}"