diff --git a/src/pretix/base/forms.py b/src/pretix/base/forms/__init__.py similarity index 93% rename from src/pretix/base/forms.py rename to src/pretix/base/forms/__init__.py index a24e89fc7..b9e42cc64 100644 --- a/src/pretix/base/forms.py +++ b/src/pretix/base/forms/__init__.py @@ -38,10 +38,10 @@ class VersionedBaseModelForm(BaseI18nModelForm): clone = old.clone() for f in type(self.instance)._meta.get_fields(): if f.name not in ( - 'id', 'identity', 'version_start_date', 'version_end_date', - 'version_birth_date' + 'id', 'identity', 'version_start_date', 'version_end_date', + 'version_birth_date' ) and not isinstance(f, ( - models.ManyToOneRel, models.ManyToManyRel, models.ManyToManyField + models.ManyToOneRel, models.ManyToManyRel, models.ManyToManyField )): setattr(clone, f.name, getattr(new, f.name)) self.instance = clone diff --git a/src/pretix/control/forms/user.py b/src/pretix/base/forms/user.py similarity index 92% rename from src/pretix/control/forms/user.py rename to src/pretix/base/forms/user.py index f47b6c5b3..dcaaad2e0 100644 --- a/src/pretix/control/forms/user.py +++ b/src/pretix/base/forms/user.py @@ -29,15 +29,19 @@ class UserSettingsForm(forms.ModelForm): required=False, label=_("Repeat new password"), widget=forms.PasswordInput()) - timezone = forms.ChoiceField( - choices=((a, a) for a in common_timezones), - label=_("Default timezone"), - ) + # timezone = forms.ChoiceField( + # choices=((a, a) for a in common_timezones), + # label=_("Default timezone"), + # ) class Meta: model = User fields = [ - 'givenname', 'familyname', 'locale', 'timezone', 'email' + 'givenname', + 'familyname', + 'locale', + # 'timezone', + 'email' ] def __init__(self, *args, **kwargs): diff --git a/src/pretix/control/templates/pretixcontrol/user/settings.html b/src/pretix/control/templates/pretixcontrol/user/settings.html index 6c667aac0..e74d46426 100644 --- a/src/pretix/control/templates/pretixcontrol/user/settings.html +++ b/src/pretix/control/templates/pretixcontrol/user/settings.html @@ -12,7 +12,6 @@ {% bootstrap_field form.givenname layout='horizontal' %} {% bootstrap_field form.familyname layout='horizontal' %} {% bootstrap_field form.locale layout='horizontal' %} - {% bootstrap_field form.timezone layout='horizontal' %}
{% trans "Login settings" %} diff --git a/src/pretix/control/views/user.py b/src/pretix/control/views/user.py index 126a032d4..dc84d653b 100644 --- a/src/pretix/control/views/user.py +++ b/src/pretix/control/views/user.py @@ -3,7 +3,7 @@ from django.contrib.auth import update_session_auth_hash from django.core.urlresolvers import reverse from django.views.generic import UpdateView from django.utils.translation import ugettext_lazy as _ -from pretix.control.forms.user import UserSettingsForm +from pretix.base.forms.user import UserSettingsForm from pretix.base.models import User diff --git a/src/pretix/presale/static/pretixpresale/less/main.less b/src/pretix/presale/static/pretixpresale/less/main.less index a78c46f35..fcfbd5b0b 100644 --- a/src/pretix/presale/static/pretixpresale/less/main.less +++ b/src/pretix/presale/static/pretixpresale/less/main.less @@ -34,4 +34,11 @@ footer { img { vertical-align: baseline; } +} +.huge { + font-size: 40px; +} +a:hover .panel-primary > .panel-heading { + background-color: darken(@btn-primary-bg, 10%); + border-color: darken(@btn-primary-border, 12%); } \ No newline at end of file diff --git a/src/pretix/presale/templates/pretixpresale/event/account.html b/src/pretix/presale/templates/pretixpresale/event/account.html new file mode 100644 index 000000000..85e9c41bb --- /dev/null +++ b/src/pretix/presale/templates/pretixpresale/event/account.html @@ -0,0 +1,58 @@ +{% extends "pretixpresale/event/base.html" %} +{% load i18n %} +{% block title %}{% trans "Your account" %}{% endblock %} + +{% block content %} +

{% trans "Welcome back!" %}

+
+
+ {% if orders %} + +
+
+
+
+ +
+
+
{% trans "Your orders" %}
+
+
+
+
+ + {% else %} + +
+
+
+
+ +
+
+
{% trans "Place new order" %}
+
+
+
+
+ + {% endif %} +
+
+ +
+
+
+
+ +
+
+
{% trans "Your settings" %}
+
+
+
+
+ +
+
+{% endblock %} \ No newline at end of file diff --git a/src/pretix/presale/templates/pretixpresale/event/account_settings.html b/src/pretix/presale/templates/pretixpresale/event/account_settings.html new file mode 100644 index 000000000..5e8da7bdd --- /dev/null +++ b/src/pretix/presale/templates/pretixpresale/event/account_settings.html @@ -0,0 +1,33 @@ +{% extends "pretixpresale/event/base.html" %} +{% load i18n %} +{% load bootstrap3 %} +{% block title %}{% trans "Account settings" %}{% endblock %} + +{% block content %} +

{% trans "Account settings" %}

+
+ {% csrf_token %} + {% bootstrap_form_errors form %} +
+ {% trans "General settings" %} + {% bootstrap_field form.givenname layout='horizontal' %} + {% bootstrap_field form.familyname layout='horizontal' %} + {% bootstrap_field form.locale layout='horizontal' %} +
+
+ {% trans "Login settings" %} + {% bootstrap_field form.old_pw layout='horizontal' %} + {% bootstrap_field form.email layout='horizontal' %} + {% bootstrap_field form.new_pw layout='horizontal' %} + {% bootstrap_field form.new_pw_repeat layout='horizontal' %} +
+
+
+ +
+
+
+
+{% endblock %} diff --git a/src/pretix/presale/templates/pretixpresale/event/base.html b/src/pretix/presale/templates/pretixpresale/event/base.html index f52cb3749..be22dc930 100644 --- a/src/pretix/presale/templates/pretixpresale/event/base.html +++ b/src/pretix/presale/templates/pretixpresale/event/base.html @@ -20,7 +20,7 @@

- {{ event.name }} + {{ event.name }} {{ event.date_from|date:"DATE_FORMAT" }}{% if event.settings.show_date_to %} – {{ event.date_to|date:"DATE_FORMAT" }}{% endif %}

@@ -39,8 +39,8 @@ {% blocktrans trimmed with name=request.user.get_short_name %} Hello, {{ name }}! {% endblocktrans %} · - - {% trans "My orders" %} · + + {% trans "Your account" %} · {% trans "Logout" %} {% else %} diff --git a/src/pretix/presale/templates/pretixpresale/event/orders.html b/src/pretix/presale/templates/pretixpresale/event/orders.html index 9cbc52c53..a93226623 100644 --- a/src/pretix/presale/templates/pretixpresale/event/orders.html +++ b/src/pretix/presale/templates/pretixpresale/event/orders.html @@ -3,45 +3,38 @@ {% block title %}{% trans "Your orders" %}{% endblock %} {% block content %} -

{% trans "Welcome back!" %}

-
-
-

{% trans "Your orders" %}

-
-
- - - - - - - - - - {% for order in orders %} - - - - - - - - {% empty %} - - - - {% endfor %} - -
{% trans "Order code" %}{% trans "Date" %}{% trans "Total" %}{% trans "Status" %}
{{ order.code }}{{ order.datetime|date:"SHORT_DATE_FORMAT" }}{{ event.currency }} {{ order.total|floatformat:2 }}{% include "pretixpresale/event/fragment_order_status.html" with order=order %} - {% trans "View details" %} -
- {% trans "You did not yet place any orders." %} -
- - - {% trans "Place new order" %} - -
-
+

{% trans "Your orders" %}

+ + + + + + + + + + {% for order in orders %} + + + + + + + + {% empty %} + + + + {% endfor %} + +
{% trans "Order code" %}{% trans "Date" %}{% trans "Total" %}{% trans "Status" %}
{{ order.code }}{{ order.datetime|date:"SHORT_DATE_FORMAT" }}{{ event.currency }} {{ order.total|floatformat:2 }}{% include "pretixpresale/event/fragment_order_status.html" with order=order %} + {% trans "View details" %} +
+ {% trans "You did not yet place any orders." %} +
+ + + {% trans "Place new order" %} + {% endblock %} \ No newline at end of file diff --git a/src/pretix/presale/urls.py b/src/pretix/presale/urls.py index 24ed45276..bdb6e1eea 100644 --- a/src/pretix/presale/urls.py +++ b/src/pretix/presale/urls.py @@ -34,6 +34,8 @@ urlpatterns = [ url(r'^forgot/recover$', pretix.presale.views.event.EventRecover.as_view(), name='event.forgot.recover'), url(r'^logout$', pretix.presale.views.event.EventLogout.as_view(), name='event.logout'), url(r'^orders$', pretix.presale.views.event.EventOrders.as_view(), name='event.orders'), + url(r'^account$', pretix.presale.views.event.EventAccount.as_view(), name='event.account'), + url(r'^account/settings$', pretix.presale.views.event.EventAccountSettings.as_view(), name='event.account.settings'), ])), url(r'^locale/set$', pretix.presale.views.locale.LocaleSet.as_view(), name='locale.set'), ] diff --git a/src/pretix/presale/views/event.py b/src/pretix/presale/views/event.py index 2a874de5b..326f025d3 100644 --- a/src/pretix/presale/views/event.py +++ b/src/pretix/presale/views/event.py @@ -1,7 +1,7 @@ import json from django.contrib import messages -from django.contrib.auth import authenticate, logout +from django.contrib.auth import authenticate, logout, update_session_auth_hash from django.core import signing from django.core.signing import SignatureExpired, BadSignature from django.core.urlresolvers import reverse @@ -9,9 +9,10 @@ from django.db.models import Count from django.shortcuts import redirect from django.utils.functional import cached_property from django.contrib.auth import login -from django.views.generic import TemplateView, View +from django.views.generic import TemplateView, View, UpdateView from django.utils.translation import ugettext_lazy as _ from django.conf import settings +from pretix.base.forms.user import UserSettingsForm from pretix.base.services.mail import mail from pretix.base.models import User from pretix.helpers.urls import build_absolute_uri @@ -89,7 +90,7 @@ class EventLogin(EventViewMixin, TemplateView): if 'next' in self.request.GET: return redirect(self.request.GET.get('next')) else: - return redirect('presale:event.orders', + return redirect('presale:event.account', organizer=self.request.event.organizer.slug, event=self.request.event.slug) @@ -297,6 +298,15 @@ class EventLogout(EventViewMixin, View): event=self.request.event.slug) +class EventAccount(EventLoginRequiredMixin, EventViewMixin, TemplateView): + template_name = 'pretixpresale/event/account.html' + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['orders'] = self.request.user.orders.current.count() + return context + + class EventOrders(EventLoginRequiredMixin, EventViewMixin, TemplateView): template_name = 'pretixpresale/event/orders.html' @@ -304,3 +314,30 @@ class EventOrders(EventLoginRequiredMixin, EventViewMixin, TemplateView): context = super().get_context_data(**kwargs) context['orders'] = self.request.user.orders.current.all() return context + + +class EventAccountSettings(EventLoginRequiredMixin, EventViewMixin, UpdateView): + model = User + form_class = UserSettingsForm + template_name = 'pretixpresale/event/account_settings.html' + + def get_object(self, queryset=None): + return self.request.user + + def get_form_kwargs(self): + kwargs = super().get_form_kwargs() + kwargs['user'] = self.request.user + return kwargs + + def form_invalid(self, form): + messages.error(self.request, _('Your changes could not be saved. See below for details.')) + return super().form_invalid(form) + + def form_valid(self, form): + messages.success(self.request, _('Your changes have been saved.')) + sup = super().form_valid(form) + update_session_auth_hash(self.request, self.request.user) + return sup + + def get_success_url(self): + return reverse('control:user.settings')