Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-04-07 08:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'admin_branding' of https://github.com/revsys/wagtail into revsys-admin_branding

Browse source 
Conflicts:
	wagtail/wagtailadmin/templates/wagtailadmin/login.html
This commit is contained in:
Matt Westcott 2015-01-29 13:28:20 +00:00
commit b4ba12aed9
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wagtail/wagtailadmin/templates/wagtailadmin/home.html
View file

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

3
wagtail/wagtailadmin/templates/wagtailadmin/login.html
View file

@ -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 admin_branding_login %}{% trans "Sign in to Wagtail" %}{% endblock %}</h1>
<ul class="fields">
<li class="full">
<div class="field iconfield">