From 36c005ecd112b76d3c9c2d7092f22d6e06755d73 Mon Sep 17 00:00:00 2001
From: Philip Arndt
Date: Wed, 9 Nov 2011 22:19:07 +1300
Subject: Refactored everything (models, helpers) into proper namespace of
Refinery::Blog. Requires refinery commit
25162b585b9c4023d39fd1a9796140bfa4ecb909
---
app/views/refinery/admin/blog/_submenu.html.erb | 12 ++++++------
app/views/refinery/admin/blog/posts/_form.html.erb | 1 -
app/views/refinery/blog/categories/show.html.erb | 2 +-
app/views/refinery/blog/comment_mailer/notification.html.erb | 6 +++---
app/views/refinery/blog/posts/_post.html.erb | 2 +-
app/views/refinery/blog/posts/show.html.erb | 6 +++---
app/views/refinery/blog/shared/_categories.html.erb | 2 +-
app/views/refinery/blog/shared/_post.html.erb | 2 +-
8 files changed, 16 insertions(+), 17 deletions(-)
(limited to 'app/views/refinery')
diff --git a/app/views/refinery/admin/blog/_submenu.html.erb b/app/views/refinery/admin/blog/_submenu.html.erb
index 799c101..2915610 100644
--- a/app/views/refinery/admin/blog/_submenu.html.erb
+++ b/app/views/refinery/admin/blog/_submenu.html.erb
@@ -26,11 +26,11 @@
:class => 'page_add_icon' %>
- <% if Refinery::BlogPost.comments_allowed? %>
+ <% if Refinery::Blog::Post.comments_allowed? %>
diff --git a/app/views/refinery/admin/blog/posts/_form.html.erb b/app/views/refinery/admin/blog/posts/_form.html.erb
index 8a3b091..822ec8a 100644
--- a/app/views/refinery/admin/blog/posts/_form.html.erb
+++ b/app/views/refinery/admin/blog/posts/_form.html.erb
@@ -27,7 +27,6 @@
-
<% part_index = -1 %>
<%= render :partial => 'form_part',
:locals => {
diff --git a/app/views/refinery/blog/categories/show.html.erb b/app/views/refinery/blog/categories/show.html.erb
index adcf1aa..00d9596 100644
--- a/app/views/refinery/blog/categories/show.html.erb
+++ b/app/views/refinery/blog/categories/show.html.erb
@@ -1,4 +1,4 @@
-<% content_for :body_content_title, @category.title %>
+<% content_for :body_content_title, @blog_category.title %>
<% content_for :body_content_left do %>
<% if @blog_posts.any? %>
diff --git a/app/views/refinery/blog/comment_mailer/notification.html.erb b/app/views/refinery/blog/comment_mailer/notification.html.erb
index 800f12c..0c7dcd4 100644
--- a/app/views/refinery/blog/comment_mailer/notification.html.erb
+++ b/app/views/refinery/blog/comment_mailer/notification.html.erb
@@ -4,10 +4,10 @@
<%=raw t('.comment_starts') %>
-<%=raw t('.from') %>: <%= @comment.name %>
-<%=raw t('.email') %>: <%= @comment.email %>
+<%=raw t('.from') %>: <%= @blog_comment.name %>
+<%=raw t('.email') %>: <%= @blog_comment.email %>
<%=raw t('.message') %>:
-<%=simple_format strip_tags(@comment.body) %>
+<%=simple_format strip_tags(@blog_comment.body) %>
<%=raw t('.comment_ends') %>
diff --git a/app/views/refinery/blog/posts/_post.html.erb b/app/views/refinery/blog/posts/_post.html.erb
index f86f63a..cbecc5f 100644
--- a/app/views/refinery/blog/posts/_post.html.erb
+++ b/app/views/refinery/blog/posts/_post.html.erb
@@ -23,7 +23,7 @@
<%= @blog_post.body.html_safe %>
- <% if Refinery::BlogPost::ShareThis.enabled? %>
+ <% if Refinery::Blog::Post::ShareThis.enabled? %>
<% end %>
diff --git a/app/views/refinery/blog/posts/show.html.erb b/app/views/refinery/blog/posts/show.html.erb
index 020c964..2ca168e 100644
--- a/app/views/refinery/blog/posts/show.html.erb
+++ b/app/views/refinery/blog/posts/show.html.erb
@@ -3,7 +3,7 @@
<%= render 'post' %>
- <% if Refinery::BlogPost.comments_allowed? %>
+ <% if Refinery::Blog::Post.comments_allowed? %>
<%= render 'comments'%>
<% end %>
<% end %>
@@ -17,5 +17,5 @@
<%# enable AJAX'd post nav at your own risk until html5 history API implemented. %>
<%#= javascript_include_tag('refinery/blog/frontend') %>
-
-<% end if Refinery::BlogPost::ShareThis.enabled? %>
+
+<% end if Refinery::Blog::Post::ShareThis.enabled? %>
diff --git a/app/views/refinery/blog/shared/_categories.html.erb b/app/views/refinery/blog/shared/_categories.html.erb
index 295cae0..1280cd2 100644
--- a/app/views/refinery/blog/shared/_categories.html.erb
+++ b/app/views/refinery/blog/shared/_categories.html.erb
@@ -2,7 +2,7 @@
<%= t('.title') %>
<% @blog_categories.each do |category| %>
- - >
+
- >
<%= link_to "#{category.title} (#{category.post_count})", main_app.blog_category_path(category) %>
<% end %>
diff --git a/app/views/refinery/blog/shared/_post.html.erb b/app/views/refinery/blog/shared/_post.html.erb
index 18271ec..c384bcb 100644
--- a/app/views/refinery/blog/shared/_post.html.erb
+++ b/app/views/refinery/blog/shared/_post.html.erb
@@ -33,7 +33,7 @@
<%= link_to t('read_more', :scope => 'refinery.blog.shared.posts'), main_app.blog_post_path(post) if blog_post_teaser_enabled? %>