From d8afd1899d0de6d2f04eb185cbd8b4c0e411487d Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Tue, 16 Sep 2014 17:06:10 +0100
Subject: [PATCH] tweaks to icon sizes

---
 .../static/wagtailadmin/scss/components/icons.scss |  2 +-
 .../wagtailadmin/scss/components/listing.scss      |  8 ++++++--
 .../templates/wagtailadmin/pages/list.html         | 14 +++++++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
index 06a98f42a..c46b6794d 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
@@ -223,7 +223,7 @@
 .icon-view:before,
 .icon-no-view:before{
     vertical-align:-3.5px;
-    font-size:1.3rem; 
+    font-size:1rem; 
 }
 .icon-view:before{
     content:"4"; 
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
index e0f161fac..1022bb885 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
@@ -371,6 +371,9 @@ table.listing{
             right:5%;
             top:2em;
         }
+        .locked-indicator{
+            font-size:0.8em;
+        }
 
         .title{
             h2{
@@ -386,8 +389,9 @@ table.listing{
         }
     }
 
-    .privacy-indicator{
-        font-size:0.9em;
+    .privacy-indicator,
+    .locked-indicator{
+        font-size:1em;
         opacity:0.7;
     }
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
index 6a41611fe..1a4929228 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
@@ -40,7 +40,7 @@
 
                             {% test_page_is_public parent_page as is_public %}
                             {% if not is_public %}
-                                <span class="privacy-indicator icon icon-no-view" title="This page is protected from public view"></span>
+                                <span class="privacy-indicator icon icon-no-view" title="{% trans "This page is protected from public view" %}"></span>
                             {% endif %}
                         </h2>
                     {% elif choosing %}
@@ -61,7 +61,11 @@
                             {% if parent_page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
                                 <a href="{% url 'wagtailadmin_pages_edit' parent_page.id %}">{{ parent_page.title }}</a>
                             {% else %}
-                                    {{ parent_page.title }}
+                                {{ parent_page.title }}
+                            {% endif %}
+
+                            {% if parent_page.locked %}
+                                <span class="locked-indicator icon icon-locked" title="{% trans "This page is locked to further editing" %}"></span>
                             {% endif %}
                         </h2>
                         
@@ -181,7 +185,11 @@
 
                             {% test_page_is_public page as is_public %}
                             {% if not is_public %}
-                            <span class="privacy-indicator icon icon-no-view" title="This page is protected from public view"></span>
+                                <span class="privacy-indicator icon icon-no-view" title="{% trans 'This page is protected from public view' %}"></span>
+                            {% endif %}
+
+                            {% if page.locked %}
+                                <span class="locked-indicator icon icon-locked" title="{% trans 'This page is locked to further editing' %}"></span>
                             {% endif %}
                         </h2>
                         {% if not moving and not choosing %}