From f3d32c1ac523e19ba76e3f1f0be23c0610c799b3 Mon Sep 17 00:00:00 2001
From: Nic Haynes <nic@neotericdesign.com>
Date: Thu, 8 Dec 2011 10:47:55 -0600
Subject: [PATCH 1/5] Rename posts partial to related posts

---
 app/views/blog/posts/_post.html.erb           | 31 ----------------
 app/views/blog/posts/show.html.erb            | 37 +++++++++++++++++--
 app/views/blog/shared/_related_posts.html.erb | 10 +++++
 3 files changed, 44 insertions(+), 34 deletions(-)
 delete mode 100644 app/views/blog/posts/_post.html.erb
 create mode 100644 app/views/blog/shared/_related_posts.html.erb

diff --git a/app/views/blog/posts/_post.html.erb b/app/views/blog/posts/_post.html.erb
deleted file mode 100644
index 12978d3..0000000
--- a/app/views/blog/posts/_post.html.erb
+++ /dev/null
@@ -1,31 +0,0 @@
-<% flash.each do |key, value| %>
- <div id='flash' class="flash flash_<%= key %>">
-   <%= value %>
- </div>
-<% end %>
-<article id="blog_post">
-  <header>
-    <h1><%= @blog_post.title %></h1>
-    <section class='details'>
-      <time datetime="<%=l @blog_post.published_at.to_date, :format => :default %>" class='posted_at'>
-        <%= t('created_at', :scope => 'blog.shared.posts', :when => l(@blog_post.published_at.to_date, :format => :short)) %>
-      </time>
-      <%= "#{t('by', :scope => 'blog.posts.show')} #{@blog_post.author.username}" if @blog_post.author.present? %>.
-      <% if (categories = @blog_post.categories).any? %>
-        <aside class='filed_in'>
-          <%= t('filed_in', :scope => 'blog.posts.show') %>
-          <% categories.each_with_index do |category, index| %>
-            <%= link_to category.title, blog_category_url(category) -%><%= ',' if index < ((categories.length) - 1) %>
-          <% end %>
-        </aside>
-      <% end %>
-    </section>
-  </header>
-  <%= @blog_post.body.html_safe %>
-
-  <% if BlogPost::ShareThis.enabled? %>
-    <span class="st_sharethis" displayText="ShareThis"></span>
-  <% end %>
-</article>
-<%= render :partial => '/shared/draft_page_message' unless @blog_post.nil? or @blog_post.live? -%>
-<%= render 'nav' if next_or_previous?(@blog_post) %>
diff --git a/app/views/blog/posts/show.html.erb b/app/views/blog/posts/show.html.erb
index cc763a8..99e984c 100644
--- a/app/views/blog/posts/show.html.erb
+++ b/app/views/blog/posts/show.html.erb
@@ -1,6 +1,37 @@
 <% content_for :body_content_left do %>
   <div id="show_blog_post">
-    <%= render 'post' %>
+    <% flash.each do |key, value| %>
+     <div id='flash' class="flash flash_<%= key %>">
+       <%= value %>
+     </div>
+    <% end %>
+    <article id="blog_post">
+      <header>
+        <h1><%= @blog_post.title %></h1>
+        <section class='details'>
+          <time datetime="<%=l @blog_post.published_at.to_date, :format => :default %>" class='posted_at'>
+            <%= t('created_at', :scope => 'blog.shared.posts', :when => l(@blog_post.published_at.to_date, :format => :short)) %>
+          </time>
+          <%= "#{t('by', :scope => 'blog.posts.show')} #{@blog_post.author.username}" if @blog_post.author.present? %>.
+          <% if (categories = @blog_post.categories).any? %>
+            <aside class='filed_in'>
+              <%= t('filed_in', :scope => 'blog.posts.show') %>
+              <% categories.each_with_index do |category, index| %>
+                <%= link_to category.title, blog_category_url(category) -%><%= ',' if index < ((categories.length) - 1) %>
+              <% end %>
+            </aside>
+          <% end %>
+        </section>
+      </header>
+      <%= @blog_post.body.html_safe %>
+
+      <% if BlogPost::ShareThis.enabled? %>
+        <span class="st_sharethis" displayText="ShareThis"></span>
+      <% end %>
+    </article>
+    <%= render :partial => '/shared/draft_page_message' unless @blog_post.nil? or @blog_post.live? -%>
+    <%= render 'nav' if next_or_previous?(@blog_post) %>
+    
   </div>
 
   <% if BlogPost.comments_allowed? %>
@@ -50,9 +81,9 @@
 <% content_for :body_content_right do %>
   <%= render :partial => "/blog/shared/categories" %>
   <%= render :partial => "/blog/shared/tags" %>
-  <%= render :partial => "/blog/shared/posts" %>
+  <%= render :partial => "/blog/shared/related_posts" %>
   <%= render :partial => "/blog/shared/rss_feed" %>
-  <%= blog_archive_list %>
+  <%= render :partial => "/blog/shared/archive_list" %>
 <% end %>
 
 <%= render :partial => "/shared/content_page", :locals => { :remove_automatic_sections => true }  %>
diff --git a/app/views/blog/shared/_related_posts.html.erb b/app/views/blog/shared/_related_posts.html.erb
new file mode 100644
index 0000000..24a8199
--- /dev/null
+++ b/app/views/blog/shared/_related_posts.html.erb
@@ -0,0 +1,10 @@
+<% if @blog_posts.many? %>
+  <h2><%= t('.other') %></h2>
+  <ul id="blog_posts">
+    <% @blog_posts.each do |blog_post| %>
+      <li class='clearfix'>
+        <%= link_to blog_post.title, blog_post_url(blog_post) %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>
\ No newline at end of file

From 7d8588dfd2eac755cdabef6b39725dcb0af439d3 Mon Sep 17 00:00:00 2001
From: Nic Haynes <nic@neotericdesign.com>
Date: Thu, 8 Dec 2011 10:48:11 -0600
Subject: [PATCH 2/5] Refactor archive helper

Now returns a list in an li instead of full markup
---
 app/helpers/blog_posts_helper.rb             |  5 +----
 app/views/blog/posts/archive.html.erb        |  2 +-
 app/views/blog/posts/index.html.erb          |  2 +-
 app/views/blog/posts/tagged.html.erb         |  2 +-
 app/views/blog/shared/_archive_list.html.erb |  9 +++++++++
 app/views/blog/shared/_posts.html.erb        | 10 ----------
 6 files changed, 13 insertions(+), 17 deletions(-)
 create mode 100644 app/views/blog/shared/_archive_list.html.erb
 delete mode 100644 app/views/blog/shared/_posts.html.erb

diff --git a/app/helpers/blog_posts_helper.rb b/app/helpers/blog_posts_helper.rb
index 74eb521..92e2bae 100644
--- a/app/helpers/blog_posts_helper.rb
+++ b/app/helpers/blog_posts_helper.rb
@@ -2,9 +2,7 @@ module BlogPostsHelper
   def blog_archive_list
     posts = BlogPost.live.select('published_at').all_previous
     return nil if posts.blank?
-    html = '<section id="blog_archive_list"><h2>'
-    html << t('archives', :scope => 'blog.shared')
-    html << '</h2><nav><ul>'
+    html = ''
     links = []
     super_old_links = []
 
@@ -34,7 +32,6 @@ module BlogPostsHelper
       html << link_to(text, archive_blog_posts_path(:year => year))
       html << "</li>"
     end
-    html << '</ul></nav></section>'
     html.html_safe
   end
 
diff --git a/app/views/blog/posts/archive.html.erb b/app/views/blog/posts/archive.html.erb
index a2044e8..893e44d 100644
--- a/app/views/blog/posts/archive.html.erb
+++ b/app/views/blog/posts/archive.html.erb
@@ -13,7 +13,7 @@
   <%= render :partial => "/blog/shared/categories" %>
   <%= render :partial => "/blog/shared/tags" %>
   <%= render :partial => "/blog/shared/rss_feed" %>
-  <%= blog_archive_list %>
+  <%= render :partial => "/blog/shared/archive_list" %>
 <% end %>
 
 <%= render :partial => "/shared/content_page" %>
diff --git a/app/views/blog/posts/index.html.erb b/app/views/blog/posts/index.html.erb
index 8c3801a..74bc2c7 100644
--- a/app/views/blog/posts/index.html.erb
+++ b/app/views/blog/posts/index.html.erb
@@ -17,7 +17,7 @@
   <%= render :partial => "/blog/shared/categories" %>
   <%= render :partial => "/blog/shared/tags" %>
   <%= render :partial => "/blog/shared/rss_feed" %>
-  <%= blog_archive_list %>
+  <%= render :partial => "/blog/shared/archive_list" %>
 <% end %>
 
 <%= render :partial => "/shared/content_page" %>
diff --git a/app/views/blog/posts/tagged.html.erb b/app/views/blog/posts/tagged.html.erb
index 904150f..e7ee221 100644
--- a/app/views/blog/posts/tagged.html.erb
+++ b/app/views/blog/posts/tagged.html.erb
@@ -15,7 +15,7 @@
   <%= render :partial => "/blog/shared/categories" %>
   <%= render :partial => "/blog/shared/tags" %>
   <%= render :partial => "/blog/shared/rss_feed" %>
-  <%= blog_archive_list %>
+  <%= render :partial => "/blog/shared/archive_list" %>
 <% end %>
 
 <%= render :partial => "/shared/content_page" %>
diff --git a/app/views/blog/shared/_archive_list.html.erb b/app/views/blog/shared/_archive_list.html.erb
new file mode 100644
index 0000000..ddd7b39
--- /dev/null
+++ b/app/views/blog/shared/_archive_list.html.erb
@@ -0,0 +1,9 @@
+<%
+  archive_posts = blog_archive_list
+%>
+<% if archive_posts.any? %>
+  <h2><%= t('archives', :scope => 'blog.shared') %></h2>
+  <ul>
+    <%= archive_posts %>
+  </ul>
+<% end %>
\ No newline at end of file
diff --git a/app/views/blog/shared/_posts.html.erb b/app/views/blog/shared/_posts.html.erb
deleted file mode 100644
index 24a8199..0000000
--- a/app/views/blog/shared/_posts.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% if @blog_posts.many? %>
-  <h2><%= t('.other') %></h2>
-  <ul id="blog_posts">
-    <% @blog_posts.each do |blog_post| %>
-      <li class='clearfix'>
-        <%= link_to blog_post.title, blog_post_url(blog_post) %>
-      </li>
-    <% end %>
-  </ul>
-<% end %>
\ No newline at end of file

From 9840c56b4027fe1db7dd0c103c32aed2f5b886db Mon Sep 17 00:00:00 2001
From: Nic Haynes <nic@neotericdesign.com>
Date: Thu, 8 Dec 2011 11:01:08 -0600
Subject: [PATCH 3/5] Add draft UI label in index

---
 app/views/admin/blog/posts/_post.html.erb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/views/admin/blog/posts/_post.html.erb b/app/views/admin/blog/posts/_post.html.erb
index a7f09e0..d7e5ba2 100644
--- a/app/views/admin/blog/posts/_post.html.erb
+++ b/app/views/admin/blog/posts/_post.html.erb
@@ -6,6 +6,9 @@
       <%= " by #{post.author.username}" if post.author.present? %>
     </span>
   </span>
+  <% if post.draft? %>
+    <span class="label notice">Draft</span>
+  <% end %>
   <span class='actions'>
     <%= link_to refinery_icon_tag("application_go.png"), blog_post_url(post),
         :title => t('.view_live_html'),

From 57619d69936ff37d7d3bda3f7728005613ca8e0d Mon Sep 17 00:00:00 2001
From: Nic Haynes <nic@neotericdesign.com>
Date: Thu, 8 Dec 2011 11:35:57 -0600
Subject: [PATCH 4/5] Fix archive partial

---
 app/views/blog/shared/_archive_list.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/blog/shared/_archive_list.html.erb b/app/views/blog/shared/_archive_list.html.erb
index ddd7b39..dd758da 100644
--- a/app/views/blog/shared/_archive_list.html.erb
+++ b/app/views/blog/shared/_archive_list.html.erb
@@ -1,7 +1,7 @@
 <%
   archive_posts = blog_archive_list
 %>
-<% if archive_posts.any? %>
+<% if archive_posts.present? %>
   <h2><%= t('archives', :scope => 'blog.shared') %></h2>
   <ul>
     <%= archive_posts %>

From 5c78c38e98acf0af8713d56ae65d905140e374be Mon Sep 17 00:00:00 2001
From: Nic Haynes <nic@neotericdesign.com>
Date: Thu, 8 Dec 2011 11:36:28 -0600
Subject: [PATCH 5/5] Move Draft checkbox under title for better usability

---
 app/views/admin/blog/posts/_form.html.erb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/views/admin/blog/posts/_form.html.erb b/app/views/admin/blog/posts/_form.html.erb
index c891b63..3da6cd3 100644
--- a/app/views/admin/blog/posts/_form.html.erb
+++ b/app/views/admin/blog/posts/_form.html.erb
@@ -9,7 +9,12 @@
     <%= f.label :title -%>
     <%= f.text_field :title, :class => 'larger widest' -%>
   </div>
-
+  <div class="field">
+    <p>
+      <%= f.check_box :draft %>
+      <%= f.label :draft, t('.save_as_draft'), :class => "stripped" %>
+    </p>
+  </div>
   <div class='field'>
     <div id='page-tabs' class='clearfix ui-tabs ui-widget ui-widget-content ui-corner-all'>
       <ul id='page_parts'>
@@ -59,10 +64,7 @@
                   :id => 'toggle_advanced_options',
                   :title => t('.toggle_advanced_options') %>
     </p>
-    <span id='draft_field'>
-      <%= f.check_box :draft %>
-      <%= f.label :draft, t('.save_as_draft'), :class => "stripped" %>
-    </span>
+    
   </div>
   <div id='more_options' style="display:none;">
     <div class="hemisquare">