From a86b08a62214e1ff7bc7448b9cb3f31a17774bfd Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Mon, 5 Oct 2015 18:20:08 +0100
Subject: [PATCH] Add favicon as an overrideable branding block - fixes #1391

---
 docs/advanced_topics/customisation/branding.rst  |  11 +++++++++++
 .../static_src/wagtailadmin/images/favicon.ico   | Bin 0 -> 2666 bytes
 .../templates/wagtailadmin/admin_base.html       |   4 ++++
 .../templates/wagtailadmin/skeleton.html         |   2 ++
 4 files changed, 17 insertions(+)
 create mode 100644 wagtail/wagtailadmin/static_src/wagtailadmin/images/favicon.ico

diff --git a/docs/advanced_topics/customisation/branding.rst b/docs/advanced_topics/customisation/branding.rst
index 07b05d1dc7..e8cc163b46 100644
--- a/docs/advanced_topics/customisation/branding.rst
+++ b/docs/advanced_topics/customisation/branding.rst
@@ -30,6 +30,17 @@ To replace the default logo, create a template file ``dashboard/templates/wagtai
         <img src="{{ STATIC_URL }}images/custom-logo.svg" alt="Custom Project" width="80" />
     {% endblock %}
 
+``branding_favicon``
+--------------------
+
+To replace the favicon displayed when viewing admin pages, create a template file ``dashboard/templates/wagtailadmin/admin_base.html`` that overrides the block ``branding_favicon``::
+
+    {% overextends "wagtailadmin/admin_base.html" %}
+
+    {% block branding_favicon %}
+        <link rel="shortcut icon" href="{{ STATIC_URL }}images/favicon.ico" />
+    {% endblock %}
+
 ``branding_login``
 ------------------
 
diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/images/favicon.ico b/wagtail/wagtailadmin/static_src/wagtailadmin/images/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..5cf8871bc06574ed2c621213ec2dc5afffae7c61
GIT binary patch
literal 2666
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
MrISUina`E~0KH4rZvX%Q

literal 0
HcmV?d00001

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
index b72568314a..37efc90336 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/admin_base.html
@@ -10,6 +10,10 @@
     {% block extra_css %}{% endblock %}
 {% endblock %}
 
+{% block branding_favicon %}
+    <link rel="shortcut icon" href="{% static 'wagtailadmin/images/favicon.ico' %}" />
+{% endblock %}
+
 {% block js %}
     
     {% compress js %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
index 459cbf9e2e..51e45580cb 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
@@ -15,6 +15,8 @@
     {% endcompress %}
 
     {% block css %}{% endblock %}
+
+    {% block branding_favicon %}{% endblock %}
 </head>
 <body class="{% block bodyclass %}{% endblock %} {% if messages %}has-messages{% endif %}">
     <!--[if lt IE 9]>