2 files changed, 12 insertions, 5 deletions
diff --git a/app/views/refinery/blog/admin/posts/_form.html.erb b/app/views/refinery/blog/admin/posts/_form.html.erb
index 9bfd42a..a977754 100644
--- a/app/views/refinery/blog/admin/posts/_form.html.erb
+++ b/app/views/refinery/blog/admin/posts/_form.html.erb
@@ -9,6 +9,13 @@
     <%= 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'>
@@ -50,10 +57,6 @@
                   :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">
diff --git a/app/views/refinery/blog/admin/posts/_post.html.erb b/app/views/refinery/blog/admin/posts/_post.html.erb
index b5018f3..fea3eb8 100644
--- a/app/views/refinery/blog/admin/posts/_post.html.erb
+++ b/app/views/refinery/blog/admin/posts/_post.html.erb
@@ -2,8 +2,12 @@
   <span class='title'>
     <%= post.title %>
     <span class="preview">
-      <%= post.published_at.try(:strftime, '%b %d, %Y') || 'draft' %>
       <%= " by #{post.author.username}" if post.author.present? %>
+      <% if post.draft? %>
+        <span class="label notice"><%= t('refinery.blog.admin.posts.post.draft') %></span>
+      <% else %>
+        <%= post.published_at.strftime('%b %d, %Y') %>
+      <% end %>
     </span>
   </span>
   <span class='actions'>