diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index 5980e6dcb..e03fca335 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -141,16 +141,10 @@ $("#post-sections li a").click(function(e) { if (e.target.hash === "#comments") { $("#comments").fadeIn("fast"); - $("#notes").hide(); - $("#edit").hide(); - } else if (e.target.hash === "#notes") { - $("#notes").fadeIn("fast"); - $("#comments").hide(); $("#edit").hide(); } else { $("#edit").fadeIn("fast"); $("#comments").hide(); - $("#notes").hide(); } $("#post-sections li").removeClass("active"); diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index 42453a3ee..af471c568 100644 --- a/app/assets/stylesheets/specific/posts.css.scss +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -162,15 +162,7 @@ div#c-posts { } } - section#notes { - margin-top: 1em; - - article { - margin-bottom: 1em; - } - } - - section#edit { + section { margin-top: 1em; } diff --git a/app/views/notes/index_by_note.html.erb b/app/views/notes/index_by_note.html.erb index c222ad203..b18c32b0b 100644 --- a/app/views/notes/index_by_note.html.erb +++ b/app/views/notes/index_by_note.html.erb @@ -1,5 +1,7 @@
+

Notes

+ diff --git a/app/views/notes/index_by_post.html.erb b/app/views/notes/index_by_post.html.erb index e7c787cfd..44ff2c607 100644 --- a/app/views/notes/index_by_post.html.erb +++ b/app/views/notes/index_by_post.html.erb @@ -1,5 +1,7 @@
+

Notes

+ <%= @post_set.presenter.post_previews_html(self) %> <%= numbered_paginator(@posts, false) %> diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb index 4687882fc..634b59027 100644 --- a/app/views/posts/show.html.erb +++ b/app/views/posts/show.html.erb @@ -46,7 +46,6 @@
  • Comments
  • Edit
  • -
  • Notes
  • @@ -54,10 +53,6 @@
    - <% if @post.notes.active.empty? %> -

    There are no notes.

    - <% end %> - <%= render :partial => "notes/note", :collection => @post.notes.active %>