CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-17 17:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

More pages

Browse Source
This commit is contained in:
Raphael Michel
2018-07-08 22:31:28 +02:00
parent 365d78f63c
commit 7b230726b0
13 changed files with 453 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pretix/control/context.py
View File

@@ -12,7 +12,9 @@ from pretix.base.settings import GlobalSettingsObject
from ..helpers.i18n import ( from ..helpers.i18n import (
get_javascript_format, get_javascript_output_format, get_moment_locale, get_javascript_format, get_javascript_output_format, get_moment_locale,
) )
from .signals import html_head, nav_event, nav_global, nav_topbar from .signals import (
html_head, nav_event, nav_event_settings, nav_global, nav_topbar,
)
SessionStore = import_module(settings.SESSION_ENGINE).SessionStore SessionStore = import_module(settings.SESSION_ENGINE).SessionStore
@@ -44,6 +46,12 @@ def contextprocessor(request):
if getattr(request, 'event', None) and hasattr(request, 'organizer') and request.user.is_authenticated: if getattr(request, 'event', None) and hasattr(request, 'organizer') and request.user.is_authenticated:
for receiver, response in nav_event.send(request.event, request=request): for receiver, response in nav_event.send(request.event, request=request):
_nav_event += response _nav_event += response
ctx['nav_event_settings'] = []
for recv, retv in nav_event_settings.send(sender=request.event, request=request):
ctx['nav_event_settings'] += retv
ctx['nav_event_settings'].sort(key=lambda n: n['label'])
if request.event.settings.get('payment_term_weekdays'): if request.event.settings.get('payment_term_weekdays'):
_js_payment_weekdays_disabled = '[0,6]' _js_payment_weekdays_disabled = '[0,6]'

115
src/pretix/control/templates/pretixcontrol/event/base.html
View File

@@ -6,7 +6,7 @@
{% block nav %} {% block nav %}
<li> <li>
<a href="{% url 'control:event.index' organizer=request.event.organizer.slug event=request.event.slug %}" <a href="{% url 'control:event.index' organizer=request.event.organizer.slug event=request.event.slug %}"
{% if url_name == "event.index" %}class="active"{% endif %}> {% if url_name == "event.index" %}class="active"{% endif %}>
<i class="fa fa-dashboard fa-fw"></i> <i class="fa fa-dashboard fa-fw"></i>
{% trans "Event dashboard" %} {% trans "Event dashboard" %}
</a> </a>
@@ -14,15 +14,84 @@
{% if 'can_change_event_settings' in request.eventpermset %} {% if 'can_change_event_settings' in request.eventpermset %}
<li> <li>
<a href="{% url 'control:event.settings' organizer=request.event.organizer.slug event=request.event.slug %}" <a href="{% url 'control:event.settings' organizer=request.event.organizer.slug event=request.event.slug %}"
{% if is_event_settings or "event.settings" == url_name or "event.settings." in url_name %}class="active"{% endif %}> class="has-children">
<i class="fa fa-wrench fa-fw"></i> <i class="fa fa-wrench fa-fw"></i>
{% trans "Settings" %} {% trans "Settings" %}
</a> </a>
<a href="#" class="arrow">
<span class="fa arrow"></span>
</a>
<ul class="nav nav-second-level">
{% if 'can_change_event_settings' in request.eventpermset %}
<li>
<a href="{% url 'control:event.settings' organizer=request.event.organizer.slug event=request.event.slug %}"
{% if "event.settings" == url_name %}class="active"{% endif %}>
{% trans "General" %}
</a>
</li>
<li>
<a href="{% url 'control:event.settings.payment' organizer=request.event.organizer.slug event=request.event.slug %}"
{% if "event.settings.payment" == url_name %}class="active"{% endif %}>
{% trans "Payment" %}
</a>
</li>
<li>
<a href="{% url 'control:event.settings.plugins' organizer=request.event.organizer.slug event=request.event.slug %}"
{% if "event.settings.plugins" == url_name %}class="active"{% endif %}>
{% trans "Plugins" %}
</a>
</li>
<li {% if "event.settings.display" == url_name %}class="active"{% endif %}>
<a href="{% url 'control:event.settings.display' organizer=request.event.organizer.slug event=request.event.slug %}"
{% if "event.settings.display" == url_name %}class="active"{% endif %}>
{% trans "Display" %}
</a>
</li>
<li>
<a href="{% url 'control:event.settings.tickets' organizer=request.event.organizer.slug event=request.event.slug %}"
{% if "event.settings.tickets" == url_name %}class="active"{% endif %}>
{% trans "Tickets" %}
</a>
</li>
<li>
<a href="{% url 'control:event.settings.mail' organizer=request.event.organizer.slug event=request.event.slug %}" {% if "event.settings.mail" == url_name %}class="active"{% endif %}>
{% trans "E-mail" %}
</a>
</li>
<li>
<a href="{% url 'control:event.settings.tax' organizer=request.event.organizer.slug event=request.event.slug %}" {% if "event.settings.tax" in url_name %}class="active"{% endif %}>
{% trans "Tax rules" %}
</a>
</li>
<li>
<a href="{% url 'control:event.settings.invoice' organizer=request.event.organizer.slug event=request.event.slug %}" {% if "event.settings.invoice" == url_name %}class="active"{% endif %}>
{% trans "Invoicing" %}
</a>
</li>
<li>
<a href="{% url 'control:event.settings.permissions' organizer=request.event.organizer.slug event=request.event.slug %}" {% if "event.settings.permissions" == url_name %}class="active"{% endif %}>
{% trans "Permissions" %}
</a>
</li>
<li>
<a href="{% url 'control:event.settings.widget' organizer=request.event.organizer.slug event=request.event.slug %}" {% if "event.settings.widget" == url_name %}class="active"{% endif %}>
{% trans "Widget" %}
</a>
</li>
{% endif %}
{% for nav in nav_event_settings %}
<li>
<a href="{{ nav.url }}" {% if nav.active %}class="active"{% endif %}>
{{ nav.label }}
</a>
</li>
{% endfor %}
</ul>
</li> </li>
{% if request.event.has_subevents %} {% if request.event.has_subevents %}
<li> <li>
<a href="{% url 'control:event.subevents' organizer=request.event.organizer.slug event=request.event.slug %}" <a href="{% url 'control:event.subevents' organizer=request.event.organizer.slug event=request.event.slug %}"
{% if "event.subevent" in url_name %}class="active"{% endif %}> {% if "event.subevent" in url_name %}class="active"{% endif %}>
<i class="fa fa-calendar fa-fw"></i> <i class="fa fa-calendar fa-fw"></i>
{% trans "Dates" context "subevent" %} {% trans "Dates" context "subevent" %}
</a> </a>
@@ -32,7 +101,7 @@
{% if 'can_change_items' in request.eventpermset %} {% if 'can_change_items' in request.eventpermset %}
<li> <li>
<a href="{% url 'control:event.items' organizer=request.event.organizer.slug event=request.event.slug %}" <a href="{% url 'control:event.items' organizer=request.event.organizer.slug event=request.event.slug %}"
class="has-children"> class="has-children">
<i class="fa fa-ticket fa-fw"></i> <i class="fa fa-ticket fa-fw"></i>
{% trans "Products" %} {% trans "Products" %}
</a> </a>
@@ -42,24 +111,24 @@
<ul class="nav nav-second-level"> <ul class="nav nav-second-level">
<li> <li>
<a href="{% url 'control:event.items' organizer=request.event.organizer.slug event=request.event.slug %}" <a href="{% url 'control:event.items' organizer=request.event.organizer.slug event=request.event.slug %}"
{% if "event.items" == url_name or "event.item." in url_name or "event.items.add" == url_name or url_name == "event.item" %}class="active"{% endif %}> {% if "event.items" == url_name or "event.item." in url_name or "event.items.add" == url_name or url_name == "event.item" %}class="active"{% endif %}>
{% trans "Products" %}</a> {% trans "Products" %}</a>
</li> </li>
<li> <li>
<a href="{% url 'control:event.items.quotas' organizer=request.event.organizer.slug event=request.event.slug %}" <a href="{% url 'control:event.items.quotas' organizer=request.event.organizer.slug event=request.event.slug %}"
{% if "event.items.quotas" in url_name %}class="active"{% endif %}> {% if "event.items.quotas" in url_name %}class="active"{% endif %}>
{% trans "Quotas" %} {% trans "Quotas" %}
</a> </a>
</li> </li>
<li> <li>
<a href="{% url 'control:event.items.categories' organizer=request.event.organizer.slug event=request.event.slug %}" <a href="{% url 'control:event.items.categories' organizer=request.event.organizer.slug event=request.event.slug %}"
{% if "event.items.categories" in url_name %}class="active"{% endif %}> {% if "event.items.categories" in url_name %}class="active"{% endif %}>
{% trans "Categories" %} {% trans "Categories" %}
</a> </a>
</li> </li>
<li> <li>
<a href="{% url 'control:event.items.questions' organizer=request.event.organizer.slug event=request.event.slug %}" <a href="{% url 'control:event.items.questions' organizer=request.event.organizer.slug event=request.event.slug %}"
{% if "event.items.questions" in url_name %}class="active"{% endif %}> {% if "event.items.questions" in url_name %}class="active"{% endif %}>
{% trans "Questions" %} {% trans "Questions" %}
</a> </a>
</li> </li>
@@ -69,7 +138,7 @@
{% if 'can_view_orders' in request.eventpermset %} {% if 'can_view_orders' in request.eventpermset %}
<li> <li>
<a href="{% url 'control:event.orders' organizer=request.event.organizer.slug event=request.event.slug %}" <a href="{% url 'control:event.orders' organizer=request.event.organizer.slug event=request.event.slug %}"
class="has-children"> class="has-children">
<i class="fa fa-shopping-cart fa-fw"></i> <i class="fa fa-shopping-cart fa-fw"></i>
{% trans "Orders" %} {% trans "Orders" %}
</a> </a>
@@ -79,19 +148,19 @@
<ul class="nav nav-second-level"> <ul class="nav nav-second-level">
<li> <li>
<a href="{% url 'control:event.orders' organizer=request.event.organizer.slug event=request.event.slug %}" <a href="{% url 'control:event.orders' organizer=request.event.organizer.slug event=request.event.slug %}"
{% if url_name == "event.orders" or "event.order." in url_name or url_name == "event.order" %}class="active"{% endif %}> {% if url_name == "event.orders" or "event.order." in url_name or url_name == "event.order" %}class="active"{% endif %}>
{% trans "All orders" %} {% trans "All orders" %}
</a> </a>
</li> </li>
<li> <li>
<a href="{% url 'control:event.orders.overview' organizer=request.event.organizer.slug event=request.event.slug %}" <a href="{% url 'control:event.orders.overview' organizer=request.event.organizer.slug event=request.event.slug %}"
{% if url_name == "event.orders.overview" %}class="active"{% endif %}> {% if url_name == "event.orders.overview" %}class="active"{% endif %}>
{% trans "Overview" %} {% trans "Overview" %}
</a> </a>
</li> </li>
<li> <li>
<a href="{% url 'control:event.orders.export' organizer=request.event.organizer.slug event=request.event.slug %}" <a href="{% url 'control:event.orders.export' organizer=request.event.organizer.slug event=request.event.slug %}"
{% if url_name == "event.orders.export" %}class="active"{% endif %}> {% if url_name == "event.orders.export" %}class="active"{% endif %}>
{% trans "Export" %} {% trans "Export" %}
</a> </a>
</li> </li>
@@ -107,7 +176,7 @@
{% if 'can_view_vouchers' in request.eventpermset %} {% if 'can_view_vouchers' in request.eventpermset %}
<li> <li>
<a href="{% url 'control:event.vouchers' organizer=request.event.organizer.slug event=request.event.slug %}" <a href="{% url 'control:event.vouchers' organizer=request.event.organizer.slug event=request.event.slug %}"
{% if "event.voucher" in url_name %}class="active"{% endif %}> {% if "event.voucher" in url_name %}class="active"{% endif %}>
<i class="fa fa-tags fa-fw"></i> <i class="fa fa-tags fa-fw"></i>
{% trans "Vouchers" %} {% trans "Vouchers" %}
</a> </a>
@@ -116,7 +185,7 @@
{% if 'can_view_orders' in request.eventpermset %} {% if 'can_view_orders' in request.eventpermset %}
<li> <li>
<a href="{% url 'control:event.orders.checkinlists' organizer=request.event.organizer.slug event=request.event.slug %}" <a href="{% url 'control:event.orders.checkinlists' organizer=request.event.organizer.slug event=request.event.slug %}"
{% if "event.orders.checkin" in url_name %}class="active"{% endif %}> {% if "event.orders.checkin" in url_name %}class="active"{% endif %}>
<i class="fa fa-check-square-o fa-fw"></i> <i class="fa fa-check-square-o fa-fw"></i>
{% trans "Check-in lists" %} {% trans "Check-in lists" %}
</a> </a>
@@ -125,7 +194,7 @@
{% for nav in nav_event %} {% for nav in nav_event %}
<li> <li>
<a href="{{ nav.url }}" {% if nav.active %}class="active"{% endif %} <a href="{{ nav.url }}" {% if nav.active %}class="active"{% endif %}
{% if nav.children %}class="has-children"{% endif %}> {% if nav.children %}class="has-children"{% endif %}>
{% if nav.icon and "." in nav.icon %} {% if nav.icon and "." in nav.icon %}
<img src="{% static nav.icon %}" class="fa-img"> <img src="{% static nav.icon %}" class="fa-img">
{% elif nav.icon %} {% elif nav.icon %}
@@ -138,14 +207,14 @@
<span class="fa arrow"></span> <span class="fa arrow"></span>
</a> </a>
<ul class="nav nav-second-level"> <ul class="nav nav-second-level">
{% for item in nav.children %} {% for item in nav.children %}
<li> <li>
<a href="{{ item.url }}" <a href="{{ item.url }}"
{% if item.active %}class="active"{% endif %}> {% if item.active %}class="active"{% endif %}>
{{ item.label }} {{ item.label }}
</a> </a>
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
{% endif %} {% endif %}
</li> </li>

38
src/pretix/control/templates/pretixcontrol/event/display.html
View File

@@ -6,22 +6,30 @@
<form action="" method="post" class="form-horizontal" enctype="multipart/form-data"> <form action="" method="post" class="form-horizontal" enctype="multipart/form-data">
{% csrf_token %} {% csrf_token %}
{% bootstrap_form_errors form %} {% bootstrap_form_errors form %}
<fieldset> <fieldset class="panel panel-default">
<legend>{% trans "Event page" %}</legend> <div class="panel-heading">
{% bootstrap_field form.logo_image layout="control" %} <legend>{% trans "Event page" %}</legend>
{% bootstrap_field form.frontpage_text layout="control" %} </div>
{% bootstrap_field form.show_variations_expanded layout="control" %} <div class="panel-body">
{% if form.frontpage_subevent_ordering %} {% bootstrap_field form.logo_image layout="control" %}
{% bootstrap_field form.frontpage_subevent_ordering layout="control" %} {% bootstrap_field form.frontpage_text layout="control" %}
{% endif %} {% bootstrap_field form.show_variations_expanded layout="control" %}
{% if form.frontpage_subevent_ordering %}
{% bootstrap_field form.frontpage_subevent_ordering layout="control" %}
{% endif %}
</div>
</fieldset> </fieldset>
<fieldset> <fieldset class="panel panel-default">
<legend>{% trans "Shop design" %}</legend> <div class="panel-heading">
{% url "control:organizer.display" organizer=request.organizer.slug as org_url %} <legend>{% trans "Shop design" %}</legend>
{% propagated request.event org_url "primary_color" "primary_font" %} </div>
{% bootstrap_field form.primary_color layout="control" %} <div class="panel-body">
{% bootstrap_field form.primary_font layout="control" %} {% url "control:organizer.display" organizer=request.organizer.slug as org_url %}
{% endpropagated %} {% propagated request.event org_url "primary_color" "primary_font" %}
{% bootstrap_field form.primary_color layout="control" %}
{% bootstrap_field form.primary_font layout="control" %}
{% endpropagated %}
</div>
</fieldset> </fieldset>
<div class="form-group submit-group"> <div class="form-group submit-group">
<button type="submit" class="btn btn-primary btn-save"> <button type="submit" class="btn btn-primary btn-save">

101
src/pretix/control/templates/pretixcontrol/event/mail.html
View File

@@ -6,56 +6,61 @@
mail-preview-url="{% url "control:event.settings.mail.preview" event=request.event.slug organizer=request.event.organizer.slug %}"> mail-preview-url="{% url "control:event.settings.mail.preview" event=request.event.slug organizer=request.event.organizer.slug %}">
{% csrf_token %} {% csrf_token %}
{% bootstrap_form_errors form %} {% bootstrap_form_errors form %}
<fieldset> <fieldset class="panel panel-default">
<legend>{% trans "E-mail settings" %}</legend> <div class="panel-heading">
{% bootstrap_field form.mail_prefix layout="control" %} <legend>{% trans "E-mail settings" %}</legend>
{% bootstrap_field form.mail_from layout="control" %} </div>
{% bootstrap_field form.mail_text_signature layout="control" %} <div class="panel-body">
{% bootstrap_field form.mail_bcc layout="control" %} {% bootstrap_field form.mail_prefix layout="control" %}
</fieldset> {% bootstrap_field form.mail_from layout="control" %}
<fieldset> {% bootstrap_field form.mail_text_signature layout="control" %}
<legend>{% trans "E-mail content" %}</legend> {% bootstrap_field form.mail_bcc layout="control" %}
<div class="panel-group" id="questions_group">
{% blocktrans asvar title_placed_order %}Placed order{% endblocktrans %}
{% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_placed" title=title_placed_order items="mail_text_order_placed" %}
{% blocktrans asvar title_paid_order %}Paid order{% endblocktrans %}
{% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_paid" title=title_paid_order items="mail_text_order_paid" %}
{% blocktrans asvar title_free_order %}Free order{% endblocktrans %}
{% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_free" title=title_free_order items="mail_text_order_free" %}
{% blocktrans asvar title_resend_link %}Resend link{% endblocktrans %}
{% include "pretixcontrol/event/mail_settings_fragment.html" with pid="resend_link" title=title_resend_link items="mail_text_resend_link,mail_text_resend_all_links" %}
{% blocktrans asvar title_order_changed %}Order changed{% endblocktrans %}
{% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_changed" title=title_order_changed items="mail_text_order_changed" %}
{% blocktrans asvar title_payment_reminder %}Payment reminder{% endblocktrans %}
{% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_expirew" title=title_payment_reminder items="mail_days_order_expire_warning,mail_text_order_expire_warning" exclude="mail_days_order_expire_warning" %}
{% blocktrans asvar title_waiting_list_notification %}Waiting list notification{% endblocktrans %}
{% include "pretixcontrol/event/mail_settings_fragment.html" with pid="waiting_list" title=title_waiting_list_notification items="mail_text_waiting_list" %}
{% blocktrans asvar title_order_canceled %}Order canceled{% endblocktrans %}
{% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_canceled" title=title_order_canceled items="mail_text_order_canceled" %}
{% blocktrans asvar title_order_custom_mail %}Order custom mail{% endblocktrans %}
{% include "pretixcontrol/event/mail_settings_fragment.html" with pid="custom_mail" title=title_order_custom_mail items="mail_text_order_custom_mail" %}
{% blocktrans asvar title_download_tickets_reminder %}Reminder to download tickets{% endblocktrans %}
{% include "pretixcontrol/event/mail_settings_fragment.html" with pid="ticket_reminder" title=title_download_tickets_reminder items="mail_days_download_reminder,mail_text_download_reminder" exclude="mail_days_download_reminder" %}
</div> </div>
</fieldset> </fieldset>
<fieldset> <div class="panel-group" id="questions_group">
<legend>{% trans "SMTP settings" %}</legend> {% blocktrans asvar title_placed_order %}Placed order{% endblocktrans %}
{% bootstrap_field form.smtp_use_custom layout="control" %} {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_placed" title=title_placed_order items="mail_text_order_placed" %}
{% bootstrap_field form.smtp_host layout="control" %}
{% bootstrap_field form.smtp_port layout="control" %} {% blocktrans asvar title_paid_order %}Paid order{% endblocktrans %}
{% bootstrap_field form.smtp_username layout="control" %} {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_paid" title=title_paid_order items="mail_text_order_paid" %}
{% bootstrap_field form.smtp_password layout="control" %}
{% bootstrap_field form.smtp_use_tls layout="control" %} {% blocktrans asvar title_free_order %}Free order{% endblocktrans %}
{% bootstrap_field form.smtp_use_ssl layout="control" %} {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_free" title=title_free_order items="mail_text_order_free" %}
{% blocktrans asvar title_resend_link %}Resend link{% endblocktrans %}
{% include "pretixcontrol/event/mail_settings_fragment.html" with pid="resend_link" title=title_resend_link items="mail_text_resend_link,mail_text_resend_all_links" %}
{% blocktrans asvar title_order_changed %}Order changed{% endblocktrans %}
{% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_changed" title=title_order_changed items="mail_text_order_changed" %}
{% blocktrans asvar title_payment_reminder %}Payment reminder{% endblocktrans %}
{% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_expirew" title=title_payment_reminder items="mail_days_order_expire_warning,mail_text_order_expire_warning" exclude="mail_days_order_expire_warning" %}
{% blocktrans asvar title_waiting_list_notification %}Waiting list notification{% endblocktrans %}
{% include "pretixcontrol/event/mail_settings_fragment.html" with pid="waiting_list" title=title_waiting_list_notification items="mail_text_waiting_list" %}
{% blocktrans asvar title_order_canceled %}Order canceled{% endblocktrans %}
{% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_canceled" title=title_order_canceled items="mail_text_order_canceled" %}
{% blocktrans asvar title_order_custom_mail %}Order custom mail{% endblocktrans %}
{% include "pretixcontrol/event/mail_settings_fragment.html" with pid="custom_mail" title=title_order_custom_mail items="mail_text_order_custom_mail" %}
{% blocktrans asvar title_download_tickets_reminder %}Reminder to download tickets{% endblocktrans %}
{% include "pretixcontrol/event/mail_settings_fragment.html" with pid="ticket_reminder" title=title_download_tickets_reminder items="mail_days_download_reminder,mail_text_download_reminder" exclude="mail_days_download_reminder" %}
</div>
<fieldset class="panel panel-default">
<div class="panel-heading">
<legend>{% trans "SMTP settings" %}</legend>
</div>
<div class="panel-body">
{% bootstrap_field form.smtp_use_custom layout="control" %}
{% bootstrap_field form.smtp_host layout="control" %}
{% bootstrap_field form.smtp_port layout="control" %}
{% bootstrap_field form.smtp_username layout="control" %}
{% bootstrap_field form.smtp_password layout="control" %}
{% bootstrap_field form.smtp_use_tls layout="control" %}
{% bootstrap_field form.smtp_use_ssl layout="control" %}
</div>
</fieldset> </fieldset>
<div class="form-group submit-group"> <div class="form-group submit-group">
<button type="submit" class="btn btn-primary btn-save"> <button type="submit" class="btn btn-primary btn-save">

5
src/pretix/control/templates/pretixcontrol/event/mail_settings_fragment.html
View File

@@ -4,7 +4,10 @@
<details class="panel panel-default"> <details class="panel panel-default">
<summary class="panel-heading"> <summary class="panel-heading">
<h4 class="panel-title"> <h4 class="panel-title">
<strong>{% trans title %}</strong> <span>
{% trans "E-mail content:" %}
<strong>{% trans title %}</strong>
</span>
<i class="fa fa-angle-down collapse-indicator"></i> <i class="fa fa-angle-down collapse-indicator"></i>
</h4> </h4>
</summary> </summary>

32
src/pretix/control/templates/pretixcontrol/event/payment.html
View File

@@ -4,8 +4,10 @@
{% block inside %} {% block inside %}
<form action="" method="post" class="form-horizontal form-plugins"> <form action="" method="post" class="form-horizontal form-plugins">
{% csrf_token %} {% csrf_token %}
<fieldset> <fieldset class="panel panel-default">
<legend>{% trans "Payment providers" %}</legend> <div class="panel-heading">
<legend>{% trans "Payment providers" %}</legend>
</div>
<table class="table table-payment-providers"> <table class="table table-payment-providers">
<tbody> <tbody>
{% for provider in providers %} {% for provider in providers %}
@@ -28,13 +30,13 @@
</td> </td>
<td class="text-right"> <td class="text-right">
<a href="{% url 'control:event.settings.payment.provider' event=request.event.slug organizer=request.organizer.slug provider=provider.identifier %}" <a href="{% url 'control:event.settings.payment.provider' event=request.event.slug organizer=request.organizer.slug provider=provider.identifier %}"
class="btn btn-default"> class="btn btn-default">
<span class="fa fa-cog"></span> <span class="fa fa-cog"></span>
{% trans "Settings" %} {% trans "Settings" %}
</a> </a>
</td> </td>
</tr> </tr>
{% empty %} {% empty %}
<tr> <tr>
<td colspan="3"> <td colspan="3">
{% trans "There are no payment providers available. Please go to the plugin settings and activate one or more payment plugins." %} {% trans "There are no payment providers available. Please go to the plugin settings and activate one or more payment plugins." %}
@@ -44,15 +46,19 @@
</tbody> </tbody>
</table> </table>
</fieldset> </fieldset>
<fieldset> <fieldset class="panel panel-default">
<legend>{% trans "General payment settings" %}</legend> <div class="panel-heading">
{% bootstrap_form_errors form layout="control" %} <legend>{% trans "General payment settings" %}</legend>
{% bootstrap_field form.payment_term_days layout="control" %} </div>
{% bootstrap_field form.payment_term_last layout="control" %} <div class="panel-body">
{% bootstrap_field form.payment_term_weekdays layout="control" %} {% bootstrap_form_errors form layout="control" %}
{% bootstrap_field form.payment_term_expire_automatically layout="control" %} {% bootstrap_field form.payment_term_days layout="control" %}
{% bootstrap_field form.payment_term_accept_late layout="control" %} {% bootstrap_field form.payment_term_last layout="control" %}
{% bootstrap_field form.tax_rate_default layout="control" %} {% bootstrap_field form.payment_term_weekdays layout="control" %}
{% bootstrap_field form.payment_term_expire_automatically layout="control" %}
{% bootstrap_field form.payment_term_accept_late layout="control" %}
{% bootstrap_field form.tax_rate_default layout="control" %}
</div>
</fieldset> </fieldset>
<div class="form-group submit-group"> <div class="form-group submit-group">
<button type="submit" class="btn btn-primary btn-save"> <button type="submit" class="btn btn-primary btn-save">

137
src/pretix/control/templates/pretixcontrol/event/plugins.html
View File

@@ -2,78 +2,79 @@
{% load i18n %} {% load i18n %}
{% load bootstrap3 %} {% load bootstrap3 %}
{% block inside %} {% block inside %}
<form action="" method="post" class="form-horizontal form-plugins"> <form action="" method="post" class="form-horizontal form-plugins">
{% csrf_token %} {% csrf_token %}
<fieldset> {% if "success" in request.GET %}
<legend>{% trans "Installed plugins" %}</legend> <div class="alert alert-success">
{% if "success" in request.GET %} {% trans "Your changes have been saved." %}
<div class="alert alert-success"> </div>
{% trans "Your changes have been saved." %} {% endif %}
</div> <div class="row row-plugins">
{% endif %} {% for plugin in plugins %}
<div class="row row-plugins"> <div class="col-md-6 col-sm-12">
{% for plugin in plugins %} <div class="panel panel-{% if plugin.app.compatibility_errors %}warning{% elif plugin.module in plugins_active %}success{% else %}default{% endif %}">
<div class="col-md-6 col-sm-12"> <div class="panel-heading">
<div class="panel panel-{% if plugin.app.compatibility_errors %}warning{% elif plugin.module in plugins_active %}success{% else %}default{% endif %}"> <div class="row">
<div class="panel-heading"> <div class="col-sm-8">
<div class="row"> <h3 class="panel-title">{{ plugin.name }}</h3>
<div class="col-sm-8"> </div>
<h3 class="panel-title">{{ plugin.name }}</h3> <div class="col-sm-4">
</div> {% if plugin.app.compatibility_errors %}
<div class="col-sm-4"> <button class="btn disabled btn-block btn-default"
{% if plugin.app.compatibility_errors %} disabled="disabled">{% trans "Incompatible" %}</button>
<button class="btn disabled btn-block btn-default" disabled="disabled">{% trans "Incompatible" %}</button>
{% elif plugin.restricted and not staff_session %} {% elif plugin.restricted and not staff_session %}
<button class="btn disabled btn-block btn-default" disabled="disabled">{% trans "Not available" %}</button> <button class="btn disabled btn-block btn-default"
disabled="disabled">{% trans "Not available" %}</button>
{% elif plugin.module in plugins_active %} {% elif plugin.module in plugins_active %}
<button class="btn btn-default btn-block" name="plugin:{{ plugin.module }}" value="disable">{% trans "Disable" %}</button> <button class="btn btn-default btn-block" name="plugin:{{ plugin.module }}"
{% else %} value="disable">{% trans "Disable" %}</button>
<button class="btn btn-default btn-block" name="plugin:{{ plugin.module }}" value="enable">{% trans "Enable" %}</button> {% else %}
{% endif %} <button class="btn btn-default btn-block" name="plugin:{{ plugin.module }}"
</div> value="enable">{% trans "Enable" %}</button>
{% endif %}
</div> </div>
</div> </div>
<div class="panel-body"> </div>
{% if plugin.author %} <div class="panel-body">
<p class="meta">{% blocktrans trimmed with v=plugin.version a=plugin.author %} {% if plugin.author %}
Version {{ v }} by <em>{{ a }}</em> <p class="meta">{% blocktrans trimmed with v=plugin.version a=plugin.author %}
{% endblocktrans %}</p> Version {{ v }} by <em>{{ a }}</em>
{% else %} {% endblocktrans %}</p>
<p class="meta">{% blocktrans trimmed with v=plugin.version a=plugin.author %} {% else %}
Version {{ v }} <p class="meta">{% blocktrans trimmed with v=plugin.version a=plugin.author %}
{% endblocktrans %}</p> Version {{ v }}
{% endif %} {% endblocktrans %}</p>
<p>{{ plugin.description }}</p> {% endif %}
{% if plugin.restricted and not request.user.is_staff %} <p>{{ plugin.description }}</p>
<div class="alert alert-warning"> {% if plugin.restricted and not request.user.is_staff %}
{% trans "This plugin needs to be enabled by a system administrator for your event." %} <div class="alert alert-warning">
</div> {% trans "This plugin needs to be enabled by a system administrator for your event." %}
{% endif %} </div>
{% if plugin.app.compatibility_errors %} {% endif %}
<div class="alert alert-warning"> {% if plugin.app.compatibility_errors %}
{% trans "This plugin cannot be enabled for the following reasons:" %} <div class="alert alert-warning">
<ul> {% trans "This plugin cannot be enabled for the following reasons:" %}
{% for e in plugin.app.compatibility_errors %} <ul>
<li>{{ e }}</li> {% for e in plugin.app.compatibility_errors %}
{% endfor %} <li>{{ e }}</li>
</ul> {% endfor %}
</div> </ul>
{% endif %} </div>
{% if plugin.app.compatibility_warnings %} {% endif %}
<div class="alert alert-warning"> {% if plugin.app.compatibility_warnings %}
{% trans "This plugin reports the following problems:" %} <div class="alert alert-warning">
<ul> {% trans "This plugin reports the following problems:" %}
{% for e in plugin.app.compatibility_warnings %} <ul>
<li>{{ e }}</li> {% for e in plugin.app.compatibility_warnings %}
{% endfor %} <li>{{ e }}</li>
</ul> {% endfor %}
</div> </ul>
{% endif %} </div>
</div> {% endif %}
</div> </div>
</div> </div>
{% endfor %} </div>
</div> {% endfor %}
</fieldset> </div>
</form> </form>
{% endblock %} {% endblock %}

146
src/pretix/control/templates/pretixcontrol/event/settings.html
View File

@@ -5,74 +5,94 @@
<form action="" method="post" class="form-horizontal"> <form action="" method="post" class="form-horizontal">
{% csrf_token %} {% csrf_token %}
{% bootstrap_form_errors form %} {% bootstrap_form_errors form %}
<fieldset> <fieldset class="panel panel-default">
<legend>{% trans "General information" %}</legend> <div class="panel-heading">
{% bootstrap_field form.name layout="control" %} <legend>{% trans "General information" %}</legend>
{% bootstrap_field form.slug layout="control" %} </div>
{% bootstrap_field form.date_from layout="control" %} <div class="panel-body">
{% bootstrap_field form.date_to layout="control" %} {% bootstrap_field form.name layout="control" %}
{% bootstrap_field form.location layout="control" %} {% bootstrap_field form.slug layout="control" %}
{% bootstrap_field form.date_admission layout="control" %} {% bootstrap_field form.date_from layout="control" %}
{% bootstrap_field form.currency layout="control" %} {% bootstrap_field form.date_to layout="control" %}
{% bootstrap_field form.is_public layout="control" %} {% bootstrap_field form.location layout="control" %}
{% bootstrap_field form.date_admission layout="control" %}
{% bootstrap_field form.currency layout="control" %}
{% bootstrap_field form.is_public layout="control" %}
{% if meta_forms %} {% if meta_forms %}
<div class="form-group metadata-group"> <div class="form-group metadata-group">
<label class="col-md-3 control-label">{% trans "Meta data" %}</label> <label class="col-md-3 control-label">{% trans "Meta data" %}</label>
<div class="col-md-9"> <div class="col-md-9">
{% for form in meta_forms %} {% for form in meta_forms %}
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<label for="{{ form.value.id_for_label }}"> <label for="{{ form.value.id_for_label }}">
{{ form.property.name }} {{ form.property.name }}
</label> </label>
</div>
<div class="col-md-8">
{% bootstrap_form form layout="inline" %}
</div>
</div> </div>
<div class="col-md-8"> {% endfor %}
{% bootstrap_form form layout="inline" %} </div>
</div>
</div>
{% endfor %}
</div> </div>
</div> {% endif %}
{% endif %} </div>
</fieldset> </fieldset>
<fieldset> <fieldset class="panel panel-default">
<legend>{% trans "Display settings" %}</legend> <div class="panel-heading">
{% bootstrap_field sform.locales layout="control" %} <legend>{% trans "Display settings" %}</legend>
{% bootstrap_field sform.locale layout="control" %} </div>
{% bootstrap_field sform.timezone layout="control" %} <div class="panel-body">
{% bootstrap_field sform.show_date_to layout="control" %} {% bootstrap_field sform.locales layout="control" %}
{% bootstrap_field sform.show_times layout="control" %} {% bootstrap_field sform.locale layout="control" %}
{% bootstrap_field sform.contact_mail layout="control" %} {% bootstrap_field sform.timezone layout="control" %}
{% bootstrap_field sform.imprint_url layout="control" %} {% bootstrap_field sform.show_date_to layout="control" %}
{% bootstrap_field sform.confirm_text layout="control" %} {% bootstrap_field sform.show_times layout="control" %}
{% bootstrap_field sform.show_quota_left layout="control" %} {% bootstrap_field sform.contact_mail layout="control" %}
{% bootstrap_field sform.display_net_prices layout="control" %} {% bootstrap_field sform.imprint_url layout="control" %}
{% bootstrap_field sform.confirm_text layout="control" %}
{% bootstrap_field sform.show_quota_left layout="control" %}
{% bootstrap_field sform.display_net_prices layout="control" %}
</div>
</fieldset> </fieldset>
<fieldset> <fieldset class="panel panel-default">
<legend>{% trans "Timeline" %}</legend> <div class="panel-heading">
{% bootstrap_field form.presale_start layout="control" %} <legend>{% trans "Timeline" %}</legend>
{% bootstrap_field sform.presale_start_show_date layout="control" %} </div>
{% bootstrap_field form.presale_end layout="control" %} <div class="panel-body">
{% bootstrap_field sform.show_items_outside_presale_period layout="control" %} {% bootstrap_field form.presale_start layout="control" %}
{% bootstrap_field sform.last_order_modification_date layout="control" %} {% bootstrap_field sform.presale_start_show_date layout="control" %}
{% bootstrap_field form.presale_end layout="control" %}
{% bootstrap_field sform.show_items_outside_presale_period layout="control" %}
{% bootstrap_field sform.last_order_modification_date layout="control" %}
</div>
</fieldset> </fieldset>
<fieldset> <fieldset class="panel panel-default">
<legend>{% trans "Orders" %}</legend> <div class="panel-heading">
{% bootstrap_field sform.reservation_time layout="control" %} <legend>{% trans "Orders" %}</legend>
{% bootstrap_field sform.max_items_per_order layout="control" %} </div>
{% bootstrap_field sform.attendee_names_asked layout="control" %} <div class="panel-body">
{% bootstrap_field sform.attendee_names_required layout="control" %} {% bootstrap_field sform.reservation_time layout="control" %}
{% bootstrap_field sform.order_email_asked_twice layout="control" %} {% bootstrap_field sform.max_items_per_order layout="control" %}
{% bootstrap_field sform.attendee_emails_asked layout="control" %} {% bootstrap_field sform.attendee_names_asked layout="control" %}
{% bootstrap_field sform.attendee_emails_required layout="control" %} {% bootstrap_field sform.attendee_names_required layout="control" %}
{% bootstrap_field sform.cancel_allow_user layout="control" %} {% bootstrap_field sform.order_email_asked_twice layout="control" %}
{% bootstrap_field sform.attendee_emails_asked layout="control" %}
{% bootstrap_field sform.attendee_emails_required layout="control" %}
{% bootstrap_field sform.cancel_allow_user layout="control" %}
</div>
</fieldset> </fieldset>
<fieldset> <fieldset class="panel panel-default">
<legend>{% trans "Waiting list" %}</legend> <div class="panel-heading">
{% bootstrap_field sform.waiting_list_enabled layout="control" %} <legend>{% trans "Waiting list" %}</legend>
{% bootstrap_field sform.waiting_list_auto layout="control" %} </div>
{% bootstrap_field sform.waiting_list_hours layout="control" %} <div class="panel-body">
{% bootstrap_field sform.waiting_list_enabled layout="control" %}
{% bootstrap_field sform.waiting_list_auto layout="control" %}
{% bootstrap_field sform.waiting_list_hours layout="control" %}
</div>
</fieldset> </fieldset>
<div class="form-group submit-group"> <div class="form-group submit-group">
<button type="submit" class="btn btn-primary btn-save"> <button type="submit" class="btn btn-primary btn-save">
@@ -80,12 +100,12 @@
</button> </button>
<div class="pull-left"> <div class="pull-left">
<a href="{% url "control:event.delete" organizer=request.organizer.slug event=request.event.slug %}" <a href="{% url "control:event.delete" organizer=request.organizer.slug event=request.event.slug %}"
class="btn {% if request.event.allow_delete %}{% endif %} btn-danger btn-lg"> class="btn {% if request.event.allow_delete %}{% endif %} btn-danger btn-lg">
<span class="fa fa-trash"></span> <span class="fa fa-trash"></span>
{% trans "Delete event" %} {% trans "Delete event" %}
</a> </a>
<a href="{% url "control:event.shredder.start" organizer=request.organizer.slug event=request.event.slug %}" <a href="{% url "control:event.shredder.start" organizer=request.organizer.slug event=request.event.slug %}"
class="btn btn-danger btn-lg"> class="btn btn-danger btn-lg">
<span class="fa fa-eraser"></span> <span class="fa fa-eraser"></span>
{% trans "Delete personal data" %} {% trans "Delete personal data" %}
</a> </a>

105
src/pretix/control/templates/pretixcontrol/event/settings_base.html
View File

@@ -4,91 +4,34 @@
{% block title %}{{ request.event.name }}{% endblock %} {% block title %}{{ request.event.name }}{% endblock %}
{% block content %} {% block content %}
{% if "congratulations" in request.GET %} {% if "congratulations" in request.GET %}
<div class="thank-you"> <div class="panel panel-default">
<span class="fa fa-check-circle"></span> <div class="panel-body">
<div class="thank-you">
<span class="fa fa-check-circle"></span>
<h2>{% trans "Congratulations!" %}</h2> <h2>{% trans "Congratulations!" %}</h2>
<p> <p>
<strong>{% trans "You just created an event!" %}</strong> <strong>{% trans "You just created an event!" %}</strong>
</p> </p>
<p> <p>
{% blocktrans trimmed %} {% blocktrans trimmed %}
You can now scroll down and modify the settings in more detail, if you want, or you can create your You can now scroll down and modify the settings in more detail, if you want, or you can
first product to start selling tickets right away! create your
{% endblocktrans %} first product to start selling tickets right away!
</p> {% endblocktrans %}
<p> </p>
<a href="{% url "control:event.items.add" organizer=request.organizer.slug event=request.event.slug %}" <p>
class="btn btn-default"> <a href="{% url "control:event.items.add" organizer=request.organizer.slug event=request.event.slug %}"
{% trans "Create a first product" %} class="btn btn-default">
</a> {% trans "Create a first product" %}
</p> </a>
<div class="clearfix"></div> </p>
<div class="clearfix"></div>
</div>
</div>
</div> </div>
{% endif %} {% endif %}
<h1>{% trans "Settings" %}</h1>
<ul class="nav nav-pills">
{% if 'can_change_event_settings' in request.eventpermset %}
<li {% if "event.settings" == url_name %}class="active"{% endif %}>
<a href="{% url 'control:event.settings' organizer=request.event.organizer.slug event=request.event.slug %}">
{% trans "General" %}
</a>
</li>
<li {% if "event.settings.payment" == url_name %}class="active"{% endif %}>
<a href="{% url 'control:event.settings.payment' organizer=request.event.organizer.slug event=request.event.slug %}">
{% trans "Payment" %}
</a>
</li>
<li {% if "event.settings.plugins" == url_name %}class="active"{% endif %}>
<a href="{% url 'control:event.settings.plugins' organizer=request.event.organizer.slug event=request.event.slug %}">
{% trans "Plugins" %}
</a>
</li>
<li {% if "event.settings.display" == url_name %}class="active"{% endif %}>
<a href="{% url 'control:event.settings.display' organizer=request.event.organizer.slug event=request.event.slug %}">
{% trans "Display" %}
</a>
</li>
<li {% if "event.settings.tickets" == url_name %}class="active"{% endif %}>
<a href="{% url 'control:event.settings.tickets' organizer=request.event.organizer.slug event=request.event.slug %}">
{% trans "Tickets" %}
</a>
</li>
<li {% if "event.settings.mail" == url_name %}class="active"{% endif %}>
<a href="{% url 'control:event.settings.mail' organizer=request.event.organizer.slug event=request.event.slug %}">
{% trans "E-mail" %}
</a>
</li>
<li {% if "event.settings.tax" in url_name %}class="active"{% endif %}>
<a href="{% url 'control:event.settings.tax' organizer=request.event.organizer.slug event=request.event.slug %}">
{% trans "Tax rules" %}
</a>
</li>
<li {% if "event.settings.invoice" == url_name %}class="active"{% endif %}>
<a href="{% url 'control:event.settings.invoice' organizer=request.event.organizer.slug event=request.event.slug %}">
{% trans "Invoicing" %}
</a>
</li>
<li {% if "event.settings.permissions" == url_name %}class="active"{% endif %}>
<a href="{% url 'control:event.settings.permissions' organizer=request.event.organizer.slug event=request.event.slug %}">
{% trans "Permissions" %}
</a>
</li>
<li {% if "event.settings.widget" == url_name %}class="active"{% endif %}>
<a href="{% url 'control:event.settings.widget' organizer=request.event.organizer.slug event=request.event.slug %}">
{% trans "Widget" %}
</a>
</li>
{% endif %}
{% for nav in nav_event_settings %}
<li {% if nav.active %}class="active"{% endif %}>
<a href="{{ nav.url }}">
{{ nav.label }}
</a>
</li>
{% endfor %}
</ul>
{% block inside %} {% block inside %}
{% endblock %} {% endblock %}
{% endblock %} {% endblock %}

79
src/pretix/control/templates/pretixcontrol/event/tickets.html
View File

@@ -4,45 +4,50 @@
{% block inside %} {% block inside %}
<form action="" method="post" class="form-horizontal" enctype="multipart/form-data"> <form action="" method="post" class="form-horizontal" enctype="multipart/form-data">
{% csrf_token %} {% csrf_token %}
<fieldset> <fieldset class="panel panel-default">
<legend>{% trans "Ticket download" %}</legend> <div class="panel-heading">
{% if request.event.settings.ticket_download and not any_enabled %} <legend>{% trans "Ticket download" %}</legend>
<div class="alert alert-warning"> </div>
{% blocktrans trimmed %} <div class="panel-body">
You activated ticket downloads but no output provider is enabled. Be sure to enable a plugin and {% if request.event.settings.ticket_download and not any_enabled %}
activate an output provider. <div class="alert alert-warning">
{% endblocktrans %} {% blocktrans trimmed %}
</div> You activated ticket downloads but no output provider is enabled. Be sure to enable a plugin
{% endif %} and
{% bootstrap_form_errors form %} activate an output provider.
{% bootstrap_field form.ticket_download layout="control" %} {% endblocktrans %}
{% bootstrap_field form.ticket_download_date layout="control" %}
{% bootstrap_field form.ticket_download_addons layout="control" %}
{% bootstrap_field form.ticket_download_nonadm layout="control" %}
{% for provider in providers %}
<div class="panel panel-default ticketoutput-panel">
<div class="panel-heading">
<a href="{% url "control:event.settings.tickets.preview" event=request.event.slug organizer=request.organizer.slug output=provider.identifier %}"
class="btn btn-default btn-sm pull-right {% if not provider.preview_allowed %}disabled{% endif %}"
target="_blank">
{% trans "Preview" %}
</a>
<h3 class="panel-title">{{ provider.verbose_name }}</h3>
<div class="clear"></div>
</div> </div>
<div class="panel-body"> {% endif %}
{% bootstrap_form provider.form layout='horizontal' %} {% bootstrap_form_errors form %}
{% with c=provider.settings_content %} {% bootstrap_field form.ticket_download layout="control" %}
{% if c %}{{ c|safe }}{% endif %} {% bootstrap_field form.ticket_download_date layout="control" %}
{% endwith %} {% bootstrap_field form.ticket_download_addons layout="control" %}
</div> {% bootstrap_field form.ticket_download_nonadm layout="control" %}
</div> </div>
{% empty %}
<div class="alert alert-warning">
{% trans "There are no ticket outputs available. Please go to the plugin settings and activate one or more ticket output plugins." %}</em>
</div>
{% endfor %}
</fieldset> </fieldset>
{% for provider in providers %}
<div class="panel panel-default ticketoutput-panel">
<div class="panel-heading">
<a href="{% url "control:event.settings.tickets.preview" event=request.event.slug organizer=request.organizer.slug output=provider.identifier %}"
class="btn btn-default btn-sm pull-right {% if not provider.preview_allowed %}disabled{% endif %}"
target="_blank">
{% trans "Preview" %}
</a>
<h3 class="panel-title">{{ provider.verbose_name }}</h3>
<div class="clear"></div>
</div>
<div class="panel-body">
{% bootstrap_form provider.form layout='horizontal' %}
{% with c=provider.settings_content %}
{% if c %}{{ c|safe }}{% endif %}
{% endwith %}
</div>
</div>
{% empty %}
<div class="alert alert-warning">
{% trans "There are no ticket outputs available. Please go to the plugin settings and activate one or more ticket output plugins." %}</em>
</div>
{% endfor %}
<div class="form-group submit-group"> <div class="form-group submit-group">
<button type="submit" class="btn btn-primary btn-save"> <button type="submit" class="btn btn-primary btn-save">
{% trans "Save" %} {% trans "Save" %}

6
src/pretix/control/views/event.py
View File

@@ -46,7 +46,6 @@ from pretix.control.forms.event import (
TicketSettingsForm, WidgetCodeForm, TicketSettingsForm, WidgetCodeForm,
) )
from pretix.control.permissions import EventPermissionRequiredMixin from pretix.control.permissions import EventPermissionRequiredMixin
from pretix.control.signals import nav_event_settings
from pretix.helpers.urls import build_absolute_uri from pretix.helpers.urls import build_absolute_uri
from pretix.multidomain.urlreverse import get_domain from pretix.multidomain.urlreverse import get_domain
from pretix.plugins.stripe.payment import StripeSettingsHolder from pretix.plugins.stripe.payment import StripeSettingsHolder
@@ -59,12 +58,7 @@ from ..logdisplay import OVERVIEW_BLACKLIST
class EventSettingsViewMixin: class EventSettingsViewMixin:
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
ctx = super().get_context_data(**kwargs) ctx = super().get_context_data(**kwargs)
ctx['nav_event_settings'] = []
ctx['is_event_settings'] = True ctx['is_event_settings'] = True
for recv, retv in nav_event_settings.send(sender=self.request.event, request=self.request):
ctx['nav_event_settings'] += retv
ctx['nav_event_settings'].sort(key=lambda n: n['label'])
return ctx return ctx

33
src/pretix/static/pretixbase/scss/_theme.scss
View File

@@ -22,6 +22,14 @@
margin-top: 0; margin-top: 0;
} }
.panel-heading legend {
margin-top: 0;
margin-bottom: 0;
font-size: ceil(($font-size-base * 1.125));
border: 0;
color: inherit;
}
.btn { .btn {
border-width: 0px; border-width: 0px;
} }
@@ -90,13 +98,36 @@
color: #3b3b3b; color: #3b3b3b;
} }
.panel { .box-shadow-small {
box-shadow:0 2px 5px 0 rgba(78,50,92,.1),0 1px 1px 0 rgba(0,0,0,.07);
}
.box-shadow-medium {
box-shadow: 0 7px 14px 0 rgba(78, 50, 92, 0.1),0 3px 6px 0 rgba(0,0,0,.07); box-shadow: 0 7px 14px 0 rgba(78, 50, 92, 0.1),0 3px 6px 0 rgba(0,0,0,.07);
} }
.box-shadow-medium {
box-shadow: 0 15px 35px 0 rgba(78, 50, 92, 0.1),0 5px 15px 0 rgba(0,0,0,.07);
}
.panel {
box-shadow:0 2px 5px 0 rgba(78,50,92,.1),0 1px 1px 0 rgba(0,0,0,.07);
}
.panel-default > .panel-heading, .panel-default > .panel-footer { .panel-default > .panel-heading, .panel-default > .panel-footer {
background: white; background: white;
} }
.panel > table td:first-child,
.panel > .table-responsive table td:first-child,
.panel > table th:first-child,
.panel > .table-responsive table th:first-child {
padding-left: $panel-body-padding;
}
.panel > table td:last-child,
.panel > .table-responsive table td:last-child,
.panel > table th:last-child,
.panel > .table-responsive table th:last-child {
padding-right: $panel-body-padding;
}
.panel-danger > .panel-heading, .panel-success > .panel-heading, .panel-default > .panel-heading, .panel-info > .panel-heading, .panel-warning > .panel-heading { .panel-danger > .panel-heading, .panel-success > .panel-heading, .panel-default > .panel-heading, .panel-info > .panel-heading, .panel-warning > .panel-heading {
color: #000000; color: #000000;
} }

4
src/pretix/static/pretixcontrol/scss/_forms.scss
View File

@@ -55,9 +55,11 @@ div[data-formset-body], div[data-formset-form], div[data-nested-formset-form], d
} }
.submit-group { .submit-group {
background: white;
box-shadow:0 2px 5px 0 rgba(78,50,92,.1),0 1px 1px 0 rgba(0,0,0,.07);
border-radius: $panel-border-radius;
margin: 15px 0 0 0 !important; margin: 15px 0 0 0 !important;
padding: 15px; padding: 15px;
background: #eeeeee;
text-align: right; text-align: right;
.btn-save { .btn-save {
// btn-lg // btn-lg