Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty

[wolnelektury.git] / wolnelektury / templates / auth / login.html

diff --git a/wolnelektury/templates/auth/login.html b/wolnelektury/templates/auth/login.html
index ba5385a..caa0aea 100644 (file)
--- a/wolnelektury/templates/auth/login.html
+++ b/wolnelektury/templates/auth/login.html
@@ -6,12 +6,15 @@
 <ol>
     <div id="id_{% if form_prefix %}{{ form_prefix }}-{% endif %}__all__"></div>
     {{ form.as_ul }}
-    <li><a href="{% url account_reset_password %}">{% trans "Forgot your password?" %}</a></li>
+    <li><a href="{% url account_reset_password %}">{% trans "Forgot Password?" %}</a></li>
     <li><input type="submit" value="{{ submit }}"/></li>
 </ol>
 </form>
 
-<h1>{% trans "or merge accounts:" %}</h1>
+<h1>{% trans "Sign in using:" %}</h1>
 
+<ul class="socialaccount_providers">
 {% include "socialaccount/snippets/provider_list.html" %}
+</ul>
 
+{% include "socialaccount/snippets/login_extra.html" %}