cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-10 19:57:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/issue-296'

Browse Source
This commit is contained in:
Fabio C. Barrionuevo da Luz 2015-09-13 19:01:38 -03:00
commit 8380f143c6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -6,6 +6,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## Removed ## Removed
- Styles that already exist in Bootstrap 4 (or 3) (@audreyr) - 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] ## [2015-09-09]
### Added ### Added
- post_gen_hook to generate a secret key for use in locals.py. You should define your own for production (@pydanny) - post_gen_hook to generate a secret key for use in locals.py. You should define your own for production (@pydanny)

5
{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/login.html
View File

@ -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>