Added multi-domain capabilities

This commit is contained in:
Raphael Michel
2015-10-16 21:06:12 +02:00
parent d7d6e74c04
commit 3fa0cfb077
38 changed files with 722 additions and 143 deletions

View File

@@ -1,6 +1,7 @@
{% load compress %}
{% load staticfiles %}
{% load i18n %}
{% load eventurl %}
<!DOCTYPE html>
<html>
<head>
@@ -22,7 +23,7 @@
<div class="container event">
<div class="page-header">
<h1 class="pull-left">
<a href="{% url "presale:event.index" event=event.slug organizer=event.organizer.slug %}">{{ event.name }}</a>
<a href="{% eventurl event "presale:event.index" %}">{{ event.name }}</a>
<small>{{ event.date_from|date:"DATE_FORMAT" }}{% if event.settings.show_date_to %} {{ event.date_to|date:"DATE_FORMAT" }}{% endif %}</small>
</h1>
<div class="pull-right loginbox">

View File

@@ -1,6 +1,7 @@
{% extends "pretixpresale/event/base.html" %}
{% load i18n %}
{% load bootstrap3 %}
{% load eventurl %}
{% block title %}{% trans "Confirm order" %}{% endblock %}
{% block content %}
<h2>{% trans "Confirm order" %}</h2>
@@ -11,7 +12,7 @@
<div class="panel-heading">
<div class="pull-right">
<a href="
{% url "presale:event.index" organizer=request.event.organizer.slug event=request.event.slug %}">
{% eventurl request.event "presale:event.index" %}">
<span class="fa fa-edit"></span>
{% trans "Modify" %}
</a>
@@ -41,7 +42,7 @@
<div class="panel-heading">
{% if payment_provider.identifier != "free" %}
<div class="pull-right">
<a href="{% url "presale:event.checkout" step="payment" organizer=request.event.organizer.slug event=request.event.slug %}">
<a href="{% eventurl request.event "presale:event.checkout" step="payment" %}">
<span class="fa fa-edit"></span>
{% trans "Modify" %}
</a>
@@ -59,7 +60,7 @@
<div class="panel panel-primary panel-contact">
<div class="panel-heading">
<div class="pull-right">
<a href="{% url "presale:event.checkout" step="questions" organizer=request.event.organizer.slug event=request.event.slug %}">
<a href="{% eventurl request.event "presale:event.checkout" step="questions" %}">
<span class="fa fa-edit"></span>
{% trans "Modify" %}
</a>

View File

@@ -1,4 +1,5 @@
{% load i18n %}
{% load eventurl %}
{% for line in cart.positions %}
<div class="row-fluid cart-row">
<div class="col-md-4 col-xs-6">
@@ -21,7 +22,7 @@
</div>
<div class="col-md-2 col-xs-6 count">
{% if editable %}
<form action="{% url "presale:event.cart.remove" event=event.slug organizer=event.organizer.slug %}"
<form action="{% eventurl event "presale:event.cart.remove" %}"
method="post">
{% csrf_token %}
{% if line.variation %}
@@ -36,7 +37,7 @@
{% endif %}
{{ line.count }}
{% if editable %}
<form action="{% url "presale:event.cart.add" event=event.slug organizer=event.organizer.slug %}"
<form action="{% eventurl event "presale:event.cart.add" %}"
method="post" data-asynctask>
{% csrf_token %}
{% if line.variation %}

View File

@@ -1,5 +1,6 @@
{% extends "pretixpresale/event/base.html" %}
{% load i18n %}
{% load eventurl %}
{% load thumbnail %}
{% block title %}{% trans "Presale" %}{% endblock %}
@@ -23,7 +24,7 @@
</div>
<div class="col-md-4 col-md-offset-2 col-xs-12">
<a class="btn btn-block btn-primary btn-lg"
href="{% url "presale:event.checkout.start" organizer=request.event.organizer.slug event=request.event.slug %}">
href="{% eventurl request.event "presale:event.checkout.start" %}">
<i class="fa fa-shopping-cart"></i> {% trans "Proceed with checkout" %}
</a>
</div>
@@ -51,7 +52,7 @@
{% endif %}
{% if event.presale_is_running or event.settings.show_items_outside_presale_period %}
<form method="post" data-asynctask
action="{% url "presale:event.cart.add" organizer=request.event.organizer.slug event=request.event.slug %}?next={{ request.path|urlencode }}">
action="{% eventurl request.event "presale:event.cart.add" %}?next={{ request.path|urlencode }}">
{% csrf_token %}
{% for tup in items_by_category %}
<section>

View File

@@ -1,6 +1,7 @@
{% extends "pretixpresale/event/base.html" %}
{% load i18n %}
{% load bootstrap3 %}
{% load eventurl %}
{% block title %}{% trans "Order details" %}{% endblock %}
{% block content %}
{% if "thanks" in request.GET or "paid" in request.GET %}
@@ -32,7 +33,7 @@
</div>
<div class="panel-body">
{% if can_retry %}
<a href="{% url "presale:event.order.pay" organizer=request.event.organizer.slug event=request.event.slug secret=order.secret order=order.code %}"
<a href="{% eventurl event "presale:event.order.pay" secret=order.secret order=order.code %}"
class="btn btn-primary pull-right"><i class="fa fa-money"></i> {% trans "Complete payment" %}
</a>
{% endif %}
@@ -59,7 +60,7 @@
{% endblocktrans %}
</p>
{% for b in download_buttons %}
<a href="{% url "presale:event.order.download" organizer=request.event.organizer.slug event=request.event.slug secret=order.secret order=order.code output=b.identifier %}"
<a href="{% eventurl event "presale:event.order.download" secret=order.secret order=order.code output=b.identifier %}"
class="btn btn-primary">
<span class="fa {{ b.icon }}"></span> {{ b.text }}
</a>
@@ -76,7 +77,7 @@
<div class="panel-heading">
{% if order.can_modify_answers %}
<div class="pull-right">
<a href="{% url "presale:event.order.modify" organizer=request.event.organizer.slug event=request.event.slug secret=order.secret order=order.code %}">
<a href="{% eventurl event "presale:event.order.modify" secret=order.secret order=order.code %}">
<span class="fa fa-edit"></span>
{% trans "Change details" %}
</a>
@@ -94,7 +95,7 @@
<div class="row">
<div class="col-md-12 text-right">
<p>
<a href="{% url 'presale:event.order.cancel' event=request.event.slug organizer=request.event.organizer.slug secret=order.secret order=order.code %}"
<a href="{% eventurl event 'presale:event.order.cancel' secret=order.secret order=order.code %}"
class="btn btn-danger">
<span class="fa fa-remove"></span>
{% trans "Cancel order" %}

View File

@@ -1,5 +1,6 @@
{% extends "pretixpresale/event/base.html" %}
{% load i18n %}
{% load eventurl %}
{% block title %}{% trans "Cancel order" %}{% endblock %}
{% block content %}
<h2>
@@ -16,7 +17,7 @@
<div class="row checkout-button-row">
<div class="col-md-4">
<a class="btn btn-block btn-default btn-lg"
href="{% url "presale:event.order" event=request.event.slug organizer=request.event.organizer.slug secret=order.secret order=order.code %}">
href="{% eventurl request.event "presale:event.order" secret=order.secret order=order.code %}">
{% trans "No, take me back" %}
</a>
</div>

View File

@@ -1,5 +1,6 @@
{% extends "pretixpresale/event/base.html" %}
{% load i18n %}
{% load eventurl %}
{% block title %}{% trans "Pay order" %}{% endblock %}
{% block content %}
<h2>
@@ -16,7 +17,7 @@
<div class="row checkout-button-row">
<div class="col-md-4">
<a class="btn btn-block btn-default btn-lg"
href="{% url "presale:event.order" event=request.event.slug organizer=request.event.organizer.slug secret=order.secret order=order.code %}">
href="{% eventurl request.event "presale:event.order" secret=order.secret order=order.code %}">
{% trans "Cancel" %}
</a>
</div>

View File

@@ -1,5 +1,6 @@
{% extends "pretixpresale/event/base.html" %}
{% load i18n %}
{% load eventurl %}
{% block title %}{% trans "Pay order" %}{% endblock %}
{% block content %}
<h2>
@@ -27,7 +28,7 @@
<div class="row checkout-button-row">
<div class="col-md-4">
<a class="btn btn-block btn-default btn-lg"
href="{% url "presale:event.order" event=request.event.slug organizer=request.event.organizer.slug secret=order.secret order=order.code %}">
href="{% eventurl request.event "presale:event.order" secret=order.secret order=order.code %}">
{% trans "Cancel" %}
</a>
</div>