From 3bbc014c42b1a747e7d607d567e76e49eda016bf Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 14 Jun 2018 08:35:52 +0200 Subject: [PATCH 1/2] user admin better organized --- rowers/admin.py | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/rowers/admin.py b/rowers/admin.py index f18a3760..cd14f468 100644 --- a/rowers/admin.py +++ b/rowers/admin.py @@ -18,10 +18,48 @@ class RowerInline(admin.StackedInline): verbose_name_plural = 'rower' filter_horizontal = ('team','friends') + fieldsets = ( + ('Rower Plan', + {'fields':('rowerplan','teamplanexpires','clubsize','protrialexpires','plantrialexpires',)}), + ('Rower Settings', + {'fields': + ('gdproptin','gdproptindate','weightcategory','sex','birthdate','getemailnotifications', + 'getimportantemails','emailbounced','defaultlandingpage', + 'defaulttimezone','showfavoritechartnotes')}), + ('Rower Zones', + {'fields': + ('ftp','otwslack','pw_ut2','pw_ut1','pw_at','pw_tr','pw_an','max', + 'rest','ut2','ut1','at','tr','an','hrftp',)}), + ('Import/Export Keys', + {'fields':('c2token','tokenexpirydate','c2refreshtoken','c2_auto_export', + 'sporttrackstoken','sporttrackstokenexpirydate','sporttracksrefreshtoken', + 'sporttracks_auto_export', + 'underarmourtoken','underarmourtokenexpirydate','underarmourrefreshtoken', + 'mapmyfitness_auto_export', + 'tptoken','tptokenexpirydate','tprefreshtoken', + 'trainingpeaks_auto_export', + 'polartoken','polartokenexpirydate','polarrefreshtoken','polaruserid', + 'polar_auto_import', + 'stravatoken','stravaexportas','strava_auto_export', + 'runkeepertoken','runkeeper_auto_export',)}), + ('Team', + {'fields':('friends','privacy','team')}), + ) + + #class UserAdmin(UserAdmin): class UserAdmin(admin.ModelAdmin): inlines = (RowerInline,) list_display = ('username','email','first_name','last_name','rowerplan') + + fieldsets = ( + ('Personal info', + {'fields': + ('first_name', 'last_name', 'email', 'date_joined', 'last_login',)}), + ('Permissions', + {'fields': + ('is_active', 'is_staff', 'is_superuser', 'groups', 'user_permissions',)}),) + search_fields = ["username","first_name","last_name","email"] def rowerplan(self, obj): From c1cb399ed06bb296aaf6e423aa539eef057736cb Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 14 Jun 2018 10:33:18 +0200 Subject: [PATCH 2/2] tried to customize password_reset.html --- .../templates/registration/password_reset.html | 18 ++++++++++++++++++ rowsandall_app/urls.py | 8 ++------ 2 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 rowers/templates/registration/password_reset.html diff --git a/rowers/templates/registration/password_reset.html b/rowers/templates/registration/password_reset.html new file mode 100644 index 00000000..1941a27b --- /dev/null +++ b/rowers/templates/registration/password_reset.html @@ -0,0 +1,18 @@ +{% load i18n %} + + + + Forgot your password? + + +

Forgot your password?

+
{% csrf_token %} +
+ {{ form.email.errors }} + + {{ form.email }} +
+ +
+ + diff --git a/rowsandall_app/urls.py b/rowsandall_app/urls.py index 5fdc8511..f129a657 100644 --- a/rowsandall_app/urls.py +++ b/rowsandall_app/urls.py @@ -34,11 +34,13 @@ handler500 = 'rowers.views.error500_view' urlpatterns = [ url(r'^admin/jsi18n', 'django.views.i18n.javascript_catalog'), + url('^', include('django.contrib.auth.urls')), url(r'^django-rq/',include('django_rq.urls')), 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, + {'template_name': 'rowers/templates/registration/password_reset.html'}, name='password_reset'), url(r'^password_reset/done/$', auth_views.password_reset_done, @@ -58,12 +60,6 @@ urlpatterns += [ url(r'^$',rootview), url(r'^login/',auth_views.login, name='login'), url(r'^logout/',auth_views.logout_then_login,name='logout'), -# 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[0-9A-Za-z_\-]+)/(?P[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[0-9A-Za-z_\-]+)/(?P[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')),