From bd3591c6d16c8910937695161daa4bc1f35d4aea Mon Sep 17 00:00:00 2001 From: Justin Ricaurte Date: Sat, 30 Jul 2011 13:11:12 -0700 Subject: Made it so that comments and the body_content_right have been further refactored out, so that they can be easily overridden. body_content_right can also now have things prepended and appended to it. --- app/views/refinery/blog/posts/archive.html.erb | 7 +--- app/views/refinery/blog/posts/index.html.erb | 12 +++---- app/views/refinery/blog/posts/show.html.erb | 49 ++------------------------ app/views/refinery/blog/posts/tagged.html.erb | 7 +--- refinerycms-blog.gemspec | 2 ++ 5 files changed, 10 insertions(+), 67 deletions(-) diff --git a/app/views/refinery/blog/posts/archive.html.erb b/app/views/refinery/blog/posts/archive.html.erb index 73d33f8..ca12383 100644 --- a/app/views/refinery/blog/posts/archive.html.erb +++ b/app/views/refinery/blog/posts/archive.html.erb @@ -9,12 +9,7 @@ <% end %> <% end %> -<% content_for :body_content_right do %> - <%= render :partial => "/refinery/blog/shared/categories" %> - <%= render :partial => "/refinery/blog/shared/tags" %> - <%= render :partial => "/refinery/blog/shared/rss_feed" %> - <%= blog_archive_widget %> -<% end %> +<%= render :partial => '/refinery/blog/shared/body_content_right' %> <%= render :partial => "/refinery/content_page" %> <% content_for :stylesheets, stylesheet_link_tag('refinerycms-blog') %> diff --git a/app/views/refinery/blog/posts/index.html.erb b/app/views/refinery/blog/posts/index.html.erb index dbb9979..c6ca75a 100644 --- a/app/views/refinery/blog/posts/index.html.erb +++ b/app/views/refinery/blog/posts/index.html.erb @@ -11,14 +11,10 @@ <% end %> <% end %> -<% content_for :body_content_right do %> - <%=raw @page[::Refinery::Page.default_parts.second.to_sym] if ::Refinery::Page.default_parts.many? %> - - <%= render :partial => "/refinery/blog/shared/categories" %> - <%= render :partial => "/refinery/blog/shared/tags" %> - <%= render :partial => "/refinery/blog/shared/rss_feed" %> - <%= blog_archive_widget %> -<% end %> +<% content_for :body_content_right_prepend do -%> + <%= raw @page[::Refinery::Page.default_parts.second.to_sym] if ::Refinery::Page.default_parts.many? %> +<% end -%> +<%= render :partial => '/refinery/blog/shared/body_content_right' %> <%= render :partial => "/refinery/content_page" %> <% content_for :stylesheets, stylesheet_link_tag('refinerycms-blog') %> diff --git a/app/views/refinery/blog/posts/show.html.erb b/app/views/refinery/blog/posts/show.html.erb index c62127d..3670bf1 100644 --- a/app/views/refinery/blog/posts/show.html.erb +++ b/app/views/refinery/blog/posts/show.html.erb @@ -4,56 +4,11 @@ <% if Refinery::BlogPost.comments_allowed? %> - + <%= render 'comments'%> <% end %> <% end %> -<% content_for :body_content_right do %> - <%= render :partial => "/refinery/blog/shared/categories" %> - <%= render :partial => "/refinery/blog/shared/tags" %> - <%= render :partial => "/refinery/blog/shared/posts" %> - <%= render :partial => "/refinery/blog/shared/rss_feed" %> - <%= blog_archive_widget %> -<% end %> +<%= render :partial => '/refinery/blog/shared/body_content_right' %> <%= render :partial => "/refinery/content_page", :locals => { :remove_automatic_sections => true } %> diff --git a/app/views/refinery/blog/posts/tagged.html.erb b/app/views/refinery/blog/posts/tagged.html.erb index 27cba91..f116732 100644 --- a/app/views/refinery/blog/posts/tagged.html.erb +++ b/app/views/refinery/blog/posts/tagged.html.erb @@ -11,12 +11,7 @@ <% end %> <% end %> -<% content_for :body_content_right do %> - <%= render :partial => "/refinery/blog/shared/categories" %> - <%= render :partial => "/refinery/blog/shared/tags" %> - <%= render :partial => "/refinery/blog/shared/rss_feed" %> - <%= blog_archive_widget %> -<% end %> +<%= render :partial => '/refinery/blog/shared/body_content_right' %> <%= render :partial => "/refinery/content_page" %> <% content_for :stylesheets, stylesheet_link_tag('refinerycms-blog') %> diff --git a/refinerycms-blog.gemspec b/refinerycms-blog.gemspec index bc5b069..9a55c33 100644 --- a/refinerycms-blog.gemspec +++ b/refinerycms-blog.gemspec @@ -85,6 +85,7 @@ Gem::Specification.new do |s| app/views/refinery/blog/comment_mailer/notification.html.erb app/views/refinery/blog/posts app/views/refinery/blog/posts/_comment.html.erb + app/views/refinery/blog/posts/_comments.html.erb app/views/refinery/blog/posts/_nav.html.erb app/views/refinery/blog/posts/_post.html.erb app/views/refinery/blog/posts/archive.html.erb @@ -93,6 +94,7 @@ Gem::Specification.new do |s| app/views/refinery/blog/posts/show.html.erb app/views/refinery/blog/posts/tagged.html.erb app/views/refinery/blog/shared + app/views/refinery/blog/shared/_body_content_right.html.erb app/views/refinery/blog/shared/_categories.html.erb app/views/refinery/blog/shared/_post.html.erb app/views/refinery/blog/shared/_posts.html.erb -- cgit v1.2.3