Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

acts_as_taggable_on rake task changed. Updates to reflect this. #75

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+36 −53
Open

acts_as_taggable_on rake task changed. Updates to reflect this. #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e3876f
acts_as_taggable_on rake task has changed. This updates the document…
justthisguy Aug 16, 2015
9a2a06a
Merge branch 'master' of github.com:KatanaCode/blogit
justthisguy Sep 1, 2015
4888571
REMOVE - Updates for north
justthisguy Sep 5, 2015
634374c
Obscures comments
justthisguy Sep 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 0 additions & 14 deletions app/views/blogit/comments/_disqus_comments.html.erb
View file
Open in desktop

This file was deleted.

40 changes: 22 additions & 18 deletions app/views/blogit/posts/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
<% if params[:tag] %>
<h2 class="blogit_header--page">
<%= t(:showing_posts_tagged_with, scope: "blogit.posts", tag: params[:tag]) %>
</h2>
<% end %>
<div class="offset-for-navbar">

<div class="blogit_posts_list">
<% 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] %>
<h2 class="blogit_header--page">
<%= t(:showing_posts_tagged_with, scope: "blogit.posts", tag: params[:tag]) %>
</h2>
<% end %>

<%= render partial: "blogit/posts/empty" %>
<div class="blogit_posts_list">
<% 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 %>
</div>
<%= render partial: "blogit/posts/empty" %>

<% end %>
</div>

<%= render "pagination" %>

<%= render "pagination" %>
</div>
33 changes: 13 additions & 20 deletions app/views/blogit/posts/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,21 @@
<% title @post.title %>
<% description @post.description.to_s %>
<div class="offset-for-navbar">
<% 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 %>

</div>