From 11f57448c40398c2d5ae17ff07fbbc495aeb2377 Mon Sep 17 00:00:00 2001
From: Hannah Wolfe <erisds@gmail.com>
Date: Wed, 18 Dec 2013 15:23:35 +0000
Subject: [PATCH] Markup & style fixes for post list statuses

fixes #1703, fixes #1712

- featured star appears immediately for both draft and published items
- featured star is never red & alignment /style is updated
- improved markup and styling of statuses in general
- added to feature tests
---
 ghost/admin/assets/sass/layouts/manage.scss | 16 ++++++++++++----
 ghost/admin/assets/sass/modules/global.scss | 10 +---------
 ghost/admin/tpl/list-item.hbs               |  6 ++++--
 ghost/admin/views/blog.js                   |  2 +-
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/ghost/admin/assets/sass/layouts/manage.scss b/ghost/admin/assets/sass/layouts/manage.scss
index 58ed17f165..fa6f6d2af1 100644
--- a/ghost/admin/assets/sass/layouts/manage.scss
+++ b/ghost/admin/assets/sass/layouts/manage.scss
@@ -95,14 +95,22 @@
             }
         }
 
-        .featured .date {
+        .featured .status {
             @include icon($i-featured, 11px) {
-                margin-right:12px;
-                vertical-align: 0;
+                margin-right: 10px;
+                vertical-align: 7%;
             };
         }
 
-        ol {
+        .status .draft {
+            color: $red;
+        }
+        .status .scheduled {
+            color: $orange;
+        }
+
+
+      ol {
             list-style: none;
             padding:0;
             margin:0;
diff --git a/ghost/admin/assets/sass/modules/global.scss b/ghost/admin/assets/sass/modules/global.scss
index e43f172141..d099cb84d7 100644
--- a/ghost/admin/assets/sass/modules/global.scss
+++ b/ghost/admin/assets/sass/modules/global.scss
@@ -1677,12 +1677,4 @@ main {
         background:$orange;
     }
 
-}
-
-.status-draft {
-    color: $red;
-}
-.status-scheduled {
-    color: $orange;
-}
-
+}
\ No newline at end of file
diff --git a/ghost/admin/tpl/list-item.hbs b/ghost/admin/tpl/list-item.hbs
index 4edcfb23e7..304dbf8741 100644
--- a/ghost/admin/tpl/list-item.hbs
+++ b/ghost/admin/tpl/list-item.hbs
@@ -1,16 +1,18 @@
 <a class="permalink{{#if featured}} featured{{/if}}{{#if page}} page{{/if}}" href="#" title="Edit this post">
     <h3 class="entry-title">{{{title}}}</h3>
     <section class="entry-meta">
+        <span class="status">
         {{#if published}}
             {{#if page}}
                     <span class="page">Page</span>
             {{else}}
-                <time datetime="{{date published_at format="YYYY-MM-DD hh:mm"}}" class="date">
+                <time datetime="{{date published_at format="YYYY-MM-DD hh:mm"}}" class="date published">
                     Published {{date published_at timeago="True"}}
                 </time>
             {{/if}}
         {{else}}
-            <span class="status-draft">Draft</span>
+            <span class="draft">Draft</span>
         {{/if}}
+        </span>
     </section>
 </a>
diff --git a/ghost/admin/views/blog.js b/ghost/admin/views/blog.js
index aaebe7fe5d..9370496191 100644
--- a/ghost/admin/views/blog.js
+++ b/ghost/admin/views/blog.js
@@ -138,7 +138,7 @@
 
         initialize: function () {
             this.listenTo(Backbone, 'blog:activeItem', this.checkActive);
-            this.listenTo(this.model, 'change:page', this.render);
+            this.listenTo(this.model, 'change:page change:featured', this.render);
             this.listenTo(this.model, 'destroy', this.removeItem);
         },