Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Crispipy further forms

Roland0a779aae404c
diff --git a/wger/core/forms.py b/wger/core/forms.py
index 73c2ef4d7..756afa07a 100644
--- a/wger/core/forms.py
+++ b/wger/core/forms.py
@@ -33,6 +33,18 @@ from django.utils.translation import ugettext as _
# Third Party
from captcha.fields import ReCaptchaField
+from crispy_forms.bootstrap import (
+ Accordion,
+ AccordionGroup
+)
+from crispy_forms.helper import FormHelper
+from crispy_forms.layout import (
+ ButtonHolder,
+ Column,
+ Layout,
+ Row,
+ Submit
+)
# wger
from wger.core.models import UserProfile
@@ -41,13 +53,32 @@ from wger.core.models import UserProfile
class UserLoginForm(AuthenticationForm):
'''
Form for logins
-
- Overwritten here just to change the label on the 'username' field
'''
- username = forms.CharField(label=_("Username or email"), max_length=254)
+
+ def __init__(self, *args, **kwargs):
+ super(UserLoginForm, self).__init__(*args, **kwargs)
+
+ self.helper = FormHelper()
+ self.helper.add_input(Submit('submit', _('Login'), css_class='btn-success btn-block'))
+ self.helper.form_class = 'wger-form'
+ self.helper.layout = Layout(
+ Row(
+ Column('username', css_class='form-group col-6 mb-0'),
+ Column('password', css_class='form-group col-6 mb-0'),
+ css_class='form-row'
+ )
+ )
class UserPreferencesForm(forms.ModelForm):
+ first_name = forms.CharField(label=_('First name'),
+ required=False)
+ last_name = forms.CharField(label=_('Last name'),
+ required=False)
+ email = EmailField(label=_("Email"),
+ help_text=_("Used for password resets and, optionally, email reminders."),
+ required=False)
+
class Meta:
model = UserProfile
fields = ('show_comments',
@@ -64,6 +95,42 @@ class UserPreferencesForm(forms.ModelForm):
'birthdate'
)
+ def __init__(self, *args, **kwargs):
+ super(UserPreferencesForm, self).__init__(*args, **kwargs)
+ self.helper = FormHelper()
+ self.helper.form_class = 'wger-form'
+ self.helper.layout = Layout(
+ Accordion(
+ AccordionGroup(_("Email"),
+ 'email',
+ Row(
+ Column('first_name', css_class='form-group col-6 mb-0'),
+ Column('last_name', css_class='form-group col-6 mb-0'),
+ css_class='form-row'
+ ),
+ ),
+ AccordionGroup(_("Workout reminders"),
+ 'workout_reminder_active',
+ 'workout_reminder',
+ 'workout_duration',
+ ),
+ AccordionGroup("{} ({})".format(_("Gym mode"), _("mobile version only")),
+ "timer_active",
+ "timer_pause"
+ ),
+ AccordionGroup(_("Other settings"),
+ "ro_access",
+ "notification_language",
+ "weight_unit",
+ "show_comments",
+ "show_english_ingredients",
+ "num_days_weight_reminder",
+ "birthdate",
+ )
+ ),
+ ButtonHolder(Submit('submit', _("Save"), css_class='btn-success btn-block'))
+ )
+
class UserEmailForm(forms.ModelForm):
email = EmailField(label=_("Email"),
diff --git a/wger/core/templates/user/change_password.html b/wger/core/templates/user/change_password.html
deleted file mode 100644
index 4795a4f7f..000000000
--- a/wger/core/templates/user/change_password.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "base.html" %}
-{% load i18n wger_extras %}
-
-{% block title %}{% trans "Change password" %}{% endblock %}
-
-
-{% block content %}
-<form action="{% url 'core:user:change-password' %}"
- method="post"
- class="wger-form"
- role="form">
-
- {% trans 'Change password' as submit_text %}
- {% render_form_fields form submit_text %}
-</table>
-</form>
-{% endblock %}
diff --git a/wger/core/templates/user/login.html b/wger/core/templates/user/login.html
index 0ac174336..65ea08dec 100644
--- a/wger/core/templates/user/login.html
+++ b/wger/core/templates/user/login.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load i18n static wger_extras %}
+{% load i18n static wger_extras crispy_forms_tags %}
{% block title %}{% trans "Login" %}{% endblock %}
@@ -8,12 +8,7 @@
{% endblock %}
{% block content %}
-<form action="{% url 'core:user:login' %}{% if next %}?next={{next}}{% endif %}"
- method="post"
- class="wger-form">
- {% trans 'Login' as submit_text %}
- {% render_form_fields form submit_text %}
-</form>
+ {% crispy form %}
{% endblock %}
diff --git a/wger/core/templates/user/preferences.html b/wger/core/templates/user/preferences.html
index d1ddd2872..62e7b19a9 100644
--- a/wger/core/templates/user/preferences.html
+++ b/wger/core/templates/user/preferences.html
@@ -1,110 +1,14 @@
{% extends "base.html" %}
-{% load i18n static wger_extras %}
+{% load i18n static wger_extras crispy_forms_tags %}
{% block title %}{% trans "Preferences" %}{% endblock %}
{% block header %}
- <script>
-$(function() {
- //$("#preferences-accordion").accordion({
- // heightStyle: "content"
- //});
-});
-</script>
{% endblock %}
-
{% block content %}
-<form action="{% url 'core:user:preferences' %}"
- method="post"
- class="wger-form">
- {% csrf_token %}
- {{ form.non_field_errors }}
-
- <div class="panel-group" id="preferences-accordion">
-
- <div class="panel panel-default">
- <div class="panel-heading">
- <h4 class="panel-title">
- <a data-toggle="collapse" data-parent="#preferences-accordion" href="#collapseEmail">
- {% trans "Email" %}
- </a>
- </h4>
- </div>
- <div id="collapseEmail" class="panel-collapse collapse in">
- <div class="panel-body">
- {% render_form_field email_form.email %}
- {% render_form_field email_form.first_name %}
- {% render_form_field email_form.last_name %}
- </div>
- </div>
- </div>
-
-
- <div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">
- <a data-toggle="collapse" data-parent="#preferences-accordion" href="#collapseReminder">
- {% trans "Workout reminders" %}
- </a>
- </h3>
- </div>
- <div id="collapseReminder" class="panel-collapse collapse">
- <div class="panel-body">
- {% render_form_field form.workout_reminder_active %}
- {% render_form_field form.workout_duration %}
- {% render_form_field form.workout_reminder %}
- </div>
- </div>
- </div>
-
- <div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">
- <a data-toggle="collapse" data-parent="#preferences-accordion" href="#collapseGymMode">
- {% trans "Gym mode" %} ({% trans "mobile version only" %})
- </a>
- </h3>
- </div>
- <div id="collapseGymMode" class="panel-collapse collapse">
- <div class="panel-body">
- {% render_form_field form.timer_active %}
- {% render_form_field form.timer_pause %}
- </div>
- </div>
- </div>
-
-
- <div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">
- <a data-toggle="collapse" data-parent="#preferences-accordion" href="#collapseOther">
- {% trans "Other settings" %}
- </a>
- </h3>
- </div>
- <div id="collapseOther" class="panel-collapse collapse">
- <div class="panel-body">
- {% render_form_field form.ro_access %}
- {% render_form_field form.notification_language %}
- {% render_form_field form.weight_unit %}
- {% render_form_field form.show_comments %}
- {% render_form_field form.show_english_ingredients %}
- {% render_form_field form.num_days_weight_reminder %}
- {% render_form_field form.birthdate %}
- </div>
- </div>
- </div>
- </div>
-
-
- <div class="form-group">
- <div class="col-md-12">
- <input type="submit" value="{% trans 'Save' %}" id="form-save" class="btn btn-default btn-block">
- </div>
- </div>
-</form>
+ {% crispy form %}
{% endblock %}
diff --git a/wger/core/urls.py b/wger/core/urls.py
index 580eb7aa2..dacc2f6fb 100644
--- a/wger/core/urls.py
+++ b/wger/core/urls.py
@@ -104,9 +104,7 @@ patterns_user = [
# Password reset is implemented by Django, no need to cook our own soup here
# (besides the templates)
url(r'^password/change$',
- views.PasswordChangeView.as_view(success_url=reverse_lazy('core:user:preferences')),
- {'template_name': 'user/change_password.html',
- 'post_change_redirect': reverse_lazy('core:user:preferences')},
+ user.WgerPasswordChangeView.as_view(),
name='change-password'),
url(r'^password/reset/$',
views.PasswordResetView.as_view(),
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index 68b7ebe81..333f92958 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -31,7 +31,10 @@ from django.contrib.auth.mixins import (
PermissionRequiredMixin
)
from django.contrib.auth.models import User
-from django.contrib.auth.views import LoginView
+from django.contrib.auth.views import (
+ LoginView,
+ PasswordChangeView
+)
from django.http import (
HttpResponseForbidden,
HttpResponseRedirect
@@ -41,7 +44,10 @@ from django.shortcuts import (
render
)
from django.template.context_processors import csrf
-from django.urls import reverse
+from django.urls import (
+ reverse,
+ reverse_lazy
+)
from django.utils import translation
from django.utils.translation import (
ugettext as _,
@@ -55,6 +61,14 @@ from django.views.generic import (
)
# Third Party
+from crispy_forms.helper import FormHelper
+from crispy_forms.layout import (
+ ButtonHolder,
+ Column,
+ Layout,
+ Row,
+ Submit
+)
from rest_framework.authtoken.models import Token
# wger
@@ -100,11 +114,13 @@ def login(request):
'''
context = {'active_tab': USER_TAB}
- if request.GET.get('next'):
- context['next'] = request.GET.get('next')
+ next_url = "?next=" + request.GET.get('next') if request.GET.get('next') else ''
+
+ form = UserLoginForm
+ form.helper.form_action = reverse('core:user:login') + next_url
return LoginView.as_view(template_name='user/login.html',
- authentication_form=UserLoginForm,
+ authentication_form=form,
extra_context=context)
@@ -550,3 +566,29 @@ class UserListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
_('Gym')],
'users': context['object_list']['members']}
return context
+
+
+class WgerPasswordChangeView(PasswordChangeView):
+ template_name = 'form.html'
+ success_url = reverse_lazy('core:user:preferences')
+ title = ugettext_lazy("Change password")
+
+ def get_form(self, form_class=None):
+ form = super(WgerPasswordChangeView, self).get_form(form_class)
+ form.helper = FormHelper()
+ form.helper.form_class = 'wger-form'
+ form.helper.layout = Layout(
+ 'old_password',
+ Row(
+ Column('new_password1', css_class='form-group col-6 mb-0'),
+ Column('new_password2', css_class='form-group col-6 mb-0'),
+ css_class='form-row'
+ ),
+ ButtonHolder(Submit('submit', _("Save"), css_class='btn-success btn-block'))
+ )
+ return form
+
+ def get_context_data(self, **kwargs):
+ context = super(WgerPasswordChangeView, self).get_context_data(**kwargs)
+ context['extend_template'] = 'base.html'
+ return context
diff --git a/wger/settings_global.py b/wger/settings_global.py
index e2a7ccaa2..b0a604cbb 100644
--- a/wger/settings_global.py
+++ b/wger/settings_global.py
@@ -48,7 +48,7 @@ INSTALLED_APPS = (
'storages',
# Uncomment the next line to enable the admin:
- 'django.contrib.admin',
+ #'django.contrib.admin',
# Apps from wger proper
'wger.config',
diff --git a/wger/urls.py b/wger/urls.py
index 34d1adf78..4667b5a83 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -59,7 +59,7 @@ from wger.weight.api import (
)
-admin.autodiscover()
+#admin.autodiscover()
#
@@ -152,7 +152,7 @@ sitemaps = {'exercises': ExercisesSitemap,
# The actual URLs
#
urlpatterns = i18n_patterns(
- url(r'^admin/', admin.site.urls),
+ #url(r'^admin/', admin.site.urls),
url(r'^', include(('wger.core.urls', 'core'), namespace='core')),
url(r'workout/', include(('wger.manager.urls', 'manager'), namespace='manager')),
url(r'exercise/', include(('wger.exercises.urls', 'exercise'), namespace='exercise')),