More deprecation warnings found

7 files changed, 32 insertions, 29 deletions

diff --git a/app/views/admin/blog/_submenu.html.erb b/app/views/admin/blog/_submenu.html.erb
index 5c93891..5db96cf 100644
--- a/app/views/admin/blog/_submenu.html.erb
+++ b/app/views/admin/blog/_submenu.html.erb
@@ -78,7 +78,9 @@
   </ul>
 
 </nav>
-<% content_for :head do %>
+<% content_for :stylesheets do -%>
   <%= stylesheet_link_tag 'refinery/refinerycms-blog' %>
+<% end -%>
+<% content_for :javascripts do -%>
   <%= javascript_include_tag 'refinery/refinerycms-blog' %>
-<% end %>
\ No newline at end of file
+<% end -%>
\ No newline at end of file
diff --git a/app/views/admin/blog/comments/show.html.erb b/app/views/admin/blog/comments/show.html.erb
index 1cc29bb..f22edd8 100644
--- a/app/views/admin/blog/comments/show.html.erb
+++ b/app/views/admin/blog/comments/show.html.erb
@@ -60,4 +60,4 @@
   </table>
 </div>
 
-<% content_for :head, stylesheet_link_tag('refinery/refinerycms-blog') %>
\ No newline at end of file
+<% content_for :stylesheets, stylesheet_link_tag('refinery/refinerycms-blog') %>
\ No newline at end of file
diff --git a/app/views/blog/categories/show.html.erb b/app/views/blog/categories/show.html.erb
index 3b4a966..54b5169 100644
--- a/app/views/blog/categories/show.html.erb
+++ b/app/views/blog/categories/show.html.erb
@@ -17,4 +17,4 @@
 <% end %>
 
 <%= render :partial => "/shared/content_page" %>
-<% content_for :head, stylesheet_link_tag('refinerycms-blog') %>
\ No newline at end of file
+<% content_for :stylesheets, stylesheet_link_tag('refinerycms-blog') %>
\ No newline at end of file
diff --git a/app/views/blog/posts/_post.html.erb b/app/views/blog/posts/_post.html.erb
new file mode 100644
index 0000000..64afa16
--- /dev/null
+++ b/app/views/blog/posts/_post.html.erb
@@ -0,0 +1,21 @@
+<header>
+  <h1><%= @blog_post.title %></h1>
+  <details>
+    <time datetime="<%= @blog_post.published_at.strftime('%Y-%m-%d') %>" class='posted_at'>
+      <%= t('blog.shared.posts.created_at', :when => @blog_post.published_at.strftime('%d %B %Y')) %>.        
+    </time>
+    <% if (categories = @blog_post.categories).any? %>
+      <aside class='filed_in'>
+        <%= t('.filed_in') %>
+        <% categories.each_with_index do |category, index| %>
+            <%= link_to category.title, blog_category_url(category) -%><%= ',' if index < ((categories.length) - 1) %>
+        <% end %>
+      </aside>
+    <% end %>
+  </details>
+</header>
+<%= @blog_post.body.html_safe %>
+
+<% if BlogPost::ShareThis.enabled? %>
+  <span class="st_sharethis" displayText="ShareThis"></span>
+<% end %>
\ No newline at end of file
diff --git a/app/views/blog/posts/archive.html.erb b/app/views/blog/posts/archive.html.erb
index 8283f0a..a5354ab 100644
--- a/app/views/blog/posts/archive.html.erb
+++ b/app/views/blog/posts/archive.html.erb
@@ -16,4 +16,4 @@
 <% end %>
 
 <%= render :partial => "/shared/content_page" %>
-<% content_for :head, stylesheet_link_tag('refinerycms-blog') %>
\ No newline at end of file
+<% content_for :stylesheets, stylesheet_link_tag('refinerycms-blog') %>
\ No newline at end of file
diff --git a/app/views/blog/posts/index.html.erb b/app/views/blog/posts/index.html.erb
index 9e63ac2..1d054e1 100644
--- a/app/views/blog/posts/index.html.erb
+++ b/app/views/blog/posts/index.html.erb
@@ -17,4 +17,4 @@
 <% end %>
 
 <%= render :partial => "/shared/content_page" %>
-<% content_for :head, stylesheet_link_tag('refinerycms-blog') %>
\ No newline at end of file
+<% content_for :stylesheets, stylesheet_link_tag('refinerycms-blog') %>
\ No newline at end of file
diff --git a/app/views/blog/posts/show.html.erb b/app/views/blog/posts/show.html.erb
index 6d11197..530bede 100644
--- a/app/views/blog/posts/show.html.erb
+++ b/app/views/blog/posts/show.html.erb
@@ -1,4 +1,4 @@
-<% content_for :head do %>
+<% content_for :after_javascript_libraries do %>
   <% if BlogPost::ShareThis.enabled? %>
     <script src="http://w.sharethis.com/button/buttons.js"></script>
     <script>
@@ -9,27 +9,7 @@
 
 <% content_for :body_content_left do %>
   <article class="blog_post" id="show_blog_post">
-    <header>
-      <h1><%= @blog_post.title %></h1>
-      <details>
-        <time datetime="<%= @blog_post.published_at.strftime('%Y-%m-%d') %>" class='posted_at'>
-          <%= t('blog.shared.posts.created_at', :when => @blog_post.published_at.strftime('%d %B %Y')) %>.        
-        </time>
-        <% if (categories = @blog_post.categories).any? %>
-          <aside class='filed_in'>
-            <%= t('.filed_in') %>
-            <% categories.each_with_index do |category, index| %>
-                <%= link_to category.title, blog_category_url(category) -%><%= ',' if index < ((categories.length) - 1) %>
-            <% end %>
-          </aside>
-        <% end %>
-      </details>
-    </header>
-    <%= @blog_post.body.html_safe %>
-
-    <% if BlogPost::ShareThis.enabled? %>
-      <span class="st_sharethis" displayText="ShareThis"></span>
-    <% end %>
+    <%= render 'post' %>
   </article>
   <% if next_or_previous?(@blog_post) -%>
     <nav id="next_prev_article">
@@ -99,4 +79,4 @@
 <% end %>
 
 <%= render :partial => "/shared/content_page", :locals => { :remove_automatic_sections => true }  %>
-<% content_for :head, stylesheet_link_tag('refinerycms-blog') %>
\ No newline at end of file
+<% content_for :stylesheets, stylesheet_link_tag('refinerycms-blog') %>
\ No newline at end of file