From 12c795f4b3db390ddcf35feb1080dc2fbeb72113 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Wed, 5 Feb 2014 11:59:07 +0000
Subject: [PATCH] merging from ui update branch

---
 .../static/wagtailadmin/css/components/forms.less          | 2 +-
 .../templates/wagtailadmin/home/recent_edits.html          | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
index c98a47f302..e57dc55324 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/components/forms.less
@@ -655,7 +655,7 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
 
             &:before{
                 width:2.2em;
-                line-height:2.2em;
+                line-height:2.3em;
             }
         }
     }
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html b/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html
index d28058fd62..27f282259e 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html
@@ -19,7 +19,12 @@
                             <td class="title">
                                 <h2><a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" title="Edit this page">{{ revision.page.title }}</a></h2>
                                 <ul class="actions">
-                                    <li><a href="{% url 'wagtailadmin_pages_view_draft' revision.page.id %}">Preview</a></li>
+                                    {% if revision.page.has_unpublished_changes %}
+                                        <li><a href="{% url 'wagtailadmin_pages_view_draft' revision.page.id %}" target="_blank">View draft</a></li>
+                                    {% endif %}
+                                    {% if revision.page.live %}
+                                        <li><a href="{{ revision.page.url }}" target="_blank">View live</a></li>
+                                    {% endif %}
                                 </ul>
                             </td>
                             <td><div class="human-readable-date" title="{{ revision.created_at|date:"d M Y H:i" }}">{{ revision.created_at|timesince }}</div></td>