Improve notes template

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 6e1c8e016f2bf560e4db4d3463eb675dc875ffe7..a2d8e994ea0d5201e6bbcdf89a15bff5633d0452 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1013,7 +1013,7 @@ a.donate {
     }
   }
 
     }
   }
 

-  .paginate ul {
+  .paginate ul, .note-comments ul {

     padding-left: 20px;
   }
 
     padding-left: 20px;
   }
 


@@ -1077,7 +1077,7 @@ a.donate {
 #sidebar_content {
   .browse-section.header {
     padding: 20px;
 #sidebar_content {
   .browse-section.header {
     padding: 20px;

-    border-bottom: $keyline;
+    border-bottom: 1px solid #ccc;

 
     h2 {
       padding: 0 0 5px 0;
 
     h2 {
       padding: 0 0 5px 0;

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index dbf384799a0a47b0f3780dadca1edf61081e8aaf..8e277d25f97b6f794052b11ddbffe7030f48c5a1 100644 (file)
--- 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>
 <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? } -%>
 </div>
 
 <% if @note.comments.find { |comment| comment.author.nil? } -%>


@@ -9,11 +24,6 @@
 <% end -%>
 
 <div class='browse-section common'>
 <% 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>
   <% 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>
 
   <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'>
   </div>
 
   <div class='browse-field'>


@@ -38,7 +49,7 @@
 </div>
 
 <% if @note.comments.length > 1 %>
 </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| %>
     <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 808234cead846fc6e40ad35b4c68cdd9defc8aff..0192641e1ec29a0014ecef0dd3c41190af2f4815 100644 (file)
--- 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"
       at_by_html: "%{when} ago by %{user}"
       description: "Description"
       comments: "Comments"

+      anonymous: "anonymous"

   changeset:
     changeset_paging_nav:
       showing_page: "Page %{page}"
   changeset:
     changeset_paging_nav:
       showing_page: "Page %{page}"