mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2024-11-23 01:57:03 +03:00
fix issue #296
This commit is contained in:
parent
071f7d00eb
commit
db186d9e9a
|
@ -22,6 +22,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
||||||
### Removed
|
### Removed
|
||||||
- Dokku in favor of docker-compose and other modern Django tools (@pydanny)
|
- Dokku in favor of docker-compose and other modern Django tools (@pydanny)
|
||||||
|
|
||||||
|
## [2015-08-30]
|
||||||
|
### 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-08-30]
|
## [2015-08-30]
|
||||||
### Changed
|
### Changed
|
||||||
- Moved from Bootstrap 3 to Bootstrap 4 (@audreyr)
|
- Moved from Bootstrap 3 to Bootstrap 4 (@audreyr)
|
||||||
|
@ -32,6 +37,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
||||||
- Update AngularJS version to 1.4.4 (@luzfcb)
|
- Update AngularJS version to 1.4.4 (@luzfcb)
|
||||||
- Update the usage example on README (@luzfcb)
|
- Update the usage example on README (@luzfcb)
|
||||||
|
|
||||||
|
|
||||||
## [2015-08-28]
|
## [2015-08-28]
|
||||||
### Changed
|
### Changed
|
||||||
- Switched to django-mailgun-redux so mail doesn't blow up on Python 3 (@pydanny)
|
- Switched to django-mailgun-redux so mail doesn't blow up on Python 3 (@pydanny)
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
{% load account %}
|
{% load account %}
|
||||||
|
{% load socialaccount %}
|
||||||
{% load url from future %}
|
{% load url from future %}
|
||||||
{% load crispy_forms_tags %}
|
{% load crispy_forms_tags %}
|
||||||
|
|
||||||
|
@ -12,8 +13,8 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-5">
|
<div class="col-md-5">
|
||||||
<h2>{% trans "Sign In" %}</h2>
|
<h2>{% trans "Sign In" %}</h2>
|
||||||
|
{% get_providers as socialaccount_providers %}
|
||||||
{% if socialaccount.providers %}
|
{% if socialaccount_providers %}
|
||||||
<p>{% blocktrans with site.name as site_name %}Please sign in with one
|
<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>
|
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>
|
for a {{ site_name }} account and sign in below:{% endblocktrans %}</p>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user