aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/views/refinery/blog/posts/archive.html.erb7
-rw-r--r--app/views/refinery/blog/posts/index.html.erb12
-rw-r--r--app/views/refinery/blog/posts/show.html.erb49
-rw-r--r--app/views/refinery/blog/posts/tagged.html.erb7
4 files changed, 8 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 @@
</div>
<% if Refinery::BlogPost.comments_allowed? %>
- <aside id="comments">
- <h2><%= t('.comments.title') %></h2>
- <% if (comments = @blog_post.comments.approved).any? %>
- <%= render :partial => "comment", :collection => comments %>
- <% else %>
- <p>
- <%= t('none', :scope => 'refinery.blog.shared.comments') %>.
- </p>
- <% end %>
-
- <% flash.each do |key, value| %>
- <div id='flash' class="flash flash_<%= key %>">
- <%= value %>
- </div>
- <% end %>
-
- <h2><%= t('.comments.add') %></h2>
- <%= form_for [main_app, :blog_post, @blog_comment] do |f| %>
- <%= render :partial => "/refinery/admin/error_messages",
- :locals => {
- :object => f.object,
- :include_object_name => true
- } %>
- <div class='field'>
- <%= f.label :name %>
- <%= f.text_field :name %>
- </div>
- <div class='field'>
- <%= f.label :email %>
- <%= f.email_field :email %>
- </div>
- <div class='field message_field'>
- <%= f.label :message %>
- <%= f.text_area :message, :rows => 6 %>
- </div>
- <div class='field form-actions'>
- <%= f.submit t('.submit') %>
- </div>
- <% end %>
- </aside>
+ <%= 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') %>