sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'develop' into feature/mergeworkoutcreation

Browse Source
This commit is contained in:
Sander Roosendaal
2017-02-13 11:24:10 +01:00
parent 99a44271a5 f17a43313d
commit bb7652522e
4 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/templates/base.html
View File

@@ -38,7 +38,7 @@
{% if user.is_authenticated %}
<p><a class="button gray small" href="/password_change/">Password Change</a></p>
{% else %}
<p><a class="button gray small" href="/password_reset/">Forgotten Password?</a></p>
<p><a class="button gray small" href="/password_reset/">Forgot Password?</a></p>
{% endif %}
</div>
</div>

6
rowers/templates/registration/login.html
View File

@@ -17,10 +17,14 @@
<td>{{ form.password.label_tag }}</td>
<td>{{ form.password }}</td>
</tr>
<tr>
<td></td>
<td><a href="/password_reset/">Forgot password?</a></td>
</tr>
</table>
<input type="submit" value="login" />
<input type="hidden" name="next" value="{{ next }}" />
</form>
{% endblock %}
{% endblock %}

13
rowsandall_app/settings.py
View File

@@ -39,15 +39,15 @@ ALLOWED_HOSTS = CFG['allowed_hosts']
# Application definition
INSTALLED_APPS = [
'rowers',
'cvkbrno',
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'rowers',
'cvkbrno',
'django_rq',
'django_rq',
'django_rq_dashboard',
'translation_manager',
# 'debug_toolbar',
@@ -250,6 +250,11 @@ RQ_QUEUES = {
#SESSION_ENGINE = "django.contrib.sessions.backends.cached_db"
SESSION_ENGINE = "django.contrib.sessions.backends.cache"
# admin stuff for error reporting
SERVER_EMAIL='admin@rowsandall.com'
ADMINS = [('Sander','roosendaalsander@gmail.com')]
# email stuff
EMAIL_BACKEND = CFG['email_backend']
@@ -262,7 +267,7 @@ EMAIL_HOST_USER = CFG['email_host_user']
EMAIL_HOST_PASSWORD = CFG['email_host_password']
EMAIL_USE_TLS = CFG['email_use_tls']
#EMAIL_USE_TLS = False
DEFAULT_FROM_EMAIL = 'admin@rowsandall.com'
# weather stuff

31
rowsandall_app/urls.py
View File

@@ -21,21 +21,34 @@ from rowsandall_app.views import rootview
from django.contrib.auth import views as auth_views
from rowers import views as rowersviews
urlpatterns = [
url(r'^password_change_done/$',auth_views.password_change_done,name='password_change_done'),
url(r'^password_change/$',auth_views.password_change),
url(r'^password_reset/$',
auth_views.password_reset,
name='password_reset'),
url(r'^password_reset/done/$',
auth_views.password_reset_done,
name='password_reset_done'),
url(r'^reset/(?P<uidb64>[0-9A-Za-z_\-]+)-(?P<token>.+)/$',
auth_views.password_reset_confirm,
name='password_reset_confirm'),
url(r'^reset/done/$', auth_views.password_reset_complete,
name='password_reset_complete'),
]
urlpatterns += [
url(r'^admin/', admin.site.urls),
url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
url(r'^$',rootview),
url(r'^login/',auth_views.login, name='login'),
url(r'^logout/',auth_views.logout_then_login,name='logout'),
url(r'^password_change_done/$',auth_views.password_change_done,name='password_change_done'),
url(r'^password_change/',auth_views.password_change),
url(r'^password_reset/$',auth_views.password_reset,name='password_reset'),
url(r'^password_reset_done/$',auth_views.password_reset_done,name='password_reset_done'),
url(r'^password_reset_confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', auth_views.password_reset_confirm,name='password_reset_confirm'),
url(r'^password_reset_confirm/$',auth_views.password_reset_confirm,name='password_reset_confirm'),
url(r'^password_reset_complete/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', auth_views.password_reset_complete,name='password_reset_complete'),
url(r'^password_reset_complete/$',auth_views.password_reset_complete,name='password_reset_complete'),
# url(r'^password_reset/$',auth_views.password_reset,name='password_reset'),
# url(r'^password_reset_done/$',auth_views.password_reset_done,name='password_reset_done'),
# url(r'^password_reset_confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', auth_views.password_reset_confirm,name='password_reset_confirm'),
# url(r'^password_reset_confirm/$',auth_views.password_reset_confirm,name='password_reset_confirm'),
# url(r'^password_reset_complete/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', auth_views.password_reset_complete,name='password_reset_complete'),
# url(r'^password_reset_complete/$',auth_views.password_reset_complete,name='password_reset_complete'),
url(r'^rowers/',include('rowers.urls')),
url(r'^cvkbrno/',include('cvkbrno.urls')),
url(r'^admin/rq/',include('django_rq_dashboard.urls')),