From 9e3876f3f028ec0115f838ed1bea85e83121fd5b Mon Sep 17 00:00:00 2001 From: Ken Decanio Date: Sat, 15 Aug 2015 20:58:25 -0700 Subject: [PATCH 1/3] acts_as_taggable_on rake task has changed. This updates the documentation to reflect that. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9067b71b..ceb7c4ac 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ $ rails g blogit:install rake blogit:install:migrations # You don't need to run this again if you've already done so -rake acts_as_taggable_on:install:migrations +rake acts_as_taggable_on_engine:install:migrations # This will run any pending migrations rake db:migrate From 48885713b6b3d15dd235cae1172c6a99ff1d1121 Mon Sep 17 00:00:00 2001 From: Ken Decanio Date: Sat, 5 Sep 2015 15:47:55 -0700 Subject: [PATCH 2/3] REMOVE - Updates for north --- app/views/blogit/posts/index.html.erb | 2 ++ app/views/blogit/posts/show.html.erb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/views/blogit/posts/index.html.erb b/app/views/blogit/posts/index.html.erb index b2ebf05a..44b391e3 100644 --- a/app/views/blogit/posts/index.html.erb +++ b/app/views/blogit/posts/index.html.erb @@ -3,6 +3,7 @@ <%= t(:showing_posts_tagged_with, scope: "blogit.posts", tag: params[:tag]) %> <% end %> +
<% if @posts.any? %> @@ -20,3 +21,4 @@
<%= render "pagination" %> +
\ No newline at end of file diff --git a/app/views/blogit/posts/show.html.erb b/app/views/blogit/posts/show.html.erb index e3f025c8..cc2e40e5 100644 --- a/app/views/blogit/posts/show.html.erb +++ b/app/views/blogit/posts/show.html.erb @@ -1,5 +1,6 @@ <% title @post.title %> <% description @post.description.to_s %> +
<%= content_tag(:article, id: "blogit_post_#{@post.id}", class: "blogit_post") do %> @@ -26,3 +27,4 @@ <% end %> +
\ No newline at end of file From 634374c0f5bbded364860197fde309701c395882 Mon Sep 17 00:00:00 2001 From: Ken Decanio Date: Sat, 5 Sep 2015 15:48:12 -0700 Subject: [PATCH 3/3] Obscures comments --- .../blogit/comments/_disqus_comments.html.erb | 14 ------- app/views/blogit/posts/index.html.erb | 38 ++++++++++--------- app/views/blogit/posts/show.html.erb | 31 ++++++--------- 3 files changed, 31 insertions(+), 52 deletions(-) delete mode 100644 app/views/blogit/comments/_disqus_comments.html.erb diff --git a/app/views/blogit/comments/_disqus_comments.html.erb b/app/views/blogit/comments/_disqus_comments.html.erb deleted file mode 100644 index 01182351..00000000 --- a/app/views/blogit/comments/_disqus_comments.html.erb +++ /dev/null @@ -1,14 +0,0 @@ -
- - -comments powered by Disqus diff --git a/app/views/blogit/posts/index.html.erb b/app/views/blogit/posts/index.html.erb index 44b391e3..029cfd29 100644 --- a/app/views/blogit/posts/index.html.erb +++ b/app/views/blogit/posts/index.html.erb @@ -1,24 +1,26 @@ -<% if params[:tag] %> -

- <%= t(:showing_posts_tagged_with, scope: "blogit.posts", tag: params[:tag]) %> -

-<% end %>
-
- <% if @posts.any? %> - <%= render partial: "blogit/posts/post", - collection: @posts, - spacer_template: "blog_post_spacer", - locals: { - show_comments_count: (Blogit.configuration.include_comments == :active_records) - } %> - <% else %> + <% if params[:tag] %> +

+ <%= t(:showing_posts_tagged_with, scope: "blogit.posts", tag: params[:tag]) %> +

+ <% end %> - <%= render partial: "blogit/posts/empty" %> +
+ <% if @posts.any? %> + <%= render partial: "blogit/posts/post", + collection: @posts, + spacer_template: "blog_post_spacer", + locals: { + show_comments_count: (Blogit.configuration.include_comments == :active_records) + } %> + <% else %> - <% end %> -
+ <%= render partial: "blogit/posts/empty" %> + + <% end %> +
+ + <%= render "pagination" %> -<%= render "pagination" %>
\ No newline at end of file diff --git a/app/views/blogit/posts/show.html.erb b/app/views/blogit/posts/show.html.erb index cc2e40e5..57dcfd1d 100644 --- a/app/views/blogit/posts/show.html.erb +++ b/app/views/blogit/posts/show.html.erb @@ -1,30 +1,21 @@ -<% title @post.title %> -<% description @post.description.to_s %>
+ <% title @post.title %> + <% description @post.description.to_s %> -<%= content_tag(:article, id: "blogit_post_#{@post.id}", class: "blogit_post") do %> + <%= content_tag(:article, id: "blogit_post_#{@post.id}", class: "blogit_post") do %> - - <%# Render the header for this blog post %> - <%= render "blogit/posts/post_head", post: @post %> - <%= render "blogit/posts/blogger_information", post: @post %> + <%# Render the header for this blog post %> + <%= render "blogit/posts/post_head", post: @post %> - <%# Render the body of this blog post (as Markdown) %> - <%= format_content(@post.body) %> + <%= render "blogit/posts/blogger_information", post: @post %> - <%# Render info about the person who wrote this post %> - <%= share_bar_for_post @post %> + <%# Render the body of this blog post (as Markdown) %> + <%= format_content(@post.body) %> - <%# Render the no. of comments %> - <%= render "blogit/posts/comments_count", - post: post if defined?(show_comments_count) and show_comments_count %> + <%# Render info about the person who wrote this post %> + <%= share_bar_for_post @post %> - <%= render "blogit/posts/tags", post: @post %> - <%= render "blogit/posts/related", post: @post %> - - <%= comments_for_post @post %> - -<% end %> + <% end %>
\ No newline at end of file