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 +--- 4 files changed, 8 insertions(+), 67 deletions(-) (limited to 'app') 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') %> -- cgit v1.2.3 From 999f9e7c0e15610f7f36a6044fd0005f9fa8f258 Mon Sep 17 00:00:00 2001 From: Justin Ricaurte Date: Sat, 30 Jul 2011 13:11:22 -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/_comments.html.erb | 40 ++++++++++++++++++++++ .../blog/shared/_body_content_right.html.erb | 9 +++++ 2 files changed, 49 insertions(+) create mode 100644 app/views/refinery/blog/posts/_comments.html.erb create mode 100644 app/views/refinery/blog/shared/_body_content_right.html.erb (limited to 'app') diff --git a/app/views/refinery/blog/posts/_comments.html.erb b/app/views/refinery/blog/posts/_comments.html.erb new file mode 100644 index 0000000..5157ed9 --- /dev/null +++ b/app/views/refinery/blog/posts/_comments.html.erb @@ -0,0 +1,40 @@ + diff --git a/app/views/refinery/blog/shared/_body_content_right.html.erb b/app/views/refinery/blog/shared/_body_content_right.html.erb new file mode 100644 index 0000000..bd73d1c --- /dev/null +++ b/app/views/refinery/blog/shared/_body_content_right.html.erb @@ -0,0 +1,9 @@ +<% content_for :body_content_right do %> + <%= yield(:body_content_right_prepend) %> + <%= render :partial => "/refinery/blog/shared/rss_feed" %> + <%= render :partial => "/refinery/blog/shared/categories" %> + <%= render :partial => "/refinery/blog/shared/tags" %> + <%= render :partial => "/refinery/blog/shared/posts" %> + <%= blog_archive_widget %> + <%= yield(:body_content_right_append) %> +<% end %> -- cgit v1.2.3