From b820a873fd7545f5af122076be9ec8a2985679b3 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Wed, 12 Nov 2014 18:00:55 +0000
Subject: [PATCH 1/3] tweaks to disable view live button

---
 .../templates/wagtailstyleguide/base.html     |  5 ++++
 .../wagtailadmin/scss/components/forms.scss   | 14 ++++++---
 .../wagtailadmin/scss/components/listing.scss |  3 --
 .../templates/wagtailadmin/pages/list.html    | 29 ++++++++++---------
 4 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
index 385ab1af98..41e43929db 100644
--- a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
+++ b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
@@ -238,6 +238,8 @@
 
             <a href="#" class="button no">no / serious</a>
 
+            <a href="#" class="button disabled">disabled</a>
+
             <a href="#" class="button bicolor icon icon-plus">bicolor with icon</a>
 
             <a href="#" class="button button-small">button-small</a>
@@ -246,6 +248,9 @@
 
             <a href="#" class="button button-secondary no">mixed 1</a>
 
+            <a href="#" class="button button-secondary disabled">disabled</a>
+
+
             <a href="#" class="button no bicolor icon icon-cog">mixed 2</a>
 
             <div class="button no bicolor icon icon-cog">button on a div</div>
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index 1246a0b852..85902868d0 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
@@ -323,10 +323,16 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
         -moz-appearance: none;
         -moz-box-sizing:border-box;
     }
-    &:disabled, &[disabled]{
-        background-color:$color-grey-2;
-        border-color:$color-grey-2;
-        color:lighten($color-grey-2, 15%);
+    &:disabled, &[disabled], &.disabled{
+        background-color:$color-grey-3 !important;
+        border-color:$color-grey-3 !important;
+        color:lighten($color-grey-2, 15%) !important;
+        cursor:default;
+    }
+    &.button-secondary:disabled, &.button-secondary[disabled], &.button-secondary.disabled{
+        background-color: white !important;
+        border-color:$color-grey-3 !important;
+        color:$color-grey-3 !important;
     }
 }
 
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
index 4c448087a9..1c5193ac7d 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
@@ -196,15 +196,12 @@ ul.listing{
     }
 
     .button{
-        color:$color-teal;
         border-color:$color-grey-3;
-        background:white;
         font-size:0.84em; /* 0.01em difference to regular small buttons */
 
         &:hover{
             border-color:$color-teal;
             background-color:$color-teal;
-            color:white;
         }
     }
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
index 367e2dd2de..15a297aa62 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
@@ -75,22 +75,23 @@
 
                         <ul class="actions">
                             {% if parent_page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
-                                <li><a href="{% url 'wagtailadmin_pages_edit' parent_page.id %}" class="button button-small">{% trans 'Edit' %}</a></li>
+                                <li><a href="{% url 'wagtailadmin_pages_edit' parent_page.id %}" class="button button-small button-secondary">{% trans 'Edit' %}</a></li>
                             {% endif %}
                             {% if parent_page.has_unpublished_changes and 'view_draft' not in hide_actions|default:'' %}
-                                <li><a href="{% url 'wagtailadmin_pages_view_draft' parent_page.id %}" class="button button-small" target="_blank">{% trans 'Draft' %}</a></li>
+                                <li><a href="{% url 'wagtailadmin_pages_view_draft' parent_page.id %}" class="button button-small button-secondary" target="_blank">{% trans 'Draft' %}</a></li>
                             {% endif %}
+
                             {% if parent_page.live and not parent_page.is_root and 'view_live' not in hide_actions|default:'' %}
-                                <li><a href="{{ parent_page.url }}" class="button button-small" target="_blank">{% trans 'Live' %}</a></li>
+                                <li><a {% if parent_page.url %}href="{{ parent_page.url }}"{% endif %} class="button button-small button-secondary {% if not parent_page.url %}disabled{% endif %}" target="_blank" {% if not parent_page.url %}title="{% trans 'This page is published but does not exist within a configured Site, so cannot be viewed.' %}"{% endif %}>{% trans 'Live' %}</a></li>
                             {% endif %}
                             {% if parent_page_perms.can_move and 'move' not in hide_actions|default:'' %}
-                                <li><a href="{% url 'wagtailadmin_pages_move' parent_page.id %}" class="button button-small">{% trans 'Move' %}</a></li>
+                                <li><a href="{% url 'wagtailadmin_pages_move' parent_page.id %}" class="button button-small button-secondary">{% trans 'Move' %}</a></li>
                             {% endif %}
                             {% if parent_page_perms.can_delete and 'delete' not in hide_actions|default:'' %}
-                                <li><a href="{% url 'wagtailadmin_pages_delete' parent_page.id %}" class="button button-small">{% trans 'Delete' %}</a></li>
+                                <li><a href="{% url 'wagtailadmin_pages_delete' parent_page.id %}" class="button button-small button-secondary">{% trans 'Delete' %}</a></li>
                             {% endif %}
                             {% if parent_page_perms.can_unpublish and 'unpublish' not in hide_actions|default:'' %}
-                                <li><a href="{% url 'wagtailadmin_pages_unpublish' parent_page.id %}" class="button button-small">{% trans 'Unpublish' %}</a></li>
+                                <li><a href="{% url 'wagtailadmin_pages_unpublish' parent_page.id %}" class="button button-small button-secondary">{% trans 'Unpublish' %}</a></li>
                             {% endif %}
                             {% if parent_page_perms.can_add_subpage and 'add_subpage' not in hide_actions|default:'' %}
                                 <li><a href="{% url 'wagtailadmin_pages_add_subpage' parent_page.id %}" class="button button-small bicolor icon white icon-plus">{% trans 'Add child page' %}</a></li>
@@ -207,28 +208,28 @@
                         {% if not moving and not choosing %}
                             <ul class="actions">
                                 {% if page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
-                                    <li><a href="{% url 'wagtailadmin_pages_edit' page.id %}" class="button button-small" title="{% trans 'Edit this page' %}">{% trans 'Edit' %}</a></li>
+                                    <li><a href="{% url 'wagtailadmin_pages_edit' page.id %}" class="button button-small button-secondary" title="{% trans 'Edit this page' %}">{% trans 'Edit' %}</a></li>
                                 {% endif %}
                                 {% if page.has_unpublished_changes and 'view_draft' not in hide_actions|default:'' %}
-                                    <li><a href="{% url 'wagtailadmin_pages_view_draft' page.id %}" class="button button-small" target="_blank">{% trans 'Draft' %}</a></li>
+                                    <li><a href="{% url 'wagtailadmin_pages_view_draft' page.id %}" class="button button-small button-secondary" target="_blank">{% trans 'Draft' %}</a></li>
                                 {% endif %}
                                 {% if page.live and 'view_live' not in hide_actions|default:'' %}
-                                    <li><a href="{{ page.url }}" class="button button-small" target="_blank">{% trans 'Live' %}</a></li>
+                                    <li><a {% if page.url %}href="{{ page.url }}"{% endif %} class="button button-small button-secondary {% if not page.url %}disabled{% endif %}" target="_blank" {% if not page.url %}title="{% trans 'This page is published but does not exist within a configured Site, so cannot be viewed.' %}"{% endif %}>{% trans 'Live' %}</a></li>
                                 {% endif %}
                                 {% if page_perms.can_move and 'move' not in hide_actions|default:'' %}
-                                    <li><a href="{% url 'wagtailadmin_pages_move' page.id %}" class="button button-small">{% trans 'Move' %}</a></li>
+                                    <li><a href="{% url 'wagtailadmin_pages_move' page.id %}" class="button button-small button-secondary">{% trans 'Move' %}</a></li>
                                 {% endif %}
                                 {% if parent_page_perms.can_add_subpage and 'copy' not in hide_actions|default:'' %}
-                                    <li><a href="{% url 'wagtailadmin_pages_copy' page.id %}" class="button button-small">{% trans 'Copy' %}</a></li>
+                                    <li><a href="{% url 'wagtailadmin_pages_copy' page.id %}" class="button button-small button-secondary">{% trans 'Copy' %}</a></li>
                                 {% endif %}
                                 {% if page_perms.can_delete and 'delete' not in hide_actions|default:'' %}
-                                    <li><a href="{% url 'wagtailadmin_pages_delete' page.id %}" class="button button-small">{% trans 'Delete' %}</a></li>
+                                    <li><a href="{% url 'wagtailadmin_pages_delete' page.id %}" class="button button-small button-secondary">{% trans 'Delete' %}</a></li>
                                 {% endif %}
                                 {% if page_perms.can_unpublish and 'unpublish' not in hide_actions|default:'' %}
-                                    <li><a href="{% url 'wagtailadmin_pages_unpublish' page.id %}" class="button button-small">{% trans 'Unpublish' %}</a></li>
+                                    <li><a href="{% url 'wagtailadmin_pages_unpublish' page.id %}" class="button button-small button-secondary">{% trans 'Unpublish' %}</a></li>
                                 {% endif %}
                                 {% if page_perms.can_add_subpage and 'add_subpage' not in hide_actions|default:'' %}
-                                    <li><a href="{% url 'wagtailadmin_pages_add_subpage' page.id %}" class="button button-small">{% trans 'Add child page' %}</a></li>
+                                    <li><a href="{% url 'wagtailadmin_pages_add_subpage' page.id %}" class="button button-small button-secondary">{% trans 'Add child page' %}</a></li>
                                 {% endif %}
                             </ul>
                         {% endif %}

From d143c6f7c0ee377c567f122e77edb6fd3a2ca278 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 13 Nov 2014 13:47:30 +0000
Subject: [PATCH 2/3] tweaks to disabled style of buttons

---
 .../wagtailadmin/static/wagtailadmin/scss/components/forms.scss | 2 +-
 .../static/wagtailadmin/scss/components/listing.scss            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index 85902868d0..cfe4fc50e0 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
@@ -327,7 +327,7 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
         background-color:$color-grey-3 !important;
         border-color:$color-grey-3 !important;
         color:lighten($color-grey-2, 15%) !important;
-        cursor:default;
+        cursor:not-allowed;
     }
     &.button-secondary:disabled, &.button-secondary[disabled], &.button-secondary.disabled{
         background-color: white !important;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
index 1c5193ac7d..a147ef9cb4 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
@@ -195,7 +195,7 @@ ul.listing{
         }
     }
 
-    .button{
+    .button-secondary{
         border-color:$color-grey-3;
         font-size:0.84em; /* 0.01em difference to regular small buttons */
 

From 54b59c9b5a7a8699621c9dba180b095fd9461d53 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 13 Nov 2014 13:49:33 +0000
Subject: [PATCH 3/3] updated dashboard buttons to use button-secondary as they
 always should have been

---
 .../templates/wagtailadmin/home/pages_for_moderation.html   | 6 +++---
 .../templates/wagtailadmin/home/recent_edits.html           | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html b/wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html
index c5106c7db6..d0dd04793f 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html
@@ -36,7 +36,7 @@
                                     <li>
                                          <form action="{% url 'wagtailadmin_pages_approve_moderation' revision.id %}" method="POST">
                                             {% csrf_token %}
-                                            <input type="submit" class="button button-small" value="{% trans 'Approve' %}">
+                                            <input type="submit" class="button button-small button-secondary" value="{% trans 'Approve' %}">
                                         </form>
                                     </li>
                                     <li class="no-border">
@@ -45,8 +45,8 @@
                                             <input type="submit" class="button button-small button-secondary no" value="{% trans 'Reject' %}">
                                         </form>
                                     </li>
-                                    <li><a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" class="button button-small">{% trans 'Edit' %}</a></li>
-                                    <li><a href="{% url 'wagtailadmin_pages_preview_for_moderation' revision.id %}" class="button button-small">{% trans 'Preview' %}</a></li>
+                                    <li><a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" class="button button-small button-secondary">{% trans 'Edit' %}</a></li>
+                                    <li><a href="{% url 'wagtailadmin_pages_preview_for_moderation' revision.id %}" class="button button-small button-secondary">{% trans 'Preview' %}</a></li>
                                 </ul>
                             </td>
                             <td valign="top">
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html b/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html
index 72709e3dc2..f23e5f5680 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html
@@ -31,12 +31,12 @@
                                     {% endif %}
                                 </h2>
                                 <ul class="actions">
-                                    <li><a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" class="button button-small">{% trans "Edit" %}</a></li>
+                                    <li><a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" class="button button-small button-secondary">{% trans "Edit" %}</a></li>
                                     {% if revision.page.has_unpublished_changes %}
-                                        <li><a href="{% url 'wagtailadmin_pages_view_draft' revision.page.id %}" class="button button-small">{% trans 'Draft' %}</a></li>
+                                        <li><a href="{% url 'wagtailadmin_pages_view_draft' revision.page.id %}" class="button button-small button-secondary">{% trans 'Draft' %}</a></li>
                                     {% endif %}
                                     {% if revision.page.live %}
-                                        <li><a href="{{ revision.page.url }}" class="button button-small">{% trans 'Live' %}</a></li>
+                                        <li><a href="{{ revision.page.url }}" class="button button-small button-secondary">{% trans 'Live' %}</a></li>
                                     {% endif %}
                                 </ul>
                             </td>