From eb975748367afb6b02e1d98caf41e3646b909b50 Mon Sep 17 00:00:00 2001
From: jacobtm <jacobtm@torchbox.com>
Date: Mon, 4 Nov 2019 17:18:17 +0000
Subject: [PATCH] Add button styling and text for lock/unlock button

---
 .../scss/layouts/page-editor.scss             |  8 ++++
 .../wagtailadmin/pages/_lock_switch.html      | 47 ++++++++++++++-----
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/wagtail/admin/static_src/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/admin/static_src/wagtailadmin/scss/layouts/page-editor.scss
index 3a364d601..65188c1bb 100644
--- a/wagtail/admin/static_src/wagtailadmin/scss/layouts/page-editor.scss
+++ b/wagtail/admin/static_src/wagtailadmin/scss/layouts/page-editor.scss
@@ -471,3 +471,11 @@ footer .preview {
         }
     }
 }
+
+.lock-status {
+    margin: 0 0.5em 0.5em 0;
+}
+
+.lock-status.status-tag {
+    color: $color-teal;
+}
diff --git a/wagtail/admin/templates/wagtailadmin/pages/_lock_switch.html b/wagtail/admin/templates/wagtailadmin/pages/_lock_switch.html
index 5edca5baa..df5acd8a8 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/_lock_switch.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/_lock_switch.html
@@ -11,20 +11,43 @@
 {% endif %}
 
 <form action="{{ form_action }}" method="POST" class="lock-indicator {{ page.locked|yesno:'locked,unlocked' }}">
-    {% trans "Edit lock" %}
+    <span class="lock-status">
+    {% if page.locked %}
+        {% trans "This page is locked" %}
+    {% else %}
+        {% trans "This page is unlocked" %}
+    {% endif %}</span>
 
     {% csrf_token %}
-    <input type="hidden" name="next" value="{% url 'wagtailadmin_pages:edit' page.id %}" />
-    <button
-        type="submit"
-        class="status-tag {{ page.locked|yesno:'primary,secondary' }}{% if not form_action %} disabled{% endif %}"
-        aria-label="{% if page_perms.page_locked %}{% if page_perms.can_unlock %}{% trans 'Remove editor lock. Current status: Locked' %}{% else %}{% trans 'Current status: Locked' %}{% endif %}{% else %}{% trans 'Apply editor lock. Current status: Unlocked' %}{% endif %}">
-        {% if page_perms.page_locked %}
-            {% trans "Locked" %}
-        {% elif user_has_lock %}
-            {% trans "Locked by you" %}
+    {% if page.locked %}
+        {% if page_perms.can_unlock %}
+        <input type="hidden" name="next" value="{% url 'wagtailadmin_pages:edit' page.id %}" />
+        <button
+            type="submit"
+            class="status-tag primary lock-status"
+            aria-label="{% trans 'Remove editor lock' %}">
+            {% trans "Unlock" %}
+        </button>
         {% else %}
-            {% trans "Unlocked" %}
+            <div class="lock-status">
+            ({% trans "You don't have permission to unlock" %})
+                </div>
         {% endif %}
-    </button>
+    {% else %}
+        {% if page_perms.can_lock %}
+            <input type="hidden" name="next" value="{% url 'wagtailadmin_pages:edit' page.id %}" />
+        <button
+            type="submit"
+            class="status-tag primary lock-status"
+            aria-label="{% trans 'Apply editor lock' %}">
+            {% trans "Lock" %}
+        </button>
+        {% else %}
+            <div class="lock-status">
+            ({% trans "You don't have permission to lock" %})
+                </div>
+        {% endif %}
+    {% endif %}
+
+
 </form>