mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2024-11-22 17:47:08 +03:00
Merge remote-tracking branch 'origin/issue-296'
This commit is contained in:
commit
8380f143c6
|
@ -6,6 +6,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
|||
## Removed
|
||||
- Styles that already exist in Bootstrap 4 (or 3) (@audreyr)
|
||||
|
||||
### Changed
|
||||
- Fix issue #296 - change login.html to use [get_providers](https://github.com/pennersr/django-allauth/blob/master/allauth/socialaccount/templatetags/socialaccount.py#L84-L93) templatetag because ``allauth.socialaccount`` context processor now is [deprecated](http://django-allauth.readthedocs.org/en/latest/changelog.html#from-0-21-0) (@luzfcb)
|
||||
|
||||
## [2015-09-09]
|
||||
### Added
|
||||
- post_gen_hook to generate a secret key for use in locals.py. You should define your own for production (@pydanny)
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
{% load i18n %}
|
||||
{% load account %}
|
||||
{% load socialaccount %}
|
||||
{% load url from future %}
|
||||
{% load crispy_forms_tags %}
|
||||
|
||||
|
@ -12,8 +13,8 @@
|
|||
<div class="row">
|
||||
<div class="col-md-5">
|
||||
<h2>{% trans "Sign In" %}</h2>
|
||||
|
||||
{% if socialaccount.providers %}
|
||||
{% get_providers as socialaccount_providers %}
|
||||
{% if socialaccount_providers %}
|
||||
<p>{% blocktrans with site.name as site_name %}Please sign in with one
|
||||
of your existing third party accounts. Or, <a href="{{ signup_url }}">sign up</a>
|
||||
for a {{ site_name }} account and sign in below:{% endblocktrans %}</p>
|
||||
|
|
Loading…
Reference in New Issue
Block a user