Format note comments correctly in the data browser
authorTom Hughes <tom@compton.nu>
Sun, 2 Dec 2012 16:46:33 +0000 (16:46 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 3 Dec 2012 14:50:55 +0000 (14:50 +0000)
app/assets/stylesheets/common.css.scss
app/views/browse/note.html.erb

index 4c7012f2caa2204e946743fdbc998d32e68c5088..53fa9ccf3798cd936a8cdd6072b40eb7d7317135 100644 (file)
@@ -835,19 +835,24 @@ table.browse_details th {
 
 td.browse_comments {
   padding: 0px;
-}
 
-td.browse_comments table {
-  border-collapse: collapse;
-}
+  table {
+    border-collapse: collapse;
 
-td.browse_comments table td {
-  padding-bottom: 10px;
-}
+    td {
+      padding-bottom: 10px;
 
-td.browse_comments table td span.by {
-  font-size: small;
-  color: #999999;
+      p {
+        margin-top: 0px;
+        margin-bottom: 0px;
+      }
+
+      span.by {
+        font-size: small;
+        color: #999999;
+      }
+    }
+  }
 }
 
 #browse_map {
index 4137c33c1dd5f0e351e21393d6e28bfdc3344717..12de1114f654f67d106a48e789f353a54208c442 100644 (file)
@@ -44,8 +44,7 @@
           <% @note.comments[1..-1].each do |comment| %>
             <tr>
               <td>
-                <%= h(comment.body) %>
-                <br />
+                <%= comment.body.to_html %>
                 <span class="by"><%= t "browse.note.at_by_html", :when => friendly_date(comment.created_at), :user => note_author(comment) %></span>
               </td>
             </tr>