Merge branch 'revsys-admin_branding'

docs/howto/custom_branding.rst

@@ -29,3 +29,21 @@ To replace the default logo, create a template file ``dashboard/templates/wagtai
     {% block branding_logo %}
         <img src="{{ STATIC_URL }}images/custom-logo.svg" alt="Custom Project" width="80" />
     {% endblock %}
+
+branding_login
+--------------
+
+To replace the login message, create a template file ``dashboard/templates/wagtailadmin/login.html`` that overrides the block ``branding_login``::
+
+    {% overextends "wagtailadmin/login.html" %}
+
+    {% block branding_login %}Sign in to Frank's Site{% endblock %}
+
+branding_welcome
+----------------
+
+To replace the welcome message on the dashboard, create a template file ``dashboard/templates/wagtailadmin/home.html`` that overrides the block ``branding_welcome``::
+
+    {% overextends "wagtailadmin/home.html" %}
+
+    {% block branding_welcome %}Welcome to Frank's Site{% endblock %}

wagtail/wagtailadmin/templates/wagtailadmin/home.html

@@ -19,7 +19,7 @@
                 </div>
             {% endif %}
             <div class="col9">
-                <h1>{% blocktrans %}Welcome to the {{ site_name }} Wagtail CMS{% endblocktrans %}</h1> 
+                <h1>{% block branding_welcome %}{% blocktrans %}Welcome to the {{ site_name }} Wagtail CMS{% endblocktrans %}{% endblock %}</h1>
                 <h2>{{ user.get_full_name|default:user.get_username }}</h2>
             </div>
         </div>

wagtail/wagtailadmin/templates/wagtailadmin/login.html

@@ -26,9 +26,8 @@
             {% url 'wagtailadmin_home' as home_url %}
             <input type="hidden" name="next" value="{{ next|default:home_url }}" />
 
-            <h1>{% trans "Sign in to Wagtail" %}</h1>
+            <h1>{% block branding_login %}{% trans "Sign in to Wagtail" %}{% endblock %}</h1>
 
-          
             <ul class="fields">
                 <li class="full">
                     <div class="field iconfield">