diff --git a/.gitmodules b/.gitmodules index 3b8902a83..3e61b743c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule "src/tixlbase/static/bootstrap"] - path = src/tixlbase/static/bootstrap +[submodule "src/pretixbase/static/bootstrap"] + path = src/pretixbase/static/bootstrap url = https://github.com/twbs/bootstrap.git -[submodule "src/tixlbase/static/fontawesome"] - path = src/tixlbase/static/fontawesome +[submodule "src/pretixbase/static/fontawesome"] + path = src/pretixbase/static/fontawesome url = https://github.com/FortAwesome/Font-Awesome.git diff --git a/README.md b/README.md index 215065f31..8bea8f9e2 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -tixl -==== +pretix +====== -[![Docs](https://readthedocs.org/projects/tixl/badge/)](https://readthedocs.org/projects/tixl/) -[![Build Status](https://travis-ci.org/tixl/tixl.svg?branch=master)](https://travis-ci.org/tixl/tixl) -[![Coverage Status](https://img.shields.io/coveralls/tixl/tixl.svg)](https://coveralls.io/r/tixl/tixl) +[![Docs](https://readthedocs.org/projects/pretix/badge/)](https://readthedocs.org/projects/pretix/) +[![Build Status](https://travis-ci.org/pretix/pretix.svg?branch=master)](https://travis-ci.org/pretix/pretix) +[![Coverage Status](https://img.shields.io/coveralls/pretix/pretix.svg)](https://coveralls.io/r/pretix/pretix) Reinventing ticket presales, one bit at a time. diff --git a/doc/Makefile b/doc/Makefile index a7e6548d8..ce42bb172 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -85,17 +85,17 @@ qthelp: @echo @echo "Build finished; now you can run "qcollectiongenerator" with the" \ ".qhcp project file in $(BUILDDIR)/qthelp, like this:" - @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/tixl.qhcp" + @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/pretix.qhcp" @echo "To view the help file:" - @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/tixl.qhc" + @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/pretix.qhc" devhelp: $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp @echo @echo "Build finished." @echo "To view the help file:" - @echo "# mkdir -p $$HOME/.local/share/devhelp/tixl" - @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/tixl" + @echo "# mkdir -p $$HOME/.local/share/devhelp/pretix" + @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/pretix" @echo "# devhelp" epub: diff --git a/doc/conf.py b/doc/conf.py index c90f03bcf..1a90b3529 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- # -# tixl documentation build configuration file, created by +# pretix documentation build configuration file, created by # sphinx-quickstart on Mon Sep 8 15:13:08 2014. # # This file is execfile()d with the current directory set to its @@ -49,7 +49,7 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = 'tixl' +project = 'pretix' copyright = '2014, Raphael Michel' # The version info for the project you're documenting, acts as replacement for @@ -182,7 +182,7 @@ html_use_index = False #html_file_suffix = None # Output file base name for HTML help builder. -htmlhelp_basename = 'tixldoc' +htmlhelp_basename = 'pretixdoc' on_rtd = os.environ.get('READTHEDOCS', None) == 'True' if not on_rtd: # only import and set the theme if we're building docs locally @@ -208,7 +208,7 @@ latex_elements = { # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - ('index', 'tixl.tex', 'tixl Documentation', + ('index', 'pretix.tex', 'pretix Documentation', 'Raphael Michel', 'manual'), ] @@ -238,7 +238,7 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'tixl', 'tixl Documentation', + ('index', 'pretix', 'pretix Documentation', ['Raphael Michel'], 1) ] @@ -252,8 +252,8 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'tixl', 'tixl Documentation', - 'Raphael Michel', 'tixl', 'One line description of project.', + ('index', 'pretix', 'pretix Documentation', + 'Raphael Michel', 'pretix', 'One line description of project.', 'Miscellaneous'), ] diff --git a/doc/development/api/.restriction.rst.swo b/doc/development/api/.restriction.rst.swo index 06a209b2d..0e8db94ae 100644 Binary files a/doc/development/api/.restriction.rst.swo and b/doc/development/api/.restriction.rst.swo differ diff --git a/doc/development/api/plugins.rst b/doc/development/api/plugins.rst index 9fbe4faf8..8a734a817 100644 --- a/doc/development/api/plugins.rst +++ b/doc/development/api/plugins.rst @@ -4,18 +4,18 @@ Plugin basics ============= -It is possible to extend tixl with custom Python code using the official plugin +It is possible to extend pretix with custom Python code using the official plugin API. Every plugin has to be implemented as an independent Django 'app' living either in an own python package either installed like any python module or in -the ``tixlplugins/`` directory of your tixl installation. A plugin may only +the ``pretixplugins/`` directory of your pretix installation. A plugin may only require two steps to install: -* Add it to the ``INSTALLED_APPS`` setting of Django in ``tixl/settings.py`` +* Add it to the ``INSTALLED_APPS`` setting of Django in ``pretix/settings.py`` * Perform database migrations by using ``python manage.py migrate`` -The communication between tixl and the plugins happens via Django's -`signal dispatcher`_ pattern. The core modules of tixl, ``tixlbase``, -``tixlcontrol`` and ``tixlpresale`` expose a number of signals which are documented +The communication between pretix and the plugins happens via Django's +`signal dispatcher`_ pattern. The core modules of pretix, ``pretixbase``, +``pretixcontrol`` and ``pretixpresale`` expose a number of signals which are documented on the next pages. .. _`pluginsetup`: @@ -23,15 +23,15 @@ on the next pages. Creating a plugin ----------------- -To create a new plugin, create a new python package as a subpackage to ``tixlplugins``. -In order to do so, you can place your module into tixl's :file:`tixlplugins` folder *or -anywhere else in your python import path* inside a folder called ``tixlplugins``. +To create a new plugin, create a new python package as a subpackage to ``pretixplugins``. +In order to do so, you can place your module into pretix's :file:`pretixplugins` folder *or +anywhere else in your python import path* inside a folder called ``pretixplugins``. .. IMPORTANT:: This makes use of a design pattern called `namespace packages`_ which is only implicitly available as of Python 3.4. As we aim to support Python 3.2 for a bit - longer, you **MUST** put **EXACLTY** the following content into ``tixlplugins/__init__.py`` - if you create a new ``tixlplugins`` folder somewhere in your path:: + longer, you **MUST** put **EXACLTY** the following content into ``pretixplugins/__init__.py`` + if you create a new ``pretixplugins`` folder somewhere in your path:: from pkgutil import extend_path __path__ = extend_path(__path__, __name__) @@ -48,17 +48,17 @@ example, taken from the time restriction module (see next chapter) as a template from django.apps import AppConfig from django.utils.translation import ugettext_lazy as _ - from tixlbase.plugins import PluginType + from pretixbase.plugins import PluginType class TimeRestrictionApp(AppConfig): - name = 'tixlplugins.timerestriction' + name = 'pretixplugins.timerestriction' verbose_name = _("Time restriction") class TixlPluginMeta: type = PluginType.RESTRICTION name = _("Restriciton by time") - author = _("the tixl team") + author = _("the pretix team") version = '1.0.0' description = _("This plugin adds the possibility to restrict the sale " + "of a given item or variation to a certain timeframe " + @@ -67,7 +67,7 @@ example, taken from the time restriction module (see next chapter) as a template def ready(self): from . import signals # NOQA - default_app_config = 'tixlplugins.timerestriction.TimeRestrictionApp' + default_app_config = 'pretixplugins.timerestriction.TimeRestrictionApp' .. IMPORTANT:: You have to implement a ``TixlPluginMeta`` class like in the example to make your diff --git a/doc/development/api/restriction.rst b/doc/development/api/restriction.rst index 6155c01a1..46bb287b7 100644 --- a/doc/development/api/restriction.rst +++ b/doc/development/api/restriction.rst @@ -4,7 +4,7 @@ Writing a restriction plugin ============================ -Please make sure you have read and understood the :ref:`basic idea being tixl's restrictions +Please make sure you have read and understood the :ref:`basic idea being pretix's restrictions `. In this document, we will walk through the creation of a restriction plugin using the example of a restriction by date and time. @@ -15,14 +15,14 @@ The restriction model It is very likely that your new restriction plugin needs to store data. In order to do so, it should define its own model with a name related to what your restriction does, -e.g. ``TimeRestriction``. This model should be a child class of ``tixlbase.models.BaseRestriction``. +e.g. ``TimeRestriction``. This model should be a child class of ``pretixbase.models.BaseRestriction``. You do not need to define custom fields, but you should create at least an empty model. -In our example, we put the following into :file:`tixlplugins/timerestriction/models.py`:: +In our example, we put the following into :file:`pretixplugins/timerestriction/models.py`:: from django.db import models from django.utils.translation import ugettext_lazy as _ - from tixlbase.models import BaseRestriction + from pretixbase.models import BaseRestriction class TimeRestriction(BaseRestriction): @@ -52,14 +52,14 @@ Availability determination ^^^^^^^^^^^^^^^^^^^^^^^^^^ This is the one signal *every* restriction plugin has to listen for, as your plugin does not -restrict anything without doing so. It is available as ``tixlbase.signals.determine_availability`` -and is sent out every time some component of tixl wants to know whether a specific item or +restrict anything without doing so. It is available as ``pretixbase.signals.determine_availability`` +and is sent out every time some component of pretix wants to know whether a specific item or variation is available for sell. It is sent out with several keyword arguments: ``item`` - The instance of ``tixlbase.models.Item`` in question. + The instance of ``pretixbase.models.Item`` in question. ``variations`` A list of dictionaries in the same format as ``Item.get_all_variations``: The list contains one dictionary per variation, where the ``Property`` IDs are @@ -68,7 +68,7 @@ It is sent out with several keyword arguments: the item does not have any properties, the list will contain exactly one empty dictionary. Please note: this is *not* the list of all possible variations, this is only the list of all variations the frontend likes to determine the status for. - Technically, you won't get ``dict`` objects but ``tixlbase.types.VariationDict`` + Technically, you won't get ``dict`` objects but ``pretixbase.types.VariationDict`` objects, which behave exactly the same but add some extra methods. ``context`` A yet-to-be-defined context object containing information about the user and the order @@ -103,7 +103,7 @@ In our example, the implementation could look like this:: from django.dispatch import receiver from django.utils.timezone import now - from tixlbase.signals import determine_availability + from pretixbase.signals import determine_availability from .models import TimeRestriction @@ -217,12 +217,12 @@ Control interface formsets To make it possible for the event organizer to configure your restriction, there is a 'Restrictions' page in the item configuration. This page is able to show a formset for each restriction plugin, but *you* are required to create this formset. This is why you -should listen to the the ``tixlcontrol.signals.restriction_formset`` signal. +should listen to the the ``pretixcontrol.signals.restriction_formset`` signal. Currently, the signal comes with only one keyword argument: ``item`` - The instance of ``tixlbase.models.Item`` we want a formset for. + The instance of ``pretixbase.models.Item`` we want a formset for. You are expected to return a dict containing the following items: @@ -245,9 +245,9 @@ Our time restriction example looks like this:: from django.dispatch import receiver from django.forms.models import inlineformset_factory - from tixlcontrol.signals import restriction_formset - from tixlbase.models import Item - from tixlcontrol.views.forms import ( + from pretixcontrol.signals import restriction_formset + from pretixbase.models import Item + from pretixcontrol.views.forms import ( VariationsField, RestrictionInlineFormset, RestrictionForm ) diff --git a/doc/development/concepts.rst b/doc/development/concepts.rst index 364c3060e..6b05199eb 100644 --- a/doc/development/concepts.rst +++ b/doc/development/concepts.rst @@ -7,18 +7,18 @@ Basic terminology The components ^^^^^^^^^^^^^^ -The project tixl is split into several components. The main three of them are: +The project pretix is split into several components. The main three of them are: -**tixlbase** +**pretixbase** Tixlbase is the foundation below all other components. It is primarily responsible for the data structures and database communication. It also hosts several utilities which are used by multiple other components. -**tixlcontrol** +**pretixcontrol** Tixlcontrol is the web-based backend software which allows organizers to create and manage their events, items, orders and tickets. -**tixlpresale** +**pretixpresale** Tixlpresale is the ticket-shop itself, containing all the parts visible to the end user. @@ -29,7 +29,7 @@ Tixl is all about **events**, which are defined as something happening somewhere Every Event is managed by the **organizer**, an abstract entity running the event. Tixl is used by **users**. We want to enable global users who can just login into -tixl and buy tickets for as many events as they like but at the same time it +pretix and buy tickets for as many events as they like but at the same time it should be possible to create some kind of local user to have a temporary account just to buy tickets for one single event. @@ -46,7 +46,7 @@ as our primary key: **Local users** Local users do only exist inside the scope of one event. They are identified by usernames, which are only valid for exactly one event. Internally, their identifier - is "{username}@{event.id}.event.tixl" + is "{username}@{event.id}.event.pretix" **Global users** Global users exist everywhere in the installation of Tixl. They can buy tickets @@ -57,7 +57,7 @@ as our primary key: Items and variations ^^^^^^^^^^^^^^^^^^^^ -The purpose of tixl is to sell **items** (which belong to **events**) to **users**. +The purpose of pretix is to sell **items** (which belong to **events**) to **users**. An **item** is a abstract thing, popular examples being event tickets or a piece of merchandise, like 'T-Shirt'. An **item** can have multiple **properties** with multiple **values** each. For example, the **item** 'T-Shirt' could have the **property** 'Size' @@ -79,7 +79,7 @@ include 'Name' or 'age'. Restrictions ^^^^^^^^^^^^ -The probably most powerful concepts of tixl is the very abstract concept of **restricitons**. +The probably most powerful concepts of pretix is the very abstract concept of **restricitons**. We already know that **items** can come in very different **variations**, but a **restriction** decides whether an variation is available for sale and assign **prices** to **variations**. There are **restriction types** (pieces of code implementing the @@ -115,7 +115,7 @@ Any number of **restrictions** can be applied to the whole of a **item** or even sense otherwise on an one-dimensional time axis). * If multiple restrictions apply which set the price, the *cheapest* price determines the final price. -Restrictions can be implemented using a plugin system and do not require changes to the tixl codebase. +Restrictions can be implemented using a plugin system and do not require changes to the pretix codebase. Restriction by number """"""""""""""""""""" diff --git a/doc/development/goals.rst b/doc/development/goals.rst index 92d60f0a3..8d441ff10 100644 --- a/doc/development/goals.rst +++ b/doc/development/goals.rst @@ -17,7 +17,7 @@ Technical goals Feature goals ------------- -* One tixl software installation has to cope with multiple events by multiple organizers +* One pretix software installation has to cope with multiple events by multiple organizers * There is no code access necessary to create a new event * Tixl is abstract in many ways to adopt to as much events as possible. diff --git a/doc/development/setup.rst b/doc/development/setup.rst index a26ba3c72..cab44254e 100644 --- a/doc/development/setup.rst +++ b/doc/development/setup.rst @@ -5,8 +5,8 @@ Obtain a copy of the source code -------------------------------- Just clone our git repository including its submodules:: - git clone --recursive https://github.com/tixl/tixl.git - cd tixl/ + git clone --recursive https://github.com/pretix/pretix.git + cd pretix/ External Dependencies --------------------- @@ -27,7 +27,7 @@ environment and activate it for your current session:: source env/bin/activate You should now see a ``(env)`` prepended to your shell prompt. You have to do this -in every shell you use to work with tixl (or configure your shell to do so +in every shell you use to work with pretix (or configure your shell to do so automatically). Working with the code @@ -48,7 +48,7 @@ source code for strings to be translated and update the ``*.po`` files according make localegen -To actually see tixl in your language, you have to compile the ``*.po`` files to their +To actually see pretix in your language, you have to compile the ``*.po`` files to their optimized binary ``*.mo`` counterparts:: make localecompile diff --git a/doc/development/structure.rst b/doc/development/structure.rst index 7a7e06b78..1cd0aea85 100644 --- a/doc/development/structure.rst +++ b/doc/development/structure.rst @@ -6,17 +6,17 @@ Python source code All the source code lives in ``src/``, which has several subdirectories. -tixl/ +pretix/ This directory contains the basic Django settings and URL routing. -tixlbase/ +pretixbase/ This is the django app containing all the models and methods which are - essential to all of tixl's features. + essential to all of pretix's features. -tixlcontrol/ +pretixcontrol/ This is the django app containing the frontend for organizers. -tixlpresale/ +pretixpresale/ This is the django app containing the frontend for users buying tickets. helpers/ @@ -37,24 +37,24 @@ LESS source code We use less as a preprocessor for CSS. Our own less code is built in the same step as Bootstrap and FontAwesome, so their mixins etc. are fully available. -tixlcontrol - tixlcontrol has two main LESS files, ``tixlcontrol/static/tixlcontrol/less/main.less`` and - ``tixlcontrol/static/tixlcontrol/less/auth.less``, importing everything else. +pretixcontrol + pretixcontrol has two main LESS files, ``pretixcontrol/static/pretixcontrol/less/main.less`` and + ``pretixcontrol/static/pretixcontrol/less/auth.less``, importing everything else. 3rd-party assets ^^^^^^^^^^^^^^^^ Bootstrap - Bootstrap lives as a git submodule at ``tixlbase/static/bootstrap/`` + Bootstrap lives as a git submodule at ``pretixbase/static/bootstrap/`` Font Awesome - Font Awesome lives as a git submodule at ``tixlbase/static/fontawesome/`` + Font Awesome lives as a git submodule at ``pretixbase/static/fontawesome/`` jQuery - jQuery lives as a single JavaScript file in ``tixlbase/static/jquery/js/`` + jQuery lives as a single JavaScript file in ``pretixbase/static/jquery/js/`` jQuery plugin: Django formsets Our own modified version of `django-formset-js`_ is available as an independent django app and installed via pip. -.. _django-formset-js: https://github.com/tixl/django-formset-js +.. _django-formset-js: https://github.com/pretix/django-formset-js diff --git a/doc/index.rst b/doc/index.rst index 45962af1c..387b86ee8 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -1,9 +1,9 @@ -.. tixl documentation master file, created by +.. pretix documentation master file, created by sphinx-quickstart on Mon Sep 8 15:13:08 2014. You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. -Welcome to tixl's documentation! +Welcome to pretix's documentation! ================================ Contents: diff --git a/doc/make.bat b/doc/make.bat index 005e8d94f..ff882d3e2 100644 --- a/doc/make.bat +++ b/doc/make.bat @@ -115,9 +115,9 @@ if "%1" == "qthelp" ( echo. echo.Build finished; now you can run "qcollectiongenerator" with the ^ .qhcp project file in %BUILDDIR%/qthelp, like this: - echo.^> qcollectiongenerator %BUILDDIR%\qthelp\tixl.qhcp + echo.^> qcollectiongenerator %BUILDDIR%\qthelp\pretix.qhcp echo.To view the help file: - echo.^> assistant -collectionFile %BUILDDIR%\qthelp\tixl.ghc + echo.^> assistant -collectionFile %BUILDDIR%\qthelp\pretix.ghc goto end ) diff --git a/src/.coveragerc b/src/.coveragerc index 555a84e1d..5a5fdfd7e 100644 --- a/src/.coveragerc +++ b/src/.coveragerc @@ -1,5 +1,5 @@ [run] -source = tixlbase,tixlcontrol,tixlpresale,tixlplugins +source = pretixbase,pretixcontrol,pretixpresale,pretixplugins omit = */migrations/*,*/urls.py,*/tests/* [report] diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po index c7fc0aa01..b2314bf9d 100644 --- a/src/locale/de/LC_MESSAGES/django.po +++ b/src/locale/de/LC_MESSAGES/django.po @@ -1,6 +1,6 @@ -# tixl translation file German -# Copyright (C) 2014 the tixl authors -# This file is distributed under the same license as the tixl package. +# pretix translation file German +# Copyright (C) 2014 the pretix authors +# This file is distributed under the same license as the pretix package. # Raphael Michel , 2014. # msgid "" @@ -18,121 +18,121 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.6.9\n" -#: tixl/settings.py:110 +#: pretix/settings.py:110 msgid "German" msgstr "Deutsch" -#: tixl/settings.py:111 +#: pretix/settings.py:111 msgid "English" msgstr "Englisch" -#: tixlbase/admin.py:19 +#: pretixbase/admin.py:19 msgid "The two password fields didn't match." msgstr "Die beiden eingegebenen Passwörter stimmen nicht überein." -#: tixlbase/admin.py:21 tixlcontrol/views/auth.py:16 +#: pretixbase/admin.py:21 pretixcontrol/views/auth.py:16 msgid "Password" msgstr "Passwort" -#: tixlbase/admin.py:23 +#: pretixbase/admin.py:23 msgid "Password confirmation" msgstr "Passwort bestätigen" -#: tixlbase/admin.py:25 +#: pretixbase/admin.py:25 msgid "Enter the same password as above, for verification." msgstr "Geben Sie zur Bestätigung das selbe Passwort wie oben ein" -#: tixlbase/admin.py:53 +#: pretixbase/admin.py:53 msgid "Personal info" msgstr "Persönliche Daten" -#: tixlbase/admin.py:54 +#: pretixbase/admin.py:54 msgid "Locale" msgstr "Sprache" -#: tixlbase/admin.py:55 +#: pretixbase/admin.py:55 msgid "Permissions" msgstr "Berechtigungen" -#: tixlbase/models.py:75 +#: pretixbase/models.py:75 msgid "Letters, digits and @/./+/-/_ only." msgstr "Nur Buchstaben, Zahlen und @/./+/-/_" -#: tixlbase/models.py:81 +#: pretixbase/models.py:81 msgid "E-mail" msgstr "E-Mail" -#: tixlbase/models.py:84 +#: pretixbase/models.py:84 msgid "Given name" msgstr "Vorname" -#: tixlbase/models.py:87 +#: pretixbase/models.py:87 msgid "Family name" msgstr "Nachname" -#: tixlbase/models.py:89 +#: pretixbase/models.py:89 msgid "Is active" msgstr "Ist aktiviert" -#: tixlbase/models.py:91 +#: pretixbase/models.py:91 msgid "Is site admin" msgstr "Ist Systemadministrator" -#: tixlbase/models.py:93 +#: pretixbase/models.py:93 msgid "Date joined" msgstr "Registrierungsdatum" -#: tixlbase/models.py:97 +#: pretixbase/models.py:97 msgid "Language" msgstr "Sprache" -#: tixlbase/models.py:100 +#: pretixbase/models.py:100 msgid "Timezone" msgstr "Zeitzone" -#: tixlbase/models.py:105 tixlbase/models.py:817 tixlbase/models.py:903 +#: pretixbase/models.py:105 pretixbase/models.py:817 pretixbase/models.py:903 msgid "User" msgstr "Benutzer" -#: tixlbase/models.py:106 +#: pretixbase/models.py:106 msgid "Users" msgstr "Benutzer" -#: tixlbase/models.py:152 tixlbase/models.py:222 tixlbase/models.py:755 +#: pretixbase/models.py:152 pretixbase/models.py:222 pretixbase/models.py:755 msgid "Name" msgstr "Name" -#: tixlbase/models.py:155 tixlbase/models.py:234 +#: pretixbase/models.py:155 pretixbase/models.py:234 msgid "Slug" msgstr "Kurzform" -#: tixlbase/models.py:160 -#: tixlcontrol/templates/tixlcontrol/events/index.html:11 +#: pretixbase/models.py:160 +#: pretixcontrol/templates/pretixcontrol/events/index.html:11 msgid "Organizer" msgstr "Veranstalter" -#: tixlbase/models.py:161 +#: pretixbase/models.py:161 msgid "Organizers" msgstr "Veranstalter" -#: tixlbase/models.py:178 +#: pretixbase/models.py:178 msgid "Can create events" msgstr "Kann Veranstaltungen erstellen" -#: tixlbase/models.py:182 +#: pretixbase/models.py:182 msgid "Organizer permission" msgstr "Veranstalter-Berechtigung" -#: tixlbase/models.py:183 +#: pretixbase/models.py:183 msgid "Organizer permissions" msgstr "Veranstalter-Berechtigungen" -#: tixlbase/models.py:187 tixlbase/models.py:345 +#: pretixbase/models.py:187 pretixbase/models.py:345 #, python-format msgid "%(name)s on %(object)s" msgstr "%(name)s für %(object)s" -#: tixlbase/models.py:226 +#: pretixbase/models.py:226 msgid "" "Should be short, only contain lowercase letters and numbers, and must be " "unique among your events. This is being used in addresses and bank transfer " @@ -142,46 +142,46 @@ msgstr "" "unter Ihren Veranstaltungen einmalig sein. Wird in URLs und " "Verwendungszwecken für Banküberweisungen benutzt." -#: tixlbase/models.py:231 +#: pretixbase/models.py:231 msgid "The slug may only contain letters, numbers, dots and dashes." msgstr "" "Der Kurzname darf nur Buchstaben, Zahlen, Punkte und Bindestriche enthalten" -#: tixlbase/models.py:240 +#: pretixbase/models.py:240 msgid "Default locale" msgstr "Standardsprache" -#: tixlbase/models.py:243 tixlcontrol/views/event.py:19 +#: pretixbase/models.py:243 pretixcontrol/views/event.py:19 msgid "Default timezone" msgstr "Standardzeitzone" -#: tixlbase/models.py:245 +#: pretixbase/models.py:245 msgid "Default currency" msgstr "Standardwährung" -#: tixlbase/models.py:246 +#: pretixbase/models.py:246 msgid "Event start time" msgstr "Veranstaltungsbeginn" -#: tixlbase/models.py:248 +#: pretixbase/models.py:248 msgid "Event end time" msgstr "Veranstaltungsende" -#: tixlbase/models.py:251 +#: pretixbase/models.py:251 msgid "Show event end date" msgstr "Zeige Veranstaltungsende" -#: tixlbase/models.py:252 +#: pretixbase/models.py:252 msgid "If disabled, only event's start date will be displayed to the public." msgstr "" "Wenn diese Einstellung deaktiviert ist, wird nur der Beginn der " "Veranstaltung öffentlich angezeigt." -#: tixlbase/models.py:256 +#: pretixbase/models.py:256 msgid "Show dates with time" msgstr "Zeige Uhrzeiten" -#: tixlbase/models.py:257 +#: pretixbase/models.py:257 msgid "" "If disabled, the event's start and end date will be displayed without the " "time of day." @@ -189,37 +189,37 @@ msgstr "" "Wenn diese Einstellung deaktiviert ist, werden Veranstaltungsbeginn und -" "ende ohne Uhrzeit angezeigt" -#: tixlbase/models.py:261 +#: pretixbase/models.py:261 msgid "End of presale" msgstr "Ende des Vorverkaufs" -#: tixlbase/models.py:262 +#: pretixbase/models.py:262 msgid "No items will be sold after this date." msgstr "Es werden nach diesem Termin keine Produkte mehr verkauft." -#: tixlbase/models.py:266 +#: pretixbase/models.py:266 msgid "Start of presale" msgstr "Beginn des Vorverkaufs" -#: tixlbase/models.py:267 +#: pretixbase/models.py:267 msgid "No items will be sold before this date." msgstr "Es werden vor diesem Termin keine Produkte verkauft." -#: tixlbase/models.py:271 +#: pretixbase/models.py:271 msgid "Payment term in days" msgstr "Zahlungsziel in Tagen" -#: tixlbase/models.py:272 +#: pretixbase/models.py:272 msgid "" "The number of days after placing an order the user has to pay to preserve " "his reservation." msgstr "Die Anzahl an Tagen die ein Käufer zum Bezahlen seiner Bestellung hat." -#: tixlbase/models.py:276 +#: pretixbase/models.py:276 msgid "Last date of payments" msgstr "Datum des letzten möglichen Zahlungseingangs" -#: tixlbase/models.py:277 +#: pretixbase/models.py:277 msgid "" "The last date any payments are accepted. This has precedence over the number " "of days configured above." @@ -227,161 +227,160 @@ msgstr "" "Das Datum, bis zu dem Zahlungseingänge akzeptiert werden. Diese Einstellung " "hat Vorrang über der oben eingestellten Anzahl an Tagen" -#: tixlbase/models.py:281 -#: tixlcontrol/templates/tixlcontrol/event/settings_base.html:9 +#: pretixbase/models.py:281 +#: pretixcontrol/templates/pretixcontrol/event/settings_base.html:9 msgid "Plugins" -#: tixlbase/models.py:285 tixlbase/models.py:506 tixlbase/models.py:678 msgstr "Erweiterungen" -#: tixlbase/models.py:285 tixlbase/models.py:506 tixlbase/models.py:708 +#: pretixbase/models.py:285 pretixbase/models.py:506 pretixbase/models.py:708 msgid "Event" msgstr "Veranstaltung" -#: tixlbase/models.py:286 tixlcontrol/templates/tixlcontrol/base.html:34 -#: tixlcontrol/templates/tixlcontrol/events/index.html:3 -#: tixlcontrol/templates/tixlcontrol/events/index.html:5 +#: pretixbase/models.py:286 pretixcontrol/templates/pretixcontrol/base.html:34 +#: pretixcontrol/templates/pretixcontrol/events/index.html:3 +#: pretixcontrol/templates/pretixcontrol/events/index.html:5 msgid "Events" msgstr "Veranstaltungen" -#: tixlbase/models.py:332 +#: pretixbase/models.py:332 msgid "Can change event settings" msgstr "Kann Veranstaltungseinstellungen ändern" -#: tixlbase/models.py:336 +#: pretixbase/models.py:336 msgid "Can change item settings" msgstr "Kann Produkte ändern" -#: tixlbase/models.py:340 +#: pretixbase/models.py:340 msgid "Event permission" msgstr "Veranstaltungs-Berechtigung" -#: tixlbase/models.py:341 +#: pretixbase/models.py:341 msgid "Event permissions" msgstr "Veranstaltungs-Berechtigungen" -#: tixlbase/models.py:362 +#: pretixbase/models.py:362 msgid "Category name" msgstr "Bezeichnung" -#: tixlbase/models.py:369 -#: tixlcontrol/templates/tixlcontrol/items/category.html:4 -#: tixlcontrol/templates/tixlcontrol/items/category.html:6 +#: pretixbase/models.py:369 +#: pretixcontrol/templates/pretixcontrol/items/category.html:4 +#: pretixcontrol/templates/pretixcontrol/items/category.html:6 msgid "Item category" msgstr "Produktkategorie" -#: tixlbase/models.py:370 -#: tixlcontrol/templates/tixlcontrol/items/categories.html:3 -#: tixlcontrol/templates/tixlcontrol/items/categories.html:5 -#: tixlcontrol/templates/tixlcontrol/items/categories.html:25 +#: pretixbase/models.py:370 +#: pretixcontrol/templates/pretixcontrol/items/categories.html:3 +#: pretixcontrol/templates/pretixcontrol/items/categories.html:5 +#: pretixcontrol/templates/pretixcontrol/items/categories.html:25 msgid "Item categories" msgstr "Produktkategorien" -#: tixlbase/models.py:395 +#: pretixbase/models.py:395 msgid "Property name" msgstr "Bezeichnung" -#: tixlbase/models.py:399 -#: tixlcontrol/templates/tixlcontrol/items/property.html:5 -#: tixlcontrol/templates/tixlcontrol/items/property.html:7 +#: pretixbase/models.py:399 +#: pretixcontrol/templates/pretixcontrol/items/property.html:5 +#: pretixcontrol/templates/pretixcontrol/items/property.html:7 msgid "Item property" msgstr "Eigenschaft" -#: tixlbase/models.py:400 -#: tixlcontrol/templates/tixlcontrol/items/properties.html:3 -#: tixlcontrol/templates/tixlcontrol/items/properties.html:5 -#: tixlcontrol/templates/tixlcontrol/items/properties.html:25 +#: pretixbase/models.py:400 +#: pretixcontrol/templates/pretixcontrol/items/properties.html:3 +#: pretixcontrol/templates/pretixcontrol/items/properties.html:5 +#: pretixcontrol/templates/pretixcontrol/items/properties.html:25 msgid "Item properties" msgstr "Eigenschaften" -#: tixlbase/models.py:424 +#: pretixbase/models.py:424 msgid "Value" msgstr "Wert" -#: tixlbase/models.py:431 +#: pretixbase/models.py:431 msgid "Property value" msgstr "Wert" -#: tixlbase/models.py:432 +#: pretixbase/models.py:432 msgid "Property values" msgstr "Werte" -#: tixlbase/models.py:454 +#: pretixbase/models.py:454 msgid "Number" msgstr "Zahl" -#: tixlbase/models.py:455 +#: pretixbase/models.py:455 msgid "Text (one line)" msgstr "Text (einzeilig)" -#: tixlbase/models.py:456 +#: pretixbase/models.py:456 msgid "Multiline text" msgstr "Text (mehrzeilig)" -#: tixlbase/models.py:457 +#: pretixbase/models.py:457 msgid "Yes/No" msgstr "Ja/Nein" -#: tixlbase/models.py:465 tixlbase/models.py:478 -#: tixlcontrol/templates/tixlcontrol/items/question.html:4 -#: tixlcontrol/templates/tixlcontrol/items/question.html:6 -#: tixlcontrol/templates/tixlcontrol/items/questions.html:25 +#: pretixbase/models.py:465 pretixbase/models.py:478 +#: pretixcontrol/templates/pretixcontrol/items/question.html:4 +#: pretixcontrol/templates/pretixcontrol/items/question.html:6 +#: pretixcontrol/templates/pretixcontrol/items/questions.html:25 msgid "Question" msgstr "Frage" -#: tixlbase/models.py:470 +#: pretixbase/models.py:470 msgid "Question type" msgstr "Art der Antwort" -#: tixlbase/models.py:474 +#: pretixbase/models.py:474 msgid "Required question" msgstr "Antwort erforderlich" -#: tixlbase/models.py:479 tixlbase/models.py:557 -#: tixlcontrol/templates/tixlcontrol/items/base.html:9 -#: tixlcontrol/templates/tixlcontrol/items/questions.html:3 -#: tixlcontrol/templates/tixlcontrol/items/questions.html:5 +#: pretixbase/models.py:479 pretixbase/models.py:557 +#: pretixcontrol/templates/pretixcontrol/items/base.html:9 +#: pretixcontrol/templates/pretixcontrol/items/questions.html:3 +#: pretixcontrol/templates/pretixcontrol/items/questions.html:5 msgid "Questions" msgstr "Fragen" -#: tixlbase/models.py:513 -#: tixlcontrol/templates/tixlcontrol/items/index.html:10 +#: pretixbase/models.py:513 +#: pretixcontrol/templates/pretixcontrol/items/index.html:10 msgid "Category" msgstr "Kategorie" -#: tixlbase/models.py:517 tixlcontrol/templates/tixlcontrol/items/index.html:9 +#: pretixbase/models.py:517 pretixcontrol/templates/pretixcontrol/items/index.html:9 msgid "Item name" msgstr "Produktbezeichnung" -#: tixlbase/models.py:521 tixlbase/models.py:650 -#: tixlcontrol/templates/tixlcontrol/item/variations_1d.html:12 +#: pretixbase/models.py:521 pretixbase/models.py:650 +#: pretixcontrol/templates/pretixcontrol/item/variations_1d.html:12 msgid "Active" msgstr "aktiviert" -#: tixlbase/models.py:525 +#: pretixbase/models.py:525 msgid "Short description" msgstr "Kurze Beschreibung" -#: tixlbase/models.py:526 +#: pretixbase/models.py:526 msgid "This is shown below the item name in lists." msgstr "Wird in Listen unter dem Name angezeigt." -#: tixlbase/models.py:530 +#: pretixbase/models.py:530 msgid "Long description" msgstr "Lange Beschreibung" -#: tixlbase/models.py:535 tixlbase/models.py:655 +#: pretixbase/models.py:535 pretixbase/models.py:655 msgid "Default price" msgstr "Basispreis" -#: tixlbase/models.py:540 +#: pretixbase/models.py:540 msgid "Taxes included in percent" msgstr "Steuern inklusive in Prozent" -#: tixlbase/models.py:546 tixlcontrol/templates/tixlcontrol/items/base.html:8 +#: pretixbase/models.py:546 pretixcontrol/templates/pretixcontrol/items/base.html:8 msgid "Properties" msgstr "Eigenschaften" -#: tixlbase/models.py:549 +#: pretixbase/models.py:549 msgid "" "The selected properties will be available for the user to select. After " "saving this field, move to the 'Variations' tab to configure the details." @@ -389,134 +388,134 @@ msgstr "" "Die hier ausgewählten Eigenschaften stehen für dieses Produkt zur Verfügung. " "Nach der Auswahl können Sie im Tab 'Varianten' die Details konfigurieren:" -#: tixlbase/models.py:560 +#: pretixbase/models.py:560 msgid "The user will be asked to fill in answers for the selected questions" msgstr "" "Der Käuft wird beim Kauf gebeten, die ausgewählten Fragen zu beantworten" -#: tixlbase/models.py:566 tixlbase/models.py:713 tixlbase/models.py:762 +#: pretixbase/models.py:566 pretixbase/models.py:713 pretixbase/models.py:762 msgid "Item" msgstr "Produkt" -#: tixlbase/models.py:567 tixlcontrol/templates/tixlcontrol/event/base.html:20 -#: tixlcontrol/templates/tixlcontrol/items/base.html:3 -#: tixlcontrol/templates/tixlcontrol/items/base.html:6 -#: tixlcontrol/templates/tixlcontrol/items/index.html:3 -#: tixlcontrol/templates/tixlcontrol/items/index.html:5 +#: pretixbase/models.py:567 pretixcontrol/templates/pretixcontrol/event/base.html:20 +#: pretixcontrol/templates/pretixcontrol/items/base.html:3 +#: pretixcontrol/templates/pretixcontrol/items/base.html:6 +#: pretixcontrol/templates/pretixcontrol/items/index.html:3 +#: pretixcontrol/templates/pretixcontrol/items/index.html:5 msgid "Items" msgstr "Produkte" -#: tixlbase/models.py:659 +#: pretixbase/models.py:659 msgid "Item variation" msgstr "Variante" -#: tixlbase/models.py:660 +#: pretixbase/models.py:660 msgid "Item variations" msgstr "Varianten" -#: tixlbase/models.py:691 +#: pretixbase/models.py:691 msgid "Restriction" msgstr "Beschränkung" -#: tixlbase/models.py:692 +#: pretixbase/models.py:692 msgid "Restrictions" msgstr "Beschränkungen" -#: tixlbase/models.py:758 +#: pretixbase/models.py:758 msgid "Total capacity" msgstr "Gesamtanzahl" -#: tixlbase/models.py:780 +#: pretixbase/models.py:780 msgid "Quota" msgstr "Kontingent" -#: tixlbase/models.py:781 +#: pretixbase/models.py:781 msgid "Quotas" msgstr "Kontingente" -#: tixlbase/models.py:800 +#: pretixbase/models.py:800 msgid "pending" msgstr "ausstehend" -#: tixlbase/models.py:801 +#: pretixbase/models.py:801 msgid "paid" msgstr "bezahlt" -#: tixlbase/models.py:802 +#: pretixbase/models.py:802 msgid "expired" msgstr "abgelaufen" -#: tixlbase/models.py:803 +#: pretixbase/models.py:803 msgid "cancelled" msgstr "storniert" -#: tixlbase/models.py:809 +#: pretixbase/models.py:809 msgid "Status" msgstr "Status" -#: tixlbase/models.py:821 tixlbase/models.py:923 +#: pretixbase/models.py:821 pretixbase/models.py:923 msgid "Date" msgstr "Datum" -#: tixlbase/models.py:824 tixlbase/models.py:926 +#: pretixbase/models.py:824 pretixbase/models.py:926 msgid "Expiration date" msgstr "Ablaufdatum" -#: tixlbase/models.py:827 +#: pretixbase/models.py:827 msgid "Payment date" msgstr "Zahlungsdatum" -#: tixlbase/models.py:830 +#: pretixbase/models.py:830 msgid "Payment information" msgstr "Zahlungsinformationen" -#: tixlbase/models.py:834 +#: pretixbase/models.py:834 msgid "Total amount" msgstr "Gesamtbetrag" -#: tixlbase/models.py:838 tixlbase/models.py:862 +#: pretixbase/models.py:838 pretixbase/models.py:862 msgid "Order" msgstr "Bestellung" -#: tixlbase/models.py:839 +#: pretixbase/models.py:839 msgid "Orders" msgstr "Bestellungen" -#: tixlbase/models.py:871 tixlbase/models.py:916 +#: pretixbase/models.py:871 pretixbase/models.py:916 msgid "Variation" msgstr "Variante" -#: tixlbase/models.py:875 tixlbase/models.py:920 -#: tixlcontrol/templates/tixlcontrol/item/variations_1d.html:13 +#: pretixbase/models.py:875 pretixbase/models.py:920 +#: pretixcontrol/templates/pretixcontrol/item/variations_1d.html:13 msgid "Price" msgstr "Preis" -#: tixlbase/models.py:880 +#: pretixbase/models.py:880 msgid "Answers" msgstr "Antworten" -#: tixlbase/models.py:884 +#: pretixbase/models.py:884 msgid "Order position" msgstr "Bestelltes Produkt" -#: tixlbase/models.py:885 +#: pretixbase/models.py:885 msgid "Order positions" msgstr "Bestellzeile" -#: tixlbase/models.py:907 +#: pretixbase/models.py:907 msgid "Session key" msgstr "Sitzung" -#: tixlbase/models.py:930 +#: pretixbase/models.py:930 msgid "Cart position" msgstr "Produkt im Warenkorb" -#: tixlbase/models.py:931 +#: pretixbase/models.py:931 msgid "Cart positions" msgstr "Produkte im Warenkorb" -#: tixlcontrol/middleware.py:59 +#: pretixcontrol/middleware.py:59 msgid "" "The selected event was not found or you have no permission to administrate " "it." @@ -524,108 +523,108 @@ msgstr "" "Sie haben keine Berechtigung, die ausgewählte Veranstaltung zu " "administrieren." -#: tixlcontrol/permissions.py:23 +#: pretixcontrol/permissions.py:23 msgid "You do not have permission to view this content." msgstr "Sie haben keine Berechtigung, diese Inhalte aufzurufen." -#: tixlcontrol/templates/tixlcontrol/auth/base.html:18 +#: pretixcontrol/templates/pretixcontrol/auth/base.html:18 #, python-format -msgid "powered by tixl" -msgstr "powered by tixl" +msgid "powered by pretix" +msgstr "powered by pretix" -#: tixlcontrol/templates/tixlcontrol/auth/login.html:12 +#: pretixcontrol/templates/pretixcontrol/auth/login.html:12 msgid "Log in" msgstr "Anmelden" -#: tixlcontrol/templates/tixlcontrol/base.html:23 +#: pretixcontrol/templates/pretixcontrol/base.html:23 msgid "Toggle navigation" msgstr "Navigation umschalten" -#: tixlcontrol/templates/tixlcontrol/base.html:33 -#: tixlcontrol/templates/tixlcontrol/event/base.html:18 +#: pretixcontrol/templates/pretixcontrol/base.html:33 +#: pretixcontrol/templates/pretixcontrol/event/base.html:18 msgid "Dashboard" msgstr "Übersicht" -#: tixlcontrol/templates/tixlcontrol/base.html:39 +#: pretixcontrol/templates/pretixcontrol/base.html:39 msgid "Log out" msgstr "Abmelden" -#: tixlcontrol/templates/tixlcontrol/event/base.html:8 +#: pretixcontrol/templates/pretixcontrol/event/base.html:8 msgid "Event overview" msgstr "Überblick" -#: tixlcontrol/templates/tixlcontrol/event/base.html:19 -#: tixlcontrol/templates/tixlcontrol/event/settings_base.html:6 +#: pretixcontrol/templates/pretixcontrol/event/base.html:19 +#: pretixcontrol/templates/pretixcontrol/event/settings_base.html:6 msgid "Settings" msgstr "Einstellungen" -#: tixlcontrol/templates/tixlcontrol/event/plugins.html:8 +#: pretixcontrol/templates/pretixcontrol/event/plugins.html:8 msgid "Installed plugins" msgstr "Installierte Erweiterungen" -#: tixlcontrol/templates/tixlcontrol/event/plugins.html:11 -#: tixlcontrol/templates/tixlcontrol/event/settings.html:8 -#: tixlcontrol/templates/tixlcontrol/item/index.html:9 -#: tixlcontrol/templates/tixlcontrol/items/categories.html:8 -#: tixlcontrol/templates/tixlcontrol/items/category.html:11 -#: tixlcontrol/templates/tixlcontrol/items/properties.html:8 -#: tixlcontrol/templates/tixlcontrol/items/property.html:12 -#: tixlcontrol/templates/tixlcontrol/items/question.html:11 -#: tixlcontrol/templates/tixlcontrol/items/questions.html:8 +#: pretixcontrol/templates/pretixcontrol/event/plugins.html:11 +#: pretixcontrol/templates/pretixcontrol/event/settings.html:8 +#: pretixcontrol/templates/pretixcontrol/item/index.html:9 +#: pretixcontrol/templates/pretixcontrol/items/categories.html:8 +#: pretixcontrol/templates/pretixcontrol/items/category.html:11 +#: pretixcontrol/templates/pretixcontrol/items/properties.html:8 +#: pretixcontrol/templates/pretixcontrol/items/property.html:12 +#: pretixcontrol/templates/pretixcontrol/items/question.html:11 +#: pretixcontrol/templates/pretixcontrol/items/questions.html:8 msgid "Your changes have been saved." msgstr "Die Änderungen wurden gespeichert." -#: tixlcontrol/templates/tixlcontrol/event/plugins.html:23 +#: pretixcontrol/templates/pretixcontrol/event/plugins.html:23 msgid "Disable" msgstr "Deaktivieren" -#: tixlcontrol/templates/tixlcontrol/event/plugins.html:25 +#: pretixcontrol/templates/pretixcontrol/event/plugins.html:25 msgid "Enable" msgstr "Aktivieren" -#: tixlcontrol/templates/tixlcontrol/event/plugins.html:32 +#: pretixcontrol/templates/pretixcontrol/event/plugins.html:32 #, python-format msgid "Version %(plugin.version)s by %(plugin.author)s" msgstr "Version %(plugin.version)s von %(plugin.author)s" -#: tixlcontrol/templates/tixlcontrol/event/settings.html:13 -#: tixlcontrol/templates/tixlcontrol/item/base.html:7 -#: tixlcontrol/templates/tixlcontrol/item/index.html:5 -#: tixlcontrol/templates/tixlcontrol/item/index.html:15 -#: tixlcontrol/templates/tixlcontrol/items/category.html:15 -#: tixlcontrol/templates/tixlcontrol/items/property.html:16 -#: tixlcontrol/templates/tixlcontrol/items/question.html:15 +#: pretixcontrol/templates/pretixcontrol/event/settings.html:13 +#: pretixcontrol/templates/pretixcontrol/item/base.html:7 +#: pretixcontrol/templates/pretixcontrol/item/index.html:5 +#: pretixcontrol/templates/pretixcontrol/item/index.html:15 +#: pretixcontrol/templates/pretixcontrol/items/category.html:15 +#: pretixcontrol/templates/pretixcontrol/items/property.html:16 +#: pretixcontrol/templates/pretixcontrol/items/question.html:15 msgid "General information" msgstr "Allgemeine Informationen" -#: tixlcontrol/templates/tixlcontrol/event/settings.html:21 +#: pretixcontrol/templates/pretixcontrol/event/settings.html:21 msgid "Display settings" msgstr "Anzeigeeinstellungen" -#: tixlcontrol/templates/tixlcontrol/event/settings.html:28 +#: pretixcontrol/templates/pretixcontrol/event/settings.html:28 msgid "Presale settings" msgstr "Vorverkaufseinstellungen" -#: tixlcontrol/templates/tixlcontrol/event/settings.html:33 +#: pretixcontrol/templates/pretixcontrol/event/settings.html:33 msgid "Payment settings" msgstr "Zahlungseinstellungen" -#: tixlcontrol/templates/tixlcontrol/event/settings.html:40 -#: tixlcontrol/templates/tixlcontrol/item/index.html:35 -#: tixlcontrol/templates/tixlcontrol/item/variations_1d.html:30 -#: tixlcontrol/templates/tixlcontrol/item/variations_2d.html:35 -#: tixlcontrol/templates/tixlcontrol/item/variations_nd.html:38 -#: tixlcontrol/templates/tixlcontrol/items/category.html:21 -#: tixlcontrol/templates/tixlcontrol/items/property.html:67 -#: tixlcontrol/templates/tixlcontrol/items/question.html:23 +#: pretixcontrol/templates/pretixcontrol/event/settings.html:40 +#: pretixcontrol/templates/pretixcontrol/item/index.html:35 +#: pretixcontrol/templates/pretixcontrol/item/variations_1d.html:30 +#: pretixcontrol/templates/pretixcontrol/item/variations_2d.html:35 +#: pretixcontrol/templates/pretixcontrol/item/variations_nd.html:38 +#: pretixcontrol/templates/pretixcontrol/items/category.html:21 +#: pretixcontrol/templates/pretixcontrol/items/property.html:67 +#: pretixcontrol/templates/pretixcontrol/items/question.html:23 msgid "Save" msgstr "Speichern" -#: tixlcontrol/templates/tixlcontrol/event/settings_base.html:8 +#: pretixcontrol/templates/pretixcontrol/event/settings_base.html:8 msgid "General settings" msgstr "Allgemeine Einstellungen" -#: tixlcontrol/templates/tixlcontrol/events/index.html:6 +#: pretixcontrol/templates/pretixcontrol/events/index.html:6 msgid "" "The list below shows all events you have administrative access to. Click on " "the event name to access event details." @@ -634,69 +633,65 @@ msgstr "" "administrativen Zugriff haben. Klicken Sie auf einen Veranstaltungstitel um " "Details aufzurufen" -#: tixlcontrol/templates/tixlcontrol/events/index.html:10 +#: pretixcontrol/templates/pretixcontrol/events/index.html:10 msgid "Event name" msgstr "Veranstaltungstitel" -#: tixlcontrol/templates/tixlcontrol/events/index.html:12 +#: pretixcontrol/templates/pretixcontrol/events/index.html:12 msgid "Start date" msgstr "Beginn" -#: tixlcontrol/templates/tixlcontrol/events/index.html:13 +#: pretixcontrol/templates/pretixcontrol/events/index.html:13 msgid "End date" msgstr "Ende" -#: tixlcontrol/templates/tixlcontrol/item/base.html:5 +#: pretixcontrol/templates/pretixcontrol/item/base.html:5 msgid "Modify item:" msgstr "Produkt bearbeiten:" msgid "Variations" msgstr "Varianten" -#: tixlcontrol/templates/tixlcontrol/item/index.html:23 +#: pretixcontrol/templates/pretixcontrol/item/index.html:23 msgid "Price settings" msgstr "Preis" -#: tixlcontrol/templates/tixlcontrol/item/index.html:28 +#: pretixcontrol/templates/pretixcontrol/item/index.html:28 msgid "Advanced settings" msgstr "Erweiterte Einstellungen" -#: tixlcontrol/templates/tixlcontrol/item/variations_1d.html:13 -msgid "Price" -msgstr "Preis" - -#: tixlcontrol/templates/tixlcontrol/item/restrictions.html:28 +#: pretixcontrol/templates/pretixcontrol/item/restrictions.html:28 msgid "Add a new restriction" msgstr "Neue Beschränkung hinzufügen" -#: tixlcontrol/templates/tixlcontrol/item/variations_0d.html:6 +#: pretixcontrol/templates/pretixcontrol/item/variations_0d.html:6 msgid "" "You have to define and select propreties to be able to configure variations." msgstr "" "Sie müssen Eigenschaften auswählen, um Varianten konfigurieren zu können." -#: tixlcontrol/templates/tixlcontrol/items/base.html:7 +#: pretixcontrol/templates/pretixcontrol/items/base.html:7 msgid "Categories" msgstr "Kategorien" -#: tixlcontrol/templates/tixlcontrol/items/categories.html:12 +#: pretixcontrol/templates/pretixcontrol/items/categories.html:12 msgid "A new category has been created." msgstr "Eine neue Kategorie wurde erstellt." -#: tixlcontrol/templates/tixlcontrol/items/categories.html:16 +#: pretixcontrol/templates/pretixcontrol/items/categories.html:16 msgid "The category has been deleted." msgstr "Die Kategorie wurde gelöscht." -#: tixlcontrol/templates/tixlcontrol/items/categories.html:20 +#: pretixcontrol/templates/pretixcontrol/items/categories.html:20 msgid "Create new category" msgstr "Kategorie erstellen" -#: tixlcontrol/templates/tixlcontrol/items/category_delete.html:4 -#: tixlcontrol/templates/tixlcontrol/items/category_delete.html:6 +#: pretixcontrol/templates/pretixcontrol/items/category_delete.html:4 +#: pretixcontrol/templates/pretixcontrol/items/category_delete.html:6 msgid "Delete item category" msgstr "Kategorie löschen" -#: tixlcontrol/templates/tixlcontrol/items/category_delete.html:9 +#: pretixcontrol/templates/pretixcontrol/items/category_delete.html:9 #, python-format msgid "" "Are you sure you want to the category %(category.name)s?" @@ -704,44 +699,44 @@ msgstr "" "Möchten Sie die Kategorie %(category.name)s wirklich " "löschen?" -#: tixlcontrol/templates/tixlcontrol/items/category_delete.html:13 -#: tixlcontrol/templates/tixlcontrol/items/property_delete.html:21 -#: tixlcontrol/templates/tixlcontrol/items/question_delete.html:19 +#: pretixcontrol/templates/pretixcontrol/items/category_delete.html:13 +#: pretixcontrol/templates/pretixcontrol/items/property_delete.html:21 +#: pretixcontrol/templates/pretixcontrol/items/question_delete.html:19 msgid "Confirm" msgstr "Bestätigen" -#: tixlcontrol/templates/tixlcontrol/items/category_delete.html:16 -#: tixlcontrol/templates/tixlcontrol/items/property_delete.html:24 -#: tixlcontrol/templates/tixlcontrol/items/question_delete.html:22 +#: pretixcontrol/templates/pretixcontrol/items/category_delete.html:16 +#: pretixcontrol/templates/pretixcontrol/items/property_delete.html:24 +#: pretixcontrol/templates/pretixcontrol/items/question_delete.html:22 msgid "Cancel" msgstr "Abbrechen" -#: tixlcontrol/templates/tixlcontrol/items/properties.html:12 +#: pretixcontrol/templates/pretixcontrol/items/properties.html:12 msgid "A new property has been created." msgstr "Eine neue Eigenschaft wurde erstellt." -#: tixlcontrol/templates/tixlcontrol/items/properties.html:16 +#: pretixcontrol/templates/pretixcontrol/items/properties.html:16 msgid "The property has been deleted." msgstr "Die Eigenschaft wurde gelöscht." -#: tixlcontrol/templates/tixlcontrol/items/properties.html:20 +#: pretixcontrol/templates/pretixcontrol/items/properties.html:20 msgid "Create new property" msgstr "Eigenschaft hinzufügen" -#: tixlcontrol/templates/tixlcontrol/items/property.html:20 +#: pretixcontrol/templates/pretixcontrol/items/property.html:20 msgid "Values" msgstr "Werte" -#: tixlcontrol/templates/tixlcontrol/items/property.html:61 +#: pretixcontrol/templates/pretixcontrol/items/property.html:61 msgid "Add a new value" msgstr "Neuen Wert hinzufügen." -#: tixlcontrol/templates/tixlcontrol/items/property_delete.html:4 -#: tixlcontrol/templates/tixlcontrol/items/property_delete.html:6 +#: pretixcontrol/templates/pretixcontrol/items/property_delete.html:4 +#: pretixcontrol/templates/pretixcontrol/items/property_delete.html:6 msgid "Delete item property" msgstr "Eigenschaft löschen" -#: tixlcontrol/templates/tixlcontrol/items/property_delete.html:8 +#: pretixcontrol/templates/pretixcontrol/items/property_delete.html:8 #, python-format msgid "" "You can not delete the property %(property)s as long as the " @@ -750,23 +745,23 @@ msgstr "" "Die Eigenschaft %(property)s kann nicht gelöscht werden, " "solange sie von den folgenden Produkten benutzt wird:" -#: tixlcontrol/templates/tixlcontrol/items/property_delete.html:17 +#: pretixcontrol/templates/pretixcontrol/items/property_delete.html:17 #, python-format msgid "Are you sure you want to the property %(property)s?" msgstr "" "Möchten Sie die Eigenschaft %(property)s wirklich löschen?" -#: tixlcontrol/templates/tixlcontrol/items/question_delete.html:4 -#: tixlcontrol/templates/tixlcontrol/items/question_delete.html:6 +#: pretixcontrol/templates/pretixcontrol/items/question_delete.html:4 +#: pretixcontrol/templates/pretixcontrol/items/question_delete.html:6 msgid "Delete question" msgstr "Frage löschen" -#: tixlcontrol/templates/tixlcontrol/items/question_delete.html:9 +#: pretixcontrol/templates/pretixcontrol/items/question_delete.html:9 #, python-format msgid "Are you sure you want to the question %(question)s?" msgstr "Möchten Sie die Frage %(question)s wirklich löschen?" -#: tixlcontrol/templates/tixlcontrol/items/question_delete.html:11 +#: pretixcontrol/templates/pretixcontrol/items/question_delete.html:11 msgid "" "All answers to the question given by the buyers of the following tickets " "will be permanently lost." @@ -774,52 +769,52 @@ msgstr "" "Alle Antworten auf diese Frage werden unwiderruflich gelöscht." -#: tixlcontrol/templates/tixlcontrol/items/questions.html:12 +#: pretixcontrol/templates/pretixcontrol/items/questions.html:12 msgid "A new question has been created." msgstr "Eine neue Frage wurde erstellt." -#: tixlcontrol/templates/tixlcontrol/items/questions.html:16 +#: pretixcontrol/templates/pretixcontrol/items/questions.html:16 msgid "The question has been deleted." msgstr "Die Frage wurde gelöscht." -#: tixlcontrol/templates/tixlcontrol/items/questions.html:20 +#: pretixcontrol/templates/pretixcontrol/items/questions.html:20 msgid "Create new question" msgstr "Frage erstellen" -#: tixlcontrol/templates/tixlcontrol/items/questions.html:26 +#: pretixcontrol/templates/pretixcontrol/items/questions.html:26 msgid "Type" msgstr "Typ" -#: tixlcontrol/views/auth.py:15 +#: pretixcontrol/views/auth.py:15 msgid "E-mail address" msgstr "E-Mail-Adresse" -#: tixlcontrol/views/auth.py:20 +#: pretixcontrol/views/auth.py:20 msgid "Please enter a correct e-mail address and password." msgstr "" "Bitte geben Sie eine gültige Kombination aus E-Mail-Adresse und Passwort ein." -#: tixlcontrol/views/auth.py:21 +#: pretixcontrol/views/auth.py:21 msgid "This account is inactive." msgstr "Dieses Konto ist deaktiviert." -#: tixlcontrol/views/forms.py:130 +#: pretixcontrol/views/forms.py:130 msgid "not applicable" msgstr "nicht anwendbar" -#: tixlplugins/timerestriction/__init__.py:8 +#: pretixplugins/timerestriction/__init__.py:8 msgid "Time restriction" msgstr "Zeitliche Beschränkung" -#: tixlplugins/timerestriction/__init__.py:12 +#: pretixplugins/timerestriction/__init__.py:12 msgid "Restricition by time" msgstr "Zeitliche Beschränkung" -#: tixlplugins/timerestriction/__init__.py:13 -msgid "the tixl team" -msgstr "Das tixl-Team" +#: pretixplugins/timerestriction/__init__.py:13 +msgid "the pretix team" +msgstr "Das pretix-Team" -#: tixlplugins/timerestriction/__init__.py:15 +#: pretixplugins/timerestriction/__init__.py:15 msgid "" "This plugin adds the possibility to restrict the sale of a given item or " "variation to a certain timeframe or change its price during a certain period." @@ -828,19 +823,19 @@ msgstr "" "Zeitraum einzuschränken oder den Preis während eines gewissen Zeitraums zu " "ändern." -#: tixlplugins/timerestriction/models.py:15 +#: pretixplugins/timerestriction/models.py:15 msgid "Start of time frame" msgstr "Beginn des Zeitraums" -#: tixlplugins/timerestriction/models.py:18 +#: pretixplugins/timerestriction/models.py:18 msgid "End of time frame" msgstr "Ende des Zeitraums" -#: tixlplugins/timerestriction/models.py:23 +#: pretixplugins/timerestriction/models.py:23 msgid "Price in time frame" msgstr "Preis im Zeitraum" -#: tixlplugins/timerestriction/signals.py:140 +#: pretixplugins/timerestriction/signals.py:140 msgid "Restriction by time" msgstr "Zeitliche Beschränkung" diff --git a/src/manage.py b/src/manage.py index 060622ed8..4dbadaca8 100755 --- a/src/manage.py +++ b/src/manage.py @@ -3,7 +3,7 @@ import os import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "tixl.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pretix.settings") from django.core.management import execute_from_command_line diff --git a/src/tixl/__init__.py b/src/pretix/__init__.py similarity index 100% rename from src/tixl/__init__.py rename to src/pretix/__init__.py diff --git a/src/tixl/settings.py b/src/pretix/settings.py similarity index 88% rename from src/tixl/settings.py rename to src/pretix/settings.py index 045ae6d8a..376d45cd1 100644 --- a/src/tixl/settings.py +++ b/src/pretix/settings.py @@ -1,5 +1,5 @@ """ -Django settings for tixl project. +Django settings for pretix project. For more information on this file, see https://docs.djangoproject.com/en/dev/topics/settings/ @@ -37,15 +37,15 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'tixlbase', - 'tixlcontrol', - 'tixlpresale', + 'pretixbase', + 'pretixcontrol', + 'pretixpresale', 'compressor', 'bootstrap3', 'debug_toolbar.apps.DebugToolbarConfig', 'djangoformsetjs', - 'tixlplugins.testdummy', - 'tixlplugins.timerestriction', + 'pretixplugins.testdummy', + 'pretixplugins.timerestriction', ) MIDDLEWARE_CLASSES = ( @@ -55,10 +55,10 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'debug_toolbar.middleware.DebugToolbarMiddleware', - 'tixlbase.middleware.LocaleMiddleware', + 'pretixbase.middleware.LocaleMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'tixlcontrol.middleware.PermissionMiddleware', + 'pretixcontrol.middleware.PermissionMiddleware', ) TEMPLATE_CONTEXT_PROCESSORS = ( @@ -70,12 +70,12 @@ TEMPLATE_CONTEXT_PROCESSORS = ( "django.core.context_processors.static", "django.core.context_processors.tz", "django.contrib.messages.context_processors.messages", - 'tixlcontrol.context.contextprocessor', + 'pretixcontrol.context.contextprocessor', ) -ROOT_URLCONF = 'tixl.urls' +ROOT_URLCONF = 'pretix.urls' -WSGI_APPLICATION = 'tixl.wsgi.application' +WSGI_APPLICATION = 'pretix.wsgi.application' # Database @@ -114,7 +114,7 @@ LANGUAGES = ( # Authentication -AUTH_USER_MODEL = 'tixlbase.User' +AUTH_USER_MODEL = 'pretixbase.User' LOGIN_URL = '/login' LOGIN_URL_CONTROL = '/control/login' @@ -149,7 +149,7 @@ DEBUG_TOOLBAR_CONFIG = { # Tixl specific settings -TIXL_INSTANCE_NAME = 'tixl.de' +TIXL_INSTANCE_NAME = 'pretix.de' DEFAULT_CURRENCY = 'EUR' INTERNAL_IPS = ('127.0.0.1', '::1') diff --git a/src/tixl/urls.py b/src/pretix/urls.py similarity index 77% rename from src/tixl/urls.py rename to src/pretix/urls.py index b43259251..675db457f 100644 --- a/src/tixl/urls.py +++ b/src/pretix/urls.py @@ -2,11 +2,11 @@ from django.conf.urls import patterns, include, url from django.contrib import admin from django.conf import settings -import tixlcontrol.urls +import pretixcontrol.urls urlpatterns = patterns('', - url(r'^control/', include(tixlcontrol.urls, namespace='control')), + url(r'^control/', include(pretixcontrol.urls, namespace='control')), url(r'^admin/', include(admin.site.urls)), ) diff --git a/src/tixl/wsgi.py b/src/pretix/wsgi.py similarity index 74% rename from src/tixl/wsgi.py rename to src/pretix/wsgi.py index 5bb1d62cd..eab8cd925 100644 --- a/src/tixl/wsgi.py +++ b/src/pretix/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for tixl project. +WSGI config for pretix project. It exposes the WSGI callable as a module-level variable named ``application``. @@ -8,7 +8,7 @@ https://docs.djangoproject.com/en/dev/howto/deployment/wsgi/ """ import os -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "tixl.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pretix.settings") from django.core.wsgi import get_wsgi_application application = get_wsgi_application() diff --git a/src/tixlbase/__init__.py b/src/pretixbase/__init__.py similarity index 100% rename from src/tixlbase/__init__.py rename to src/pretixbase/__init__.py diff --git a/src/tixlbase/admin.py b/src/pretixbase/admin.py similarity index 99% rename from src/tixlbase/admin.py rename to src/pretixbase/admin.py index 32fa56c30..d89b424f4 100644 --- a/src/tixlbase/admin.py +++ b/src/pretixbase/admin.py @@ -3,7 +3,7 @@ from django.contrib.auth.admin import UserAdmin from django.utils.translation import ugettext as _ from django import forms -from tixlbase.models import ( +from pretixbase.models import ( User, Organizer, OrganizerPermission, Event, EventPermission, Property, PropertyValue, Item, ItemVariation, ItemCategory ) diff --git a/src/tixlbase/cache.py b/src/pretixbase/cache.py similarity index 98% rename from src/tixlbase/cache.py rename to src/pretixbase/cache.py index 0cce7258b..39398e8d1 100644 --- a/src/tixlbase/cache.py +++ b/src/pretixbase/cache.py @@ -3,7 +3,7 @@ import hashlib from django.core.cache import caches -from tixlbase.models import Event +from pretixbase.models import Event class EventRelatedCache: diff --git a/src/tixlbase/forms.py b/src/pretixbase/forms.py similarity index 100% rename from src/tixlbase/forms.py rename to src/pretixbase/forms.py diff --git a/src/tixlbase/middleware.py b/src/pretixbase/middleware.py similarity index 99% rename from src/tixlbase/middleware.py rename to src/pretixbase/middleware.py index 40200069d..bc02e63d5 100644 --- a/src/tixlbase/middleware.py +++ b/src/pretixbase/middleware.py @@ -14,7 +14,7 @@ from django.utils import translation, timezone from collections import OrderedDict from django.utils.cache import patch_vary_headers -from tixlbase.models import Event +from pretixbase.models import Event _supported = None diff --git a/src/tixlbase/migrations/0001_initial.py b/src/pretixbase/migrations/0001_initial.py similarity index 92% rename from src/tixlbase/migrations/0001_initial.py rename to src/pretixbase/migrations/0001_initial.py index 2cf93ab48..19b080560 100644 --- a/src/tixlbase/migrations/0001_initial.py +++ b/src/pretixbase/migrations/0001_initial.py @@ -7,7 +7,7 @@ import django.core.validators from django.conf import settings import django.db.models.deletion import django.utils.timezone -import tixlbase.models +import pretixbase.models class Migration(migrations.Migration): @@ -96,7 +96,7 @@ class Migration(migrations.Migration): ('version_birth_date', models.DateTimeField()), ('can_change_settings', models.BooleanField(default=True, verbose_name='Can change event settings')), ('can_change_items', models.BooleanField(default=True, verbose_name='Can change item settings')), - ('event', versions.models.VersionedForeignKey(to='tixlbase.Event')), + ('event', versions.models.VersionedForeignKey(to='pretixbase.Event')), ('user', models.ForeignKey(related_name='event_perms', to=settings.AUTH_USER_MODEL)), ], options={ @@ -137,7 +137,7 @@ class Migration(migrations.Migration): ('version_birth_date', models.DateTimeField()), ('name', models.CharField(max_length=255, verbose_name='Category name')), ('position', models.IntegerField(default=0)), - ('event', versions.models.VersionedForeignKey(related_name='categories', to='tixlbase.Event')), + ('event', versions.models.VersionedForeignKey(related_name='categories', to='pretixbase.Event')), ], options={ 'verbose_name_plural': 'Item categories', @@ -156,7 +156,7 @@ class Migration(migrations.Migration): ('version_birth_date', models.DateTimeField()), ('active', models.BooleanField(default=True, verbose_name='Active')), ('default_price', models.DecimalField(decimal_places=2, max_digits=7, blank=True, null=True, verbose_name='Default price')), - ('item', versions.models.VersionedForeignKey(related_name='variations', to='tixlbase.Item')), + ('item', versions.models.VersionedForeignKey(related_name='variations', to='pretixbase.Item')), ], options={ 'verbose_name_plural': 'Item variations', @@ -178,7 +178,7 @@ class Migration(migrations.Migration): ('payment_date', models.DateTimeField(verbose_name='Payment date')), ('payment_info', models.TextField(verbose_name='Payment information')), ('total', models.DecimalField(decimal_places=2, max_digits=10, verbose_name='Total amount')), - ('event', versions.models.VersionedForeignKey(verbose_name='Event', to='tixlbase.Event')), + ('event', versions.models.VersionedForeignKey(verbose_name='Event', to='pretixbase.Event')), ('user', models.ForeignKey(null=True, verbose_name='User', blank=True, to=settings.AUTH_USER_MODEL)), ], options={ @@ -226,7 +226,7 @@ class Migration(migrations.Migration): ('version_end_date', models.DateTimeField(blank=True, null=True, default=None)), ('version_birth_date', models.DateTimeField()), ('can_create_events', models.BooleanField(default=True, verbose_name='Can create events')), - ('organizer', versions.models.VersionedForeignKey(to='tixlbase.Organizer')), + ('organizer', versions.models.VersionedForeignKey(to='pretixbase.Organizer')), ('user', models.ForeignKey(related_name='organizer_perms', to=settings.AUTH_USER_MODEL)), ], options={ @@ -244,7 +244,7 @@ class Migration(migrations.Migration): ('version_end_date', models.DateTimeField(blank=True, null=True, default=None)), ('version_birth_date', models.DateTimeField()), ('name', models.CharField(max_length=250, verbose_name='Property name')), - ('event', versions.models.VersionedForeignKey(related_name='properties', to='tixlbase.Event')), + ('event', versions.models.VersionedForeignKey(related_name='properties', to='pretixbase.Event')), ], options={ 'verbose_name_plural': 'Item properties', @@ -262,7 +262,7 @@ class Migration(migrations.Migration): ('version_birth_date', models.DateTimeField()), ('value', models.CharField(max_length=250, verbose_name='Value')), ('position', models.IntegerField(default=0)), - ('prop', versions.models.VersionedForeignKey(related_name='values', to='tixlbase.Property')), + ('prop', versions.models.VersionedForeignKey(related_name='values', to='pretixbase.Property')), ], options={ 'verbose_name_plural': 'Property values', @@ -282,7 +282,7 @@ class Migration(migrations.Migration): ('question', models.TextField(verbose_name='Question')), ('type', models.CharField(max_length=5, choices=[('N', 'Number'), ('S', 'Text (one line)'), ('T', 'Multiline text'), ('B', 'Yes/No')], verbose_name='Question type')), ('required', models.BooleanField(default=False, verbose_name='Required question')), - ('event', versions.models.VersionedForeignKey(related_name='questions', to='tixlbase.Event')), + ('event', versions.models.VersionedForeignKey(related_name='questions', to='pretixbase.Event')), ], options={ 'verbose_name_plural': 'Questions', @@ -299,9 +299,9 @@ class Migration(migrations.Migration): ('version_end_date', models.DateTimeField(blank=True, null=True, default=None)), ('version_birth_date', models.DateTimeField()), ('answer', models.TextField()), - ('cartposition', models.ForeignKey(null=True, to='tixlbase.CartPosition', blank=True)), - ('orderposition', models.ForeignKey(null=True, to='tixlbase.OrderPosition', blank=True)), - ('question', versions.models.VersionedForeignKey(to='tixlbase.Question')), + ('cartposition', models.ForeignKey(null=True, to='pretixbase.CartPosition', blank=True)), + ('orderposition', models.ForeignKey(null=True, to='pretixbase.OrderPosition', blank=True)), + ('question', versions.models.VersionedForeignKey(to='pretixbase.Question')), ], options={ 'abstract': False, @@ -318,11 +318,11 @@ class Migration(migrations.Migration): ('version_birth_date', models.DateTimeField()), ('name', models.CharField(max_length=200, verbose_name='Name')), ('size', models.PositiveIntegerField(verbose_name='Total capacity')), - ('event', versions.models.VersionedForeignKey(related_name='quotas', to='tixlbase.Event', verbose_name='Event')), - ('items', versions.models.VersionedManyToManyField(blank=True, to='tixlbase.Item', verbose_name='Item')), - ('lock_cache', models.ManyToManyField(blank=True, to='tixlbase.CartPosition')), - ('order_cache', models.ManyToManyField(blank=True, to='tixlbase.OrderPosition')), - ('variations', tixlbase.models.VariationsField(blank=True, to='tixlbase.ItemVariation', verbose_name='Variations')), + ('event', versions.models.VersionedForeignKey(related_name='quotas', to='pretixbase.Event', verbose_name='Event')), + ('items', versions.models.VersionedManyToManyField(blank=True, to='pretixbase.Item', verbose_name='Item')), + ('lock_cache', models.ManyToManyField(blank=True, to='pretixbase.CartPosition')), + ('order_cache', models.ManyToManyField(blank=True, to='pretixbase.OrderPosition')), + ('variations', pretixbase.models.VariationsField(blank=True, to='pretixbase.ItemVariation', verbose_name='Variations')), ], options={ 'verbose_name_plural': 'Quotas', @@ -337,85 +337,85 @@ class Migration(migrations.Migration): migrations.AddField( model_name='organizer', name='permitted', - field=models.ManyToManyField(through='tixlbase.OrganizerPermission', related_name='organizers', to=settings.AUTH_USER_MODEL), + field=models.ManyToManyField(through='pretixbase.OrganizerPermission', related_name='organizers', to=settings.AUTH_USER_MODEL), preserve_default=True, ), migrations.AddField( model_name='orderposition', name='answers', - field=versions.models.VersionedManyToManyField(through='tixlbase.QuestionAnswer', to='tixlbase.Question', verbose_name='Answers'), + field=versions.models.VersionedManyToManyField(through='pretixbase.QuestionAnswer', to='pretixbase.Question', verbose_name='Answers'), preserve_default=True, ), migrations.AddField( model_name='orderposition', name='item', - field=versions.models.VersionedForeignKey(verbose_name='Item', to='tixlbase.Item'), + field=versions.models.VersionedForeignKey(verbose_name='Item', to='pretixbase.Item'), preserve_default=True, ), migrations.AddField( model_name='orderposition', name='order', - field=versions.models.VersionedForeignKey(verbose_name='Order', to='tixlbase.Order'), + field=versions.models.VersionedForeignKey(verbose_name='Order', to='pretixbase.Order'), preserve_default=True, ), migrations.AddField( model_name='orderposition', name='variation', - field=versions.models.VersionedForeignKey(null=True, verbose_name='Variation', blank=True, to='tixlbase.ItemVariation'), + field=versions.models.VersionedForeignKey(null=True, verbose_name='Variation', blank=True, to='pretixbase.ItemVariation'), preserve_default=True, ), migrations.AddField( model_name='itemvariation', name='values', - field=versions.models.VersionedManyToManyField(related_name='variations', to='tixlbase.PropertyValue'), + field=versions.models.VersionedManyToManyField(related_name='variations', to='pretixbase.PropertyValue'), preserve_default=True, ), migrations.AddField( model_name='item', name='category', - field=versions.models.VersionedForeignKey(on_delete=django.db.models.deletion.PROTECT, null=True, related_name='items', verbose_name='Category', blank=True, to='tixlbase.ItemCategory'), + field=versions.models.VersionedForeignKey(on_delete=django.db.models.deletion.PROTECT, null=True, related_name='items', verbose_name='Category', blank=True, to='pretixbase.ItemCategory'), preserve_default=True, ), migrations.AddField( model_name='item', name='event', - field=versions.models.VersionedForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='items', to='tixlbase.Event', verbose_name='Event'), + field=versions.models.VersionedForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='items', to='pretixbase.Event', verbose_name='Event'), preserve_default=True, ), migrations.AddField( model_name='item', name='properties', - field=versions.models.VersionedManyToManyField(blank=True, related_name='items', help_text="The selected properties will be available for the user to select. After saving this field, move to the 'Variations' tab to configure the details.", verbose_name='Properties', to='tixlbase.Property'), + field=versions.models.VersionedManyToManyField(blank=True, related_name='items', help_text="The selected properties will be available for the user to select. After saving this field, move to the 'Variations' tab to configure the details.", verbose_name='Properties', to='pretixbase.Property'), preserve_default=True, ), migrations.AddField( model_name='item', name='questions', - field=versions.models.VersionedManyToManyField(blank=True, related_name='items', help_text='The user will be asked to fill in answers for the selected questions', verbose_name='Questions', to='tixlbase.Question'), + field=versions.models.VersionedManyToManyField(blank=True, related_name='items', help_text='The user will be asked to fill in answers for the selected questions', verbose_name='Questions', to='pretixbase.Question'), preserve_default=True, ), migrations.AddField( model_name='event', name='organizer', - field=versions.models.VersionedForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='events', to='tixlbase.Organizer'), + field=versions.models.VersionedForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='events', to='pretixbase.Organizer'), preserve_default=True, ), migrations.AddField( model_name='event', name='permitted', - field=models.ManyToManyField(through='tixlbase.EventPermission', related_name='events', to=settings.AUTH_USER_MODEL), + field=models.ManyToManyField(through='pretixbase.EventPermission', related_name='events', to=settings.AUTH_USER_MODEL), preserve_default=True, ), migrations.AddField( model_name='cartposition', name='event', - field=versions.models.VersionedForeignKey(verbose_name='Event', to='tixlbase.Event'), + field=versions.models.VersionedForeignKey(verbose_name='Event', to='pretixbase.Event'), preserve_default=True, ), migrations.AddField( model_name='cartposition', name='item', - field=versions.models.VersionedForeignKey(verbose_name='Item', to='tixlbase.Item'), + field=versions.models.VersionedForeignKey(verbose_name='Item', to='pretixbase.Item'), preserve_default=True, ), migrations.AddField( @@ -427,13 +427,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='cartposition', name='variation', - field=versions.models.VersionedForeignKey(null=True, verbose_name='Variation', blank=True, to='tixlbase.ItemVariation'), + field=versions.models.VersionedForeignKey(null=True, verbose_name='Variation', blank=True, to='pretixbase.ItemVariation'), preserve_default=True, ), migrations.AddField( model_name='user', name='event', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, null=True, related_name='users', to='tixlbase.Event', blank=True), + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, null=True, related_name='users', to='pretixbase.Event', blank=True), preserve_default=True, ), migrations.AddField( diff --git a/src/tixlbase/migrations/__init__.py b/src/pretixbase/migrations/__init__.py similarity index 100% rename from src/tixlbase/migrations/__init__.py rename to src/pretixbase/migrations/__init__.py diff --git a/src/tixlbase/models.py b/src/pretixbase/models.py similarity index 98% rename from src/tixlbase/models.py rename to src/pretixbase/models.py index 240e4a755..8e10689a3 100644 --- a/src/tixlbase/models.py +++ b/src/pretixbase/models.py @@ -12,7 +12,7 @@ import six from versions.models import Versionable as BaseVersionable from versions.models import VersionedForeignKey, VersionedManyToManyField, get_utc_now -from tixlbase.types import VariationDict +from pretixbase.types import VariationDict class Versionable(BaseVersionable): @@ -95,10 +95,10 @@ class UserManager(BaseUserManager): class User(AbstractBaseUser, PermissionsMixin): """ - This is the user model used by tixl for authentication. + This is the user model used by pretix for authentication. Handling users is somehow complicated, as we try to have two classes of users in one system: - (1) We want global users who can just login into tixl and + (1) We want global users who can just login into pretix and buy tickets for multiple events -- we also need those global users for event organizers who should not need multiple users for managing multiple events. @@ -117,7 +117,7 @@ class User(AbstractBaseUser, PermissionsMixin): (1) the e-mail address for global users. An e-mail address is and should be required for them and global users use their e-mail address for login. - (2) "{username}@{event.id}.event.tixl" for local users, who + (2) "{username}@{event.id}.event.pretix" for local users, who use their username to login on the event page. The model's save() method automatically fills the identifier field according to this scheme when it is empty. The __str__() method @@ -174,7 +174,7 @@ class User(AbstractBaseUser, PermissionsMixin): if self.event is None: self.identifier = self.email.lower() else: - self.identifier = "%s@%s.event.tixl" % (self.username.lower(), self.event.id) + self.identifier = "%s@%s.event.pretix" % (self.username.lower(), self.event.id) if not self.pk: self.identifier = self.identifier.lower() super().save(*args, **kwargs) @@ -375,8 +375,8 @@ class Event(Versionable): "DATETIME_FORMAT" if self.show_times else "DATE_FORMAT" ) - def get_cache(self) -> "tixlbase.cache.EventRelatedCache": - from tixlbase.cache import EventRelatedCache + def get_cache(self) -> "pretixbase.cache.EventRelatedCache": + from pretixbase.cache import EventRelatedCache return EventRelatedCache(self) @@ -758,12 +758,12 @@ class ItemVariation(Versionable): class VariationsField(VersionedManyToManyField): """ - This is a ManyToManyField using the tixlcontrol.views.forms.VariationsField + This is a ManyToManyField using the pretixcontrol.views.forms.VariationsField form field by default. """ def formfield(self, **kwargs): - from tixlcontrol.views.forms import VariationsField as FVariationsField + from pretixcontrol.views.forms import VariationsField as FVariationsField from django.db.models.fields.related import RelatedField defaults = { 'form_class': FVariationsField, @@ -801,7 +801,7 @@ class BaseRestriction(Versionable): related_name="restrictions_%(app_label)s_%(class)s", ) variations = VariationsField( - 'tixlbase.ItemVariation', + 'pretixbase.ItemVariation', blank=True, verbose_name=_("Variations"), related_name="restrictions_%(app_label)s_%(class)s", diff --git a/src/tixlbase/plugins.py b/src/pretixbase/plugins.py similarity index 100% rename from src/tixlbase/plugins.py rename to src/pretixbase/plugins.py diff --git a/src/tixlbase/signals.py b/src/pretixbase/signals.py similarity index 89% rename from src/tixlbase/signals.py rename to src/pretixbase/signals.py index b008917aa..e1c1dd95f 100644 --- a/src/tixlbase/signals.py +++ b/src/pretixbase/signals.py @@ -2,7 +2,7 @@ import django.dispatch from django.apps import apps from django.dispatch.dispatcher import NO_RECEIVERS -from tixlbase.models import Event +from pretixbase.models import Event class EventPluginSignal(django.dispatch.Signal): @@ -17,7 +17,7 @@ class EventPluginSignal(django.dispatch.Signal): Send signal from sender to all connected receivers that belong to plugins enabled for the given Event. - sender is required to be an instance of ``tixlbase.models.Event``. + sender is required to be an instance of ``pretixbase.models.Event``. """ assert isinstance(sender, Event) @@ -44,7 +44,7 @@ class EventPluginSignal(django.dispatch.Signal): return responses """ -This signal is sent out every time some component of tixl wants to know whether a specific +This signal is sent out every time some component of pretix wants to know whether a specific item or variation is available for sell. The item will only be sold, if all (active) receivers return a positive result (see plugin API documentation for details). """ diff --git a/src/pretixbase/static/bootstrap b/src/pretixbase/static/bootstrap new file mode 160000 index 000000000..4ed95f5fa --- /dev/null +++ b/src/pretixbase/static/bootstrap @@ -0,0 +1 @@ +Subproject commit 4ed95f5fa298d861c5fa53ae2a3a0dcb4901bd69 diff --git a/src/tixlbase/static/fontawesome b/src/pretixbase/static/fontawesome similarity index 100% rename from src/tixlbase/static/fontawesome rename to src/pretixbase/static/fontawesome diff --git a/src/tixlbase/static/jquery/js/jquery-2.1.1.min.js b/src/pretixbase/static/jquery/js/jquery-2.1.1.min.js similarity index 100% rename from src/tixlbase/static/jquery/js/jquery-2.1.1.min.js rename to src/pretixbase/static/jquery/js/jquery-2.1.1.min.js diff --git a/src/tixlbase/tests/__init__.py b/src/pretixbase/tests/__init__.py similarity index 100% rename from src/tixlbase/tests/__init__.py rename to src/pretixbase/tests/__init__.py diff --git a/src/tixlbase/tests/test_cache.py b/src/pretixbase/tests/test_cache.py similarity index 96% rename from src/tixlbase/tests/test_cache.py rename to src/pretixbase/tests/test_cache.py index 078ace922..52fdae565 100644 --- a/src/tixlbase/tests/test_cache.py +++ b/src/pretixbase/tests/test_cache.py @@ -4,7 +4,7 @@ from django.test import TestCase from django.core.cache import cache as django_cache from django.utils.timezone import now -from tixlbase.models import Event, Organizer +from pretixbase.models import Event, Organizer class CacheTest(TestCase): diff --git a/src/tixlbase/tests/test_middleware.py b/src/pretixbase/tests/test_middleware.py similarity index 97% rename from src/tixlbase/tests/test_middleware.py rename to src/pretixbase/tests/test_middleware.py index a37932814..7b35f1b0b 100644 --- a/src/tixlbase/tests/test_middleware.py +++ b/src/pretixbase/tests/test_middleware.py @@ -2,7 +2,7 @@ from django.test import TestCase, Client from django.utils.timezone import now from django.conf import settings -from tixlbase.models import Event, Organizer, User +from pretixbase.models import Event, Organizer, User class LocaleDeterminationTest(TestCase): diff --git a/src/tixlbase/tests/test_models.py b/src/pretixbase/tests/test_models.py similarity index 97% rename from src/tixlbase/tests/test_models.py rename to src/pretixbase/tests/test_models.py index 8d33e34cd..e6789e6c4 100644 --- a/src/tixlbase/tests/test_models.py +++ b/src/pretixbase/tests/test_models.py @@ -1,11 +1,11 @@ from django.test import TestCase from django.utils.timezone import now -from tixlbase.models import ( +from pretixbase.models import ( Event, Organizer, Item, ItemVariation, Property, PropertyValue, User ) -from tixlbase.types import VariationDict +from pretixbase.types import VariationDict class ItemVariationsTest(TestCase): @@ -170,7 +170,7 @@ class UserTestCase(TestCase): u = User(event=event, username='tester') u.set_password("test") u.save() - self.assertEqual(u.identifier, "%s@%s.event.tixl" % (u.username.lower(), event.id)) + self.assertEqual(u.identifier, "%s@%s.event.pretix" % (u.username.lower(), event.id)) def test_identifier_global(self): u = User(email='test@example.com') diff --git a/src/tixlbase/tests/test_plugins.py b/src/pretixbase/tests/test_plugins.py similarity index 83% rename from src/tixlbase/tests/test_plugins.py rename to src/pretixbase/tests/test_plugins.py index defff24ab..3e8cc6a7f 100644 --- a/src/tixlbase/tests/test_plugins.py +++ b/src/pretixbase/tests/test_plugins.py @@ -2,9 +2,9 @@ from django.test import TestCase from django.utils.timezone import now from django.conf import settings -from tixlbase.models import Event, Organizer -from tixlbase.plugins import get_all_plugins -from tixlbase.signals import determine_availability +from pretixbase.models import Event, Organizer +from pretixbase.plugins import get_all_plugins +from pretixbase.signals import determine_availability class PluginRegistryTest(TestCase): @@ -49,9 +49,9 @@ class PluginSignalTest(TestCase): self.assertEqual(len(responses), 0) def test_one_plugin_active(self): - self.event.plugins = 'tixlplugins.testdummy' + self.event.plugins = 'pretixplugins.testdummy' self.event.save() payload = {'foo': 'bar'} responses = determine_availability.send(self.event, **payload) self.assertEqual(len(responses), 1) - self.assertIn('tixlplugins.testdummy.signals', [r[0].__module__ for r in responses]) + self.assertIn('pretixplugins.testdummy.signals', [r[0].__module__ for r in responses]) diff --git a/src/tixlbase/types.py b/src/pretixbase/types.py similarity index 100% rename from src/tixlbase/types.py rename to src/pretixbase/types.py diff --git a/src/tixlcontrol/__init__.py b/src/pretixcontrol/__init__.py similarity index 100% rename from src/tixlcontrol/__init__.py rename to src/pretixcontrol/__init__.py diff --git a/src/tixlcontrol/context.py b/src/pretixcontrol/context.py similarity index 100% rename from src/tixlcontrol/context.py rename to src/pretixcontrol/context.py diff --git a/src/tixlcontrol/middleware.py b/src/pretixcontrol/middleware.py similarity index 98% rename from src/tixlcontrol/middleware.py rename to src/pretixcontrol/middleware.py index d124a7bd7..cb5370d77 100644 --- a/src/tixlcontrol/middleware.py +++ b/src/pretixcontrol/middleware.py @@ -7,7 +7,7 @@ from django.contrib.auth import REDIRECT_FIELD_NAME from django.http import HttpResponseNotFound from django.utils.translation import ugettext as _ -from tixlbase.models import Event +from pretixbase.models import Event class PermissionMiddleware: diff --git a/src/tixlcontrol/migrations/__init__.py b/src/pretixcontrol/migrations/__init__.py similarity index 100% rename from src/tixlcontrol/migrations/__init__.py rename to src/pretixcontrol/migrations/__init__.py diff --git a/src/tixlcontrol/permissions.py b/src/pretixcontrol/permissions.py similarity index 96% rename from src/tixlcontrol/permissions.py rename to src/pretixcontrol/permissions.py index 7b1f9a7c2..0c0b313af 100644 --- a/src/tixlcontrol/permissions.py +++ b/src/pretixcontrol/permissions.py @@ -1,7 +1,7 @@ from django.http import HttpResponseForbidden from django.utils.translation import ugettext as _ -from tixlbase.models import EventPermission +from pretixbase.models import EventPermission def event_permission_required(permission): diff --git a/src/tixlcontrol/signals.py b/src/pretixcontrol/signals.py similarity index 80% rename from src/tixlcontrol/signals.py rename to src/pretixcontrol/signals.py index 7f5d9ff73..3b7269f3f 100644 --- a/src/tixlcontrol/signals.py +++ b/src/pretixcontrol/signals.py @@ -1,4 +1,4 @@ -from tixlbase.signals import EventPluginSignal +from pretixbase.signals import EventPluginSignal """ diff --git a/src/tixlcontrol/static/tixlcontrol/js/ui/main.js b/src/pretixcontrol/static/pretixcontrol/js/ui/main.js similarity index 100% rename from src/tixlcontrol/static/tixlcontrol/js/ui/main.js rename to src/pretixcontrol/static/pretixcontrol/js/ui/main.js diff --git a/src/tixlcontrol/static/tixlcontrol/less/auth.less b/src/pretixcontrol/static/pretixcontrol/less/auth.less similarity index 79% rename from src/tixlcontrol/static/tixlcontrol/less/auth.less rename to src/pretixcontrol/static/pretixcontrol/less/auth.less index 527390d5b..a15ed8e70 100644 --- a/src/tixlcontrol/static/tixlcontrol/less/auth.less +++ b/src/pretixcontrol/static/pretixcontrol/less/auth.less @@ -1,4 +1,4 @@ -@import "../../../../tixlbase/static/bootstrap/less/bootstrap.less"; +@import "../../../../pretixbase/static/bootstrap/less/bootstrap.less"; body { background: #eee; diff --git a/src/tixlcontrol/static/tixlcontrol/less/forms.less b/src/pretixcontrol/static/pretixcontrol/less/forms.less similarity index 100% rename from src/tixlcontrol/static/tixlcontrol/less/forms.less rename to src/pretixcontrol/static/pretixcontrol/less/forms.less diff --git a/src/pretixcontrol/static/pretixcontrol/less/main.less b/src/pretixcontrol/static/pretixcontrol/less/main.less new file mode 100644 index 000000000..404452891 --- /dev/null +++ b/src/pretixcontrol/static/pretixcontrol/less/main.less @@ -0,0 +1,4 @@ +@import "../../../../pretixbase/static/bootstrap/less/bootstrap.less"; +@import "../../../../pretixbase/static/fontawesome/less/font-awesome.less"; +@fa-font-path: "../../fontawesome/fonts"; +@import "forms.less"; diff --git a/src/tixlcontrol/templates/tixlcontrol/auth/base.html b/src/pretixcontrol/templates/pretixcontrol/auth/base.html similarity index 67% rename from src/tixlcontrol/templates/tixlcontrol/auth/base.html rename to src/pretixcontrol/templates/pretixcontrol/auth/base.html index a04f16365..6353b53cf 100644 --- a/src/tixlcontrol/templates/tixlcontrol/auth/base.html +++ b/src/pretixcontrol/templates/pretixcontrol/auth/base.html @@ -6,7 +6,7 @@ {{ settings.TIXL_INSTANCE_NAME }} {% compress css %} - + {% endcompress %} @@ -14,9 +14,9 @@ {% block content %} {% endblock %}
- {% with "href='http://tixl.de'" as a_attr %} + {% with "href='http://pretix.de'" as a_attr %} {% blocktrans trimmed %} - powered by tixl + powered by pretix {% endblocktrans %} {% endwith %}
diff --git a/src/tixlcontrol/templates/tixlcontrol/auth/login.html b/src/pretixcontrol/templates/pretixcontrol/auth/login.html similarity index 90% rename from src/tixlcontrol/templates/tixlcontrol/auth/login.html rename to src/pretixcontrol/templates/pretixcontrol/auth/login.html index 0d5f1ff0f..386023087 100644 --- a/src/tixlcontrol/templates/tixlcontrol/auth/login.html +++ b/src/pretixcontrol/templates/pretixcontrol/auth/login.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/auth/base.html" %} +{% extends "pretixcontrol/auth/base.html" %} {% load bootstrap3 %} {% load i18n %} {% block content %} diff --git a/src/tixlcontrol/templates/tixlcontrol/base.html b/src/pretixcontrol/templates/pretixcontrol/base.html similarity index 91% rename from src/tixlcontrol/templates/tixlcontrol/base.html rename to src/pretixcontrol/templates/pretixcontrol/base.html index fd6121bed..b4d086c18 100644 --- a/src/tixlcontrol/templates/tixlcontrol/base.html +++ b/src/pretixcontrol/templates/pretixcontrol/base.html @@ -6,13 +6,13 @@ {% block title %}{% endblock %}{% if url_name != "index" %} :: {% endif %}{{ settings.TIXL_INSTANCE_NAME }} {% compress css %} - + {% endcompress %} {% compress js %} - + {% endcompress %} diff --git a/src/tixlcontrol/templates/tixlcontrol/event/base.html b/src/pretixcontrol/templates/pretixcontrol/event/base.html similarity index 96% rename from src/tixlcontrol/templates/tixlcontrol/event/base.html rename to src/pretixcontrol/templates/pretixcontrol/event/base.html index 95db6fd9b..31c970b71 100644 --- a/src/tixlcontrol/templates/tixlcontrol/event/base.html +++ b/src/pretixcontrol/templates/pretixcontrol/event/base.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/base.html" %} +{% extends "pretixcontrol/base.html" %} {% load i18n %} {% block nav %} diff --git a/src/tixlcontrol/templates/tixlcontrol/event/index.html b/src/pretixcontrol/templates/pretixcontrol/event/index.html similarity index 75% rename from src/tixlcontrol/templates/tixlcontrol/event/index.html rename to src/pretixcontrol/templates/pretixcontrol/event/index.html index c79804e8d..6991961f7 100644 --- a/src/tixlcontrol/templates/tixlcontrol/event/index.html +++ b/src/pretixcontrol/templates/pretixcontrol/event/index.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/event/base.html" %} +{% extends "pretixcontrol/event/base.html" %} {% load i18n %} {% block title %}{{ request.event.name }}{% endblock %} {% block content %} diff --git a/src/tixlcontrol/templates/tixlcontrol/event/plugins.html b/src/pretixcontrol/templates/pretixcontrol/event/plugins.html similarity index 96% rename from src/tixlcontrol/templates/tixlcontrol/event/plugins.html rename to src/pretixcontrol/templates/pretixcontrol/event/plugins.html index d144e6a9d..97590cc1c 100644 --- a/src/tixlcontrol/templates/tixlcontrol/event/plugins.html +++ b/src/pretixcontrol/templates/pretixcontrol/event/plugins.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/event/settings_base.html" %} +{% extends "pretixcontrol/event/settings_base.html" %} {% load i18n %} {% load bootstrap3 %} {% block inside %} diff --git a/src/tixlcontrol/templates/tixlcontrol/event/settings.html b/src/pretixcontrol/templates/pretixcontrol/event/settings.html similarity index 96% rename from src/tixlcontrol/templates/tixlcontrol/event/settings.html rename to src/pretixcontrol/templates/pretixcontrol/event/settings.html index 7049c51b9..cce15645e 100644 --- a/src/tixlcontrol/templates/tixlcontrol/event/settings.html +++ b/src/pretixcontrol/templates/pretixcontrol/event/settings.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/event/settings_base.html" %} +{% extends "pretixcontrol/event/settings_base.html" %} {% load i18n %} {% load bootstrap3 %} {% block inside %} diff --git a/src/tixlcontrol/templates/tixlcontrol/event/settings_base.html b/src/pretixcontrol/templates/pretixcontrol/event/settings_base.html similarity index 93% rename from src/tixlcontrol/templates/tixlcontrol/event/settings_base.html rename to src/pretixcontrol/templates/pretixcontrol/event/settings_base.html index 09ac6dea3..e753a1508 100644 --- a/src/tixlcontrol/templates/tixlcontrol/event/settings_base.html +++ b/src/pretixcontrol/templates/pretixcontrol/event/settings_base.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/event/base.html" %} +{% extends "pretixcontrol/event/base.html" %} {% load i18n %} {% load bootstrap3 %} {% block title %}{{ request.event.name }}{% endblock %} diff --git a/src/tixlcontrol/templates/tixlcontrol/events/index.html b/src/pretixcontrol/templates/pretixcontrol/events/index.html similarity index 95% rename from src/tixlcontrol/templates/tixlcontrol/events/index.html rename to src/pretixcontrol/templates/pretixcontrol/events/index.html index ec250cac6..73836b663 100644 --- a/src/tixlcontrol/templates/tixlcontrol/events/index.html +++ b/src/pretixcontrol/templates/pretixcontrol/events/index.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/base.html" %} +{% extends "pretixcontrol/base.html" %} {% load i18n %} {% block title %}{% trans "Events" %}{% endblock %} {% block content %} diff --git a/src/tixlcontrol/templates/tixlcontrol/item/base.html b/src/pretixcontrol/templates/pretixcontrol/item/base.html similarity index 97% rename from src/tixlcontrol/templates/tixlcontrol/item/base.html rename to src/pretixcontrol/templates/pretixcontrol/item/base.html index ac20434a8..aad5d1df0 100644 --- a/src/tixlcontrol/templates/tixlcontrol/item/base.html +++ b/src/pretixcontrol/templates/pretixcontrol/item/base.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/event/base.html" %} +{% extends "pretixcontrol/event/base.html" %} {% load i18n %} {% block title %}{{ item.name }} :: {% trans "Item" %}{% endblock %} {% block content %} diff --git a/src/tixlcontrol/templates/tixlcontrol/item/index.html b/src/pretixcontrol/templates/pretixcontrol/item/index.html similarity index 96% rename from src/tixlcontrol/templates/tixlcontrol/item/index.html rename to src/pretixcontrol/templates/pretixcontrol/item/index.html index 4b9d43886..b9269e500 100644 --- a/src/tixlcontrol/templates/tixlcontrol/item/index.html +++ b/src/pretixcontrol/templates/pretixcontrol/item/index.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/item/base.html" %} +{% extends "pretixcontrol/item/base.html" %} {% load i18n %} {% load bootstrap3 %} {% block inside %} diff --git a/src/tixlcontrol/templates/tixlcontrol/item/restrictions.html b/src/pretixcontrol/templates/pretixcontrol/item/restrictions.html similarity index 98% rename from src/tixlcontrol/templates/tixlcontrol/item/restrictions.html rename to src/pretixcontrol/templates/pretixcontrol/item/restrictions.html index 4b82f1933..4b2d12222 100644 --- a/src/tixlcontrol/templates/tixlcontrol/item/restrictions.html +++ b/src/pretixcontrol/templates/pretixcontrol/item/restrictions.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/item/base.html" %} +{% extends "pretixcontrol/item/base.html" %} {% load i18n %} {% load bootstrap3 %} {% load formset_tags %} diff --git a/src/tixlcontrol/templates/tixlcontrol/item/variations_0d.html b/src/pretixcontrol/templates/pretixcontrol/item/variations_0d.html similarity index 78% rename from src/tixlcontrol/templates/tixlcontrol/item/variations_0d.html rename to src/pretixcontrol/templates/pretixcontrol/item/variations_0d.html index 61851ceb4..bbcf7b53a 100644 --- a/src/tixlcontrol/templates/tixlcontrol/item/variations_0d.html +++ b/src/pretixcontrol/templates/pretixcontrol/item/variations_0d.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/item/base.html" %} +{% extends "pretixcontrol/item/base.html" %} {% load i18n %} {% load bootstrap3 %} {% block inside %} diff --git a/src/tixlcontrol/templates/tixlcontrol/item/variations_1d.html b/src/pretixcontrol/templates/pretixcontrol/item/variations_1d.html similarity index 94% rename from src/tixlcontrol/templates/tixlcontrol/item/variations_1d.html rename to src/pretixcontrol/templates/pretixcontrol/item/variations_1d.html index 480d42d3d..556352905 100644 --- a/src/tixlcontrol/templates/tixlcontrol/item/variations_1d.html +++ b/src/pretixcontrol/templates/pretixcontrol/item/variations_1d.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/item/base.html" %} +{% extends "pretixcontrol/item/base.html" %} {% load i18n %} {% load bootstrap3 %} {% block inside %} diff --git a/src/tixlcontrol/templates/tixlcontrol/item/variations_nd.html b/src/pretixcontrol/templates/pretixcontrol/item/variations_nd.html similarity index 97% rename from src/tixlcontrol/templates/tixlcontrol/item/variations_nd.html rename to src/pretixcontrol/templates/pretixcontrol/item/variations_nd.html index 40422df7c..428cbe618 100644 --- a/src/tixlcontrol/templates/tixlcontrol/item/variations_nd.html +++ b/src/pretixcontrol/templates/pretixcontrol/item/variations_nd.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/item/base.html" %} +{% extends "pretixcontrol/item/base.html" %} {% load i18n %} {% load bootstrap3 %} {% block inside %} diff --git a/src/tixlcontrol/templates/tixlcontrol/items/base.html b/src/pretixcontrol/templates/pretixcontrol/items/base.html similarity index 96% rename from src/tixlcontrol/templates/tixlcontrol/items/base.html rename to src/pretixcontrol/templates/pretixcontrol/items/base.html index a9b6c3c5c..c96a277c6 100644 --- a/src/tixlcontrol/templates/tixlcontrol/items/base.html +++ b/src/pretixcontrol/templates/pretixcontrol/items/base.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/event/base.html" %} +{% extends "pretixcontrol/event/base.html" %} {% load i18n %} {% block title %}{% trans "Items" %}{% endblock %} {% block content %} diff --git a/src/tixlcontrol/templates/tixlcontrol/items/categories.html b/src/pretixcontrol/templates/pretixcontrol/items/categories.html similarity index 97% rename from src/tixlcontrol/templates/tixlcontrol/items/categories.html rename to src/pretixcontrol/templates/pretixcontrol/items/categories.html index 728a564da..34d3436e9 100644 --- a/src/tixlcontrol/templates/tixlcontrol/items/categories.html +++ b/src/pretixcontrol/templates/pretixcontrol/items/categories.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/items/base.html" %} +{% extends "pretixcontrol/items/base.html" %} {% load i18n %} {% block title %}{% trans "Item categories" %}{% endblock %} {% block inside %} diff --git a/src/tixlcontrol/templates/tixlcontrol/items/category.html b/src/pretixcontrol/templates/pretixcontrol/items/category.html similarity index 93% rename from src/tixlcontrol/templates/tixlcontrol/items/category.html rename to src/pretixcontrol/templates/pretixcontrol/items/category.html index 3e2a8d595..ef08b5041 100644 --- a/src/tixlcontrol/templates/tixlcontrol/items/category.html +++ b/src/pretixcontrol/templates/pretixcontrol/items/category.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/items/base.html" %} +{% extends "pretixcontrol/items/base.html" %} {% load i18n %} {% load bootstrap3 %} {% block title %}{% trans "Item category" %}{% endblock %} diff --git a/src/tixlcontrol/templates/tixlcontrol/items/category_delete.html b/src/pretixcontrol/templates/pretixcontrol/items/category_delete.html similarity index 94% rename from src/tixlcontrol/templates/tixlcontrol/items/category_delete.html rename to src/pretixcontrol/templates/pretixcontrol/items/category_delete.html index af6d03be0..f31a819f4 100644 --- a/src/tixlcontrol/templates/tixlcontrol/items/category_delete.html +++ b/src/pretixcontrol/templates/pretixcontrol/items/category_delete.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/items/base.html" %} +{% extends "pretixcontrol/items/base.html" %} {% load i18n %} {% load bootstrap3 %} {% block title %}{% trans "Delete item category" %}{% endblock %} diff --git a/src/tixlcontrol/templates/tixlcontrol/items/index.html b/src/pretixcontrol/templates/pretixcontrol/items/index.html similarity index 94% rename from src/tixlcontrol/templates/tixlcontrol/items/index.html rename to src/pretixcontrol/templates/pretixcontrol/items/index.html index 297300784..801388ef8 100644 --- a/src/tixlcontrol/templates/tixlcontrol/items/index.html +++ b/src/pretixcontrol/templates/pretixcontrol/items/index.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/items/base.html" %} +{% extends "pretixcontrol/items/base.html" %} {% load i18n %} {% block title %}{% trans "Items" %}{% endblock %} {% block inside %} diff --git a/src/tixlcontrol/templates/tixlcontrol/items/properties.html b/src/pretixcontrol/templates/pretixcontrol/items/properties.html similarity index 96% rename from src/tixlcontrol/templates/tixlcontrol/items/properties.html rename to src/pretixcontrol/templates/pretixcontrol/items/properties.html index c6bafd55f..c24e753bc 100644 --- a/src/tixlcontrol/templates/tixlcontrol/items/properties.html +++ b/src/pretixcontrol/templates/pretixcontrol/items/properties.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/items/base.html" %} +{% extends "pretixcontrol/items/base.html" %} {% load i18n %} {% block title %}{% trans "Item properties" %}{% endblock %} {% block inside %} diff --git a/src/tixlcontrol/templates/tixlcontrol/items/property.html b/src/pretixcontrol/templates/pretixcontrol/items/property.html similarity index 98% rename from src/tixlcontrol/templates/tixlcontrol/items/property.html rename to src/pretixcontrol/templates/pretixcontrol/items/property.html index 70db5c7a4..b289292ef 100644 --- a/src/tixlcontrol/templates/tixlcontrol/items/property.html +++ b/src/pretixcontrol/templates/pretixcontrol/items/property.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/items/base.html" %} +{% extends "pretixcontrol/items/base.html" %} {% load i18n %} {% load bootstrap3 %} {% load formset_tags %} diff --git a/src/tixlcontrol/templates/tixlcontrol/items/property_delete.html b/src/pretixcontrol/templates/pretixcontrol/items/property_delete.html similarity index 96% rename from src/tixlcontrol/templates/tixlcontrol/items/property_delete.html rename to src/pretixcontrol/templates/pretixcontrol/items/property_delete.html index c6f3ef822..b617aceab 100644 --- a/src/tixlcontrol/templates/tixlcontrol/items/property_delete.html +++ b/src/pretixcontrol/templates/pretixcontrol/items/property_delete.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/items/base.html" %} +{% extends "pretixcontrol/items/base.html" %} {% load i18n %} {% load bootstrap3 %} {% block title %}{% trans "Delete item property" %}{% endblock %} diff --git a/src/tixlcontrol/templates/tixlcontrol/items/question.html b/src/pretixcontrol/templates/pretixcontrol/items/question.html similarity index 94% rename from src/tixlcontrol/templates/tixlcontrol/items/question.html rename to src/pretixcontrol/templates/pretixcontrol/items/question.html index d7bb84f75..3f0d3e5d9 100644 --- a/src/tixlcontrol/templates/tixlcontrol/items/question.html +++ b/src/pretixcontrol/templates/pretixcontrol/items/question.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/items/base.html" %} +{% extends "pretixcontrol/items/base.html" %} {% load i18n %} {% load bootstrap3 %} {% block title %}{% trans "Question" %}{% endblock %} diff --git a/src/tixlcontrol/templates/tixlcontrol/items/question_delete.html b/src/pretixcontrol/templates/pretixcontrol/items/question_delete.html similarity index 96% rename from src/tixlcontrol/templates/tixlcontrol/items/question_delete.html rename to src/pretixcontrol/templates/pretixcontrol/items/question_delete.html index 762d3ae3f..d83da6b2b 100644 --- a/src/tixlcontrol/templates/tixlcontrol/items/question_delete.html +++ b/src/pretixcontrol/templates/pretixcontrol/items/question_delete.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/items/base.html" %} +{% extends "pretixcontrol/items/base.html" %} {% load i18n %} {% load bootstrap3 %} {% block title %}{% trans "Delete question" %}{% endblock %} diff --git a/src/tixlcontrol/templates/tixlcontrol/items/questions.html b/src/pretixcontrol/templates/pretixcontrol/items/questions.html similarity index 96% rename from src/tixlcontrol/templates/tixlcontrol/items/questions.html rename to src/pretixcontrol/templates/pretixcontrol/items/questions.html index 3c949f5fc..239a66924 100644 --- a/src/tixlcontrol/templates/tixlcontrol/items/questions.html +++ b/src/pretixcontrol/templates/pretixcontrol/items/questions.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/items/base.html" %} +{% extends "pretixcontrol/items/base.html" %} {% load i18n %} {% block title %}{% trans "Questions" %}{% endblock %} {% block inside %} diff --git a/src/tixlcontrol/templates/tixlcontrol/items/quota.html b/src/pretixcontrol/templates/pretixcontrol/items/quota.html similarity index 97% rename from src/tixlcontrol/templates/tixlcontrol/items/quota.html rename to src/pretixcontrol/templates/pretixcontrol/items/quota.html index a9d4efebf..428724fad 100644 --- a/src/tixlcontrol/templates/tixlcontrol/items/quota.html +++ b/src/pretixcontrol/templates/pretixcontrol/items/quota.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/items/base.html" %} +{% extends "pretixcontrol/items/base.html" %} {% load i18n %} {% load bootstrap3 %} {% block title %}{% trans "Quota" %}{% endblock %} diff --git a/src/tixlcontrol/templates/tixlcontrol/items/quota_delete.html b/src/pretixcontrol/templates/pretixcontrol/items/quota_delete.html similarity index 96% rename from src/tixlcontrol/templates/tixlcontrol/items/quota_delete.html rename to src/pretixcontrol/templates/pretixcontrol/items/quota_delete.html index 2e33ff06d..7b121d4b9 100644 --- a/src/tixlcontrol/templates/tixlcontrol/items/quota_delete.html +++ b/src/pretixcontrol/templates/pretixcontrol/items/quota_delete.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/items/base.html" %} +{% extends "pretixcontrol/items/base.html" %} {% load i18n %} {% load bootstrap3 %} {% block title %}{% trans "Delete quota" %}{% endblock %} diff --git a/src/tixlcontrol/templates/tixlcontrol/items/quotas.html b/src/pretixcontrol/templates/pretixcontrol/items/quotas.html similarity index 97% rename from src/tixlcontrol/templates/tixlcontrol/items/quotas.html rename to src/pretixcontrol/templates/pretixcontrol/items/quotas.html index 5a12b0ea6..4a0375f4b 100644 --- a/src/tixlcontrol/templates/tixlcontrol/items/quotas.html +++ b/src/pretixcontrol/templates/pretixcontrol/items/quotas.html @@ -1,4 +1,4 @@ -{% extends "tixlcontrol/items/base.html" %} +{% extends "pretixcontrol/items/base.html" %} {% load i18n %} {% block title %}{% trans "Quotas" %}{% endblock %} {% block inside %} diff --git a/src/tixlcontrol/tests/__init__.py b/src/pretixcontrol/tests/__init__.py similarity index 100% rename from src/tixlcontrol/tests/__init__.py rename to src/pretixcontrol/tests/__init__.py diff --git a/src/tixlcontrol/tests/test_auth.py b/src/pretixcontrol/tests/test_auth.py similarity index 97% rename from src/tixlcontrol/tests/test_auth.py rename to src/pretixcontrol/tests/test_auth.py index 4bd3c3e2f..6a0511d7f 100644 --- a/src/tixlcontrol/tests/test_auth.py +++ b/src/pretixcontrol/tests/test_auth.py @@ -1,7 +1,7 @@ from django.test import TestCase, Client -from tixlbase.models import User -from tixlbase.tests import BrowserTest, on_platforms +from pretixbase.models import User +from pretixbase.tests import BrowserTest, on_platforms @on_platforms() diff --git a/src/tixlcontrol/tests/test_events.py b/src/pretixcontrol/tests/test_events.py similarity index 86% rename from src/tixlcontrol/tests/test_events.py rename to src/pretixcontrol/tests/test_events.py index c63e11117..edf592df2 100644 --- a/src/tixlcontrol/tests/test_events.py +++ b/src/pretixcontrol/tests/test_events.py @@ -1,6 +1,6 @@ import datetime -from tixlbase.models import User, Organizer, Event, OrganizerPermission, EventPermission -from tixlbase.tests import BrowserTest, on_platforms +from pretixbase.models import User, Organizer, Event, OrganizerPermission, EventPermission +from pretixbase.tests import BrowserTest, on_platforms @on_platforms() @@ -54,8 +54,8 @@ class EventsTest(BrowserTest): self.driver.get('%s/control/event/%s/%s/settings/plugins' % (self.live_server_url, self.orga1.slug, self.event1.slug)) self.assertIn("Restriction by time", self.driver.find_element_by_class_name("form-plugins").text) - self.assertIn("Enable", self.driver.find_element_by_name("plugin:tixlplugins.timerestriction").text) - self.driver.find_element_by_name("plugin:tixlplugins.timerestriction").click() - self.assertIn("Disable", self.driver.find_element_by_name("plugin:tixlplugins.timerestriction").text) - self.driver.find_element_by_name("plugin:tixlplugins.timerestriction").click() - self.assertIn("Enable", self.driver.find_element_by_name("plugin:tixlplugins.timerestriction").text) + self.assertIn("Enable", self.driver.find_element_by_name("plugin:pretixplugins.timerestriction").text) + self.driver.find_element_by_name("plugin:pretixplugins.timerestriction").click() + self.assertIn("Disable", self.driver.find_element_by_name("plugin:pretixplugins.timerestriction").text) + self.driver.find_element_by_name("plugin:pretixplugins.timerestriction").click() + self.assertIn("Enable", self.driver.find_element_by_name("plugin:pretixplugins.timerestriction").text) diff --git a/src/tixlcontrol/tests/test_items.py b/src/pretixcontrol/tests/test_items.py similarity index 98% rename from src/tixlcontrol/tests/test_items.py rename to src/pretixcontrol/tests/test_items.py index aaf400fe2..4aba2e1ff 100644 --- a/src/tixlcontrol/tests/test_items.py +++ b/src/pretixcontrol/tests/test_items.py @@ -1,9 +1,9 @@ import time import datetime from selenium.webdriver.support.select import Select -from tixlbase.models import User, Organizer, Event, OrganizerPermission, EventPermission, ItemCategory, Property, \ +from pretixbase.models import User, Organizer, Event, OrganizerPermission, EventPermission, ItemCategory, Property, \ PropertyValue, Question, Quota, Item -from tixlbase.tests import BrowserTest, on_platforms +from pretixbase.tests import BrowserTest, on_platforms class ItemFormTest(BrowserTest): diff --git a/src/tixlcontrol/tests/test_permissions.py b/src/pretixcontrol/tests/test_permissions.py similarity index 96% rename from src/tixlcontrol/tests/test_permissions.py rename to src/pretixcontrol/tests/test_permissions.py index 94aa856fc..90fa01ad8 100644 --- a/src/tixlcontrol/tests/test_permissions.py +++ b/src/pretixcontrol/tests/test_permissions.py @@ -1,7 +1,7 @@ from django.test import TestCase, Client from django.utils.timezone import now -from tixlbase.models import Event, Organizer, User, EventPermission +from pretixbase.models import Event, Organizer, User, EventPermission class PermissionMiddlewareTest(TestCase): diff --git a/src/tixlcontrol/urls.py b/src/pretixcontrol/urls.py similarity index 94% rename from src/tixlcontrol/urls.py rename to src/pretixcontrol/urls.py index f7bb3be77..fe5113b39 100644 --- a/src/tixlcontrol/urls.py +++ b/src/pretixcontrol/urls.py @@ -1,22 +1,22 @@ from django.conf.urls import patterns, url, include -from tixlcontrol.views import main, event, item +from pretixcontrol.views import main, event, item urlpatterns = patterns('',) urlpatterns += patterns( - 'tixlcontrol.views.auth', + 'pretixcontrol.views.auth', url(r'^logout$', 'logout', name='auth.logout'), url(r'^login$', 'login', name='auth.login'), ) urlpatterns += patterns( - 'tixlcontrol.views.main', + 'pretixcontrol.views.main', url(r'^$', 'index', name='index'), url(r'^events/$', main.EventList.as_view(), name='events'), ) urlpatterns += patterns( - 'tixlcontrol.views.event', + 'pretixcontrol.views.event', url(r'^event/(?P[^/]+)/(?P[^/]+)/', include( patterns( - 'tixlcontrol.views', + 'pretixcontrol.views', url(r'^$', 'event.index', name='event.index'), url(r'^settings/$', event.EventUpdate.as_view(), name='event.settings'), url(r'^settings/plugins$', event.EventPlugins.as_view(), name='event.settings.plugins'), diff --git a/src/tixlcontrol/views/__init__.py b/src/pretixcontrol/views/__init__.py similarity index 100% rename from src/tixlcontrol/views/__init__.py rename to src/pretixcontrol/views/__init__.py diff --git a/src/tixlcontrol/views/auth.py b/src/pretixcontrol/views/auth.py similarity index 97% rename from src/tixlcontrol/views/auth.py rename to src/pretixcontrol/views/auth.py index 56dcec29e..480a396ad 100644 --- a/src/tixlcontrol/views/auth.py +++ b/src/pretixcontrol/views/auth.py @@ -64,7 +64,7 @@ def login(request): else: form = AuthenticationForm() ctx['form'] = form - return render(request, 'tixlcontrol/auth/login.html', ctx) + return render(request, 'pretixcontrol/auth/login.html', ctx) def logout(request): diff --git a/src/tixlcontrol/views/event.py b/src/pretixcontrol/views/event.py similarity index 89% rename from src/tixlcontrol/views/event.py rename to src/pretixcontrol/views/event.py index 289664091..8c5a7eedf 100644 --- a/src/tixlcontrol/views/event.py +++ b/src/pretixcontrol/views/event.py @@ -7,10 +7,10 @@ from django.utils.translation import ugettext_lazy as _ from django.core.urlresolvers import reverse from pytz import common_timezones -from tixlbase.forms import VersionedModelForm +from pretixbase.forms import VersionedModelForm -from tixlbase.models import Event -from tixlcontrol.permissions import EventPermissionRequiredMixin +from pretixbase.models import Event +from pretixcontrol.permissions import EventPermissionRequiredMixin class EventUpdateForm(VersionedModelForm): @@ -50,7 +50,7 @@ class EventUpdateForm(VersionedModelForm): class EventUpdate(EventPermissionRequiredMixin, UpdateView): model = Event form_class = EventUpdateForm - template_name = 'tixlcontrol/event/settings.html' + template_name = 'pretixcontrol/event/settings.html' permission = 'can_change_settings' def get_object(self, queryset=None) -> Event: @@ -68,13 +68,13 @@ class EventPlugins(EventPermissionRequiredMixin, TemplateView, SingleObjectMixin model = Event context_object_name = 'event' permission = 'can_change_settings' - template_name = 'tixlcontrol/event/plugins.html' + template_name = 'pretixcontrol/event/plugins.html' def get_object(self, queryset=None) -> Event: return self.request.event def get_context_data(self, *args, **kwargs) -> dict: - from tixlbase.plugins import get_all_plugins + from pretixbase.plugins import get_all_plugins context = super().get_context_data(*args, **kwargs) context['plugins'] = [p for p in get_all_plugins() if not p.name.startswith('.')] context['plugins_active'] = self.object.get_plugins() @@ -107,4 +107,4 @@ class EventPlugins(EventPermissionRequiredMixin, TemplateView, SingleObjectMixin def index(request, organizer, event): - return render(request, 'tixlcontrol/event/index.html', {}) + return render(request, 'pretixcontrol/event/index.html', {}) diff --git a/src/tixlcontrol/views/forms.py b/src/pretixcontrol/views/forms.py similarity index 97% rename from src/tixlcontrol/views/forms.py rename to src/pretixcontrol/views/forms.py index 2a569205a..578a6b06c 100644 --- a/src/tixlcontrol/views/forms.py +++ b/src/pretixcontrol/views/forms.py @@ -7,9 +7,9 @@ from django.utils.encoding import force_text from django.utils.html import format_html from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ -from tixlbase.forms import VersionedModelForm +from pretixbase.forms import VersionedModelForm -from tixlbase.models import ItemVariation, PropertyValue, Item +from pretixbase.models import ItemVariation, PropertyValue, Item class TolerantFormsetModelForm(VersionedModelForm): @@ -137,7 +137,7 @@ class VariationsFieldRenderer(forms.widgets.CheckboxFieldRenderer): start_tag = format_html('
', id_) if id_ else '
' output = [start_tag] - # TODO: This is very duplicate to tixlcontrol.views.item.ItemVariations.get_forms() + # TODO: This is very duplicate to pretixcontrol.views.item.ItemVariations.get_forms() # Find a common abstraction to avoid the repetition. if dimension == 0: output.append(format_html('{0}', _("not applicable"))) @@ -247,7 +247,7 @@ class VariationsField(forms.ModelMultipleChoiceField): As this field expects the non-standard keyword parameter ``item`` at initialization time, this is field is normally named ``variations`` - and lives inside a ``tixlcontrol.views.forms.RestrictionForm``, which + and lives inside a ``pretixcontrol.views.forms.RestrictionForm``, which does some magic to provide this parameter. """ @@ -294,7 +294,7 @@ class VariationsField(forms.ModelMultipleChoiceField): if self.item is None: raise ValueError( "VariationsField object was not properly initialized. Please" - "use a tixlcontrol.views.forms.RestrictionForm form instead of" + "use a pretixcontrol.views.forms.RestrictionForm form instead of" "a plain Django ModelForm" ) diff --git a/src/tixlcontrol/views/item.py b/src/pretixcontrol/views/item.py similarity index 94% rename from src/tixlcontrol/views/item.py rename to src/pretixcontrol/views/item.py index f512abd43..77326a6f4 100644 --- a/src/tixlcontrol/views/item.py +++ b/src/pretixcontrol/views/item.py @@ -12,20 +12,20 @@ from django.http import HttpResponseRedirect, HttpResponseForbidden from django.shortcuts import redirect from django.forms.models import inlineformset_factory from django.utils.translation import ugettext_lazy as _ -from tixlbase.forms import VersionedModelForm +from pretixbase.forms import VersionedModelForm -from tixlbase.models import ( +from pretixbase.models import ( Item, ItemCategory, Property, ItemVariation, PropertyValue, Question, Quota, Versionable) -from tixlcontrol.permissions import EventPermissionRequiredMixin, event_permission_required -from tixlcontrol.views.forms import TolerantFormsetModelForm, VariationsField -from tixlcontrol.signals import restriction_formset +from pretixcontrol.permissions import EventPermissionRequiredMixin, event_permission_required +from pretixcontrol.views.forms import TolerantFormsetModelForm, VariationsField +from pretixcontrol.signals import restriction_formset class ItemList(ListView): model = Item context_object_name = 'items' - template_name = 'tixlcontrol/items/index.html' + template_name = 'pretixcontrol/items/index.html' def get_queryset(self): return Item.objects.current.filter( @@ -46,7 +46,7 @@ class CategoryForm(VersionedModelForm): class CategoryDelete(EventPermissionRequiredMixin, DeleteView): model = ItemCategory form_class = CategoryForm - template_name = 'tixlcontrol/items/category_delete.html' + template_name = 'pretixcontrol/items/category_delete.html' permission = 'can_change_items' context_object_name = 'category' @@ -76,7 +76,7 @@ class CategoryDelete(EventPermissionRequiredMixin, DeleteView): class CategoryUpdate(EventPermissionRequiredMixin, UpdateView): model = ItemCategory form_class = CategoryForm - template_name = 'tixlcontrol/items/category.html' + template_name = 'pretixcontrol/items/category.html' permission = 'can_change_items' context_object_name = 'category' @@ -96,7 +96,7 @@ class CategoryUpdate(EventPermissionRequiredMixin, UpdateView): class CategoryCreate(EventPermissionRequiredMixin, CreateView): model = ItemCategory form_class = CategoryForm - template_name = 'tixlcontrol/items/category.html' + template_name = 'pretixcontrol/items/category.html' permission = 'can_change_items' context_object_name = 'category' @@ -114,7 +114,7 @@ class CategoryCreate(EventPermissionRequiredMixin, CreateView): class CategoryList(ListView): model = ItemCategory context_object_name = 'categories' - template_name = 'tixlcontrol/items/categories.html' + template_name = 'pretixcontrol/items/categories.html' def get_queryset(self): return self.request.event.categories.current.all() @@ -164,7 +164,7 @@ def category_move_down(request, organizer, event, category): class PropertyList(ListView): model = Property context_object_name = 'properties' - template_name = 'tixlcontrol/items/properties.html' + template_name = 'pretixcontrol/items/properties.html' def get_queryset(self): return Property.objects.current.filter( @@ -193,7 +193,7 @@ class PropertyValueForm(TolerantFormsetModelForm): class PropertyUpdate(EventPermissionRequiredMixin, UpdateView): model = Property form_class = PropertyForm - template_name = 'tixlcontrol/items/property.html' + template_name = 'pretixcontrol/items/property.html' permission = 'can_change_items' context_object_name = 'property' @@ -255,7 +255,7 @@ class PropertyUpdate(EventPermissionRequiredMixin, UpdateView): class PropertyCreate(EventPermissionRequiredMixin, CreateView): model = Property form_class = PropertyForm - template_name = 'tixlcontrol/items/property.html' + template_name = 'pretixcontrol/items/property.html' permission = 'can_change_items' context_object_name = 'property' @@ -304,7 +304,7 @@ class PropertyCreate(EventPermissionRequiredMixin, CreateView): class PropertyDelete(EventPermissionRequiredMixin, DeleteView): model = Property form_class = PropertyForm - template_name = 'tixlcontrol/items/property_delete.html' + template_name = 'pretixcontrol/items/property_delete.html' permission = 'can_change_items' context_object_name = 'property' @@ -343,7 +343,7 @@ class PropertyDelete(EventPermissionRequiredMixin, DeleteView): class QuestionList(ListView): model = Question context_object_name = 'questions' - template_name = 'tixlcontrol/items/questions.html' + template_name = 'pretixcontrol/items/questions.html' def get_queryset(self): return self.request.event.questions.current.all() @@ -363,7 +363,7 @@ class QuestionForm(VersionedModelForm): class QuestionDelete(EventPermissionRequiredMixin, DeleteView): model = Question - template_name = 'tixlcontrol/items/question_delete.html' + template_name = 'pretixcontrol/items/question_delete.html' permission = 'can_change_items' context_object_name = 'question' @@ -394,7 +394,7 @@ class QuestionDelete(EventPermissionRequiredMixin, DeleteView): class QuestionUpdate(EventPermissionRequiredMixin, UpdateView): model = Question form_class = QuestionForm - template_name = 'tixlcontrol/items/question.html' + template_name = 'pretixcontrol/items/question.html' permission = 'can_change_items' context_object_name = 'question' @@ -414,7 +414,7 @@ class QuestionUpdate(EventPermissionRequiredMixin, UpdateView): class QuestionCreate(EventPermissionRequiredMixin, CreateView): model = Question form_class = QuestionForm - template_name = 'tixlcontrol/items/question.html' + template_name = 'pretixcontrol/items/question.html' permission = 'can_change_items' context_object_name = 'question' @@ -432,7 +432,7 @@ class QuestionCreate(EventPermissionRequiredMixin, CreateView): class QuotaList(ListView): model = Quota context_object_name = 'quotas' - template_name = 'tixlcontrol/items/quotas.html' + template_name = 'pretixcontrol/items/quotas.html' def get_queryset(self): return Quota.objects.current.filter( @@ -511,7 +511,7 @@ class QuotaEditorMixin: res = super().form_valid(form) # The following commented-out checks are not necessary as both self.object.items # and self.object.variations can be expected empty due to the performance - # optimization of tixlbase.models.Versionable.clone_shallow() + # optimization of pretixbase.models.Versionable.clone_shallow() # items = self.object.items.all() # variations = self.object.variations.all() self.object = form.instance @@ -536,7 +536,7 @@ class QuotaEditorMixin: class QuotaCreate(EventPermissionRequiredMixin, QuotaEditorMixin, CreateView): model = Quota form_class = QuotaForm - template_name = 'tixlcontrol/items/quota.html' + template_name = 'pretixcontrol/items/quota.html' permission = 'can_change_items' context_object_name = 'quota' @@ -554,7 +554,7 @@ class QuotaCreate(EventPermissionRequiredMixin, QuotaEditorMixin, CreateView): class QuotaUpdate(EventPermissionRequiredMixin, QuotaEditorMixin, UpdateView): model = Quota form_class = QuotaForm - template_name = 'tixlcontrol/items/quota.html' + template_name = 'pretixcontrol/items/quota.html' permission = 'can_change_items' context_object_name = 'quota' @@ -573,7 +573,7 @@ class QuotaUpdate(EventPermissionRequiredMixin, QuotaEditorMixin, UpdateView): class QuotaDelete(EventPermissionRequiredMixin, DeleteView): model = Quota - template_name = 'tixlcontrol/items/quota_delete.html' + template_name = 'pretixcontrol/items/quota_delete.html' permission = 'can_change_items' context_object_name = 'quota' @@ -641,7 +641,7 @@ class ItemFormGeneral(VersionedModelForm): class ItemCreate(EventPermissionRequiredMixin, CreateView): form_class = ItemFormGeneral - template_name = 'tixlcontrol/item/index.html' + template_name = 'pretixcontrol/item/index.html' permission = 'can_change_items' def get_success_url(self) -> str: @@ -663,7 +663,7 @@ class ItemCreate(EventPermissionRequiredMixin, CreateView): class ItemUpdateGeneral(ItemDetailMixin, EventPermissionRequiredMixin, UpdateView): form_class = ItemFormGeneral - template_name = 'tixlcontrol/item/index.html' + template_name = 'pretixcontrol/item/index.html' permission = 'can_change_items' def get_success_url(self) -> str: @@ -822,11 +822,11 @@ class ItemVariations(ItemDetailMixin, EventPermissionRequiredMixin, TemplateView def get_template_names(self) -> "List[str]": if self.dimension == 0: - return ['tixlcontrol/item/variations_0d.html'] + return ['pretixcontrol/item/variations_0d.html'] elif self.dimension == 1: - return ['tixlcontrol/item/variations_1d.html'] + return ['pretixcontrol/item/variations_1d.html'] elif self.dimension >= 2: - return ['tixlcontrol/item/variations_nd.html'] + return ['pretixcontrol/item/variations_nd.html'] def get_context_data(self, **kwargs) -> dict: context = super().get_context_data(**kwargs) @@ -838,7 +838,7 @@ class ItemVariations(ItemDetailMixin, EventPermissionRequiredMixin, TemplateView class ItemRestrictions(ItemDetailMixin, EventPermissionRequiredMixin, TemplateView): permission = 'can_change_items' - template_name = 'tixlcontrol/item/restrictions.html' + template_name = 'pretixcontrol/item/restrictions.html' def get_formsets(self): responses = restriction_formset.send(self.object.event, item=self.object) diff --git a/src/tixlcontrol/views/main.py b/src/pretixcontrol/views/main.py similarity index 71% rename from src/tixlcontrol/views/main.py rename to src/pretixcontrol/views/main.py index a53cecf5d..ab6f50c88 100644 --- a/src/tixlcontrol/views/main.py +++ b/src/pretixcontrol/views/main.py @@ -1,13 +1,13 @@ from django.shortcuts import render from django.views.generic import ListView -from tixlbase.models import Event +from pretixbase.models import Event class EventList(ListView): model = Event context_object_name = 'events' - template_name = 'tixlcontrol/events/index.html' + template_name = 'pretixcontrol/events/index.html' def get_queryset(self): return Event.objects.current.filter( @@ -18,4 +18,4 @@ class EventList(ListView): def index(request): - return render(request, 'tixlcontrol/base.html', {}) + return render(request, 'pretixcontrol/base.html', {}) diff --git a/src/tixlplugins/__init__.py b/src/pretixplugins/__init__.py similarity index 100% rename from src/tixlplugins/__init__.py rename to src/pretixplugins/__init__.py diff --git a/src/tixlplugins/testdummy/__init__.py b/src/pretixplugins/testdummy/__init__.py similarity index 66% rename from src/tixlplugins/testdummy/__init__.py rename to src/pretixplugins/testdummy/__init__.py index 1d2574a3f..b2d111f0c 100644 --- a/src/tixlplugins/testdummy/__init__.py +++ b/src/pretixplugins/testdummy/__init__.py @@ -1,9 +1,9 @@ from django.apps import AppConfig -from tixlbase.plugins import PluginType +from pretixbase.plugins import PluginType class TestDummyApp(AppConfig): - name = 'tixlplugins.testdummy' + name = 'pretixplugins.testdummy' verbose_name = '.testdummy' class TixlPluginMeta: @@ -14,4 +14,4 @@ class TestDummyApp(AppConfig): def ready(self): from . import signals # NOQA -default_app_config = 'tixlplugins.testdummy.TestDummyApp' +default_app_config = 'pretixplugins.testdummy.TestDummyApp' diff --git a/src/tixlplugins/testdummy/models.py b/src/pretixplugins/testdummy/models.py similarity index 100% rename from src/tixlplugins/testdummy/models.py rename to src/pretixplugins/testdummy/models.py diff --git a/src/tixlplugins/testdummy/signals.py b/src/pretixplugins/testdummy/signals.py similarity index 75% rename from src/tixlplugins/testdummy/signals.py rename to src/pretixplugins/testdummy/signals.py index 8fbcde2a7..df00b52fa 100644 --- a/src/tixlplugins/testdummy/signals.py +++ b/src/pretixplugins/testdummy/signals.py @@ -1,6 +1,6 @@ from django.dispatch import receiver -from tixlbase.signals import determine_availability +from pretixbase.signals import determine_availability @receiver(determine_availability) diff --git a/src/tixlplugins/timerestriction/__init__.py b/src/pretixplugins/timerestriction/__init__.py similarity index 75% rename from src/tixlplugins/timerestriction/__init__.py rename to src/pretixplugins/timerestriction/__init__.py index 59dcecaac..7a258695c 100644 --- a/src/tixlplugins/timerestriction/__init__.py +++ b/src/pretixplugins/timerestriction/__init__.py @@ -1,16 +1,16 @@ from django.apps import AppConfig from django.utils.translation import ugettext_lazy as _ -from tixlbase.plugins import PluginType +from pretixbase.plugins import PluginType class TimeRestrictionApp(AppConfig): - name = 'tixlplugins.timerestriction' + name = 'pretixplugins.timerestriction' verbose_name = _("Time restriction") class TixlPluginMeta: type = PluginType.RESTRICTION name = _("Restriction by time") - author = _("the tixl team") + author = _("the pretix team") version = '1.0.0' description = _("This plugin adds the possibility to restrict the sale " + "of a given item or variation to a certain timeframe " + @@ -19,4 +19,4 @@ class TimeRestrictionApp(AppConfig): def ready(self): from . import signals # NOQA -default_app_config = 'tixlplugins.timerestriction.TimeRestrictionApp' +default_app_config = 'pretixplugins.timerestriction.TimeRestrictionApp' diff --git a/src/tixlplugins/timerestriction/migrations/0001_initial.py b/src/pretixplugins/timerestriction/migrations/0001_initial.py similarity index 73% rename from src/tixlplugins/timerestriction/migrations/0001_initial.py rename to src/pretixplugins/timerestriction/migrations/0001_initial.py index e412150bb..3f2806843 100644 --- a/src/tixlplugins/timerestriction/migrations/0001_initial.py +++ b/src/pretixplugins/timerestriction/migrations/0001_initial.py @@ -2,14 +2,14 @@ from __future__ import unicode_literals from django.db import models, migrations -import tixlbase.models +import pretixbase.models import versions.models class Migration(migrations.Migration): dependencies = [ - ('tixlbase', '0001_initial'), + ('pretixbase', '0001_initial'), ] operations = [ @@ -24,9 +24,9 @@ class Migration(migrations.Migration): ('timeframe_from', models.DateTimeField(verbose_name='Start of time frame')), ('timeframe_to', models.DateTimeField(verbose_name='End of time frame')), ('price', models.DecimalField(null=True, blank=True, verbose_name='Price in time frame', max_digits=7, decimal_places=2)), - ('event', versions.models.VersionedForeignKey(to='tixlbase.Event', related_name='restrictions_timerestriction_timerestriction', verbose_name='Event')), - ('item', versions.models.VersionedForeignKey(to='tixlbase.Item', blank=True, null=True, related_name='restrictions_timerestriction_timerestriction', verbose_name='Item')), - ('variations', tixlbase.models.VariationsField(to='tixlbase.ItemVariation', blank=True, verbose_name='Variations', related_name='restrictions_timerestriction_timerestriction')), + ('event', versions.models.VersionedForeignKey(to='pretixbase.Event', related_name='restrictions_timerestriction_timerestriction', verbose_name='Event')), + ('item', versions.models.VersionedForeignKey(to='pretixbase.Item', blank=True, null=True, related_name='restrictions_timerestriction_timerestriction', verbose_name='Item')), + ('variations', pretixbase.models.VariationsField(to='pretixbase.ItemVariation', blank=True, verbose_name='Variations', related_name='restrictions_timerestriction_timerestriction')), ], options={ 'verbose_name': 'Restriction', diff --git a/src/tixlplugins/timerestriction/migrations/__init__.py b/src/pretixplugins/timerestriction/migrations/__init__.py similarity index 100% rename from src/tixlplugins/timerestriction/migrations/__init__.py rename to src/pretixplugins/timerestriction/migrations/__init__.py diff --git a/src/tixlplugins/timerestriction/models.py b/src/pretixplugins/timerestriction/models.py similarity index 93% rename from src/tixlplugins/timerestriction/models.py rename to src/pretixplugins/timerestriction/models.py index 00167c5f6..c120e2133 100644 --- a/src/tixlplugins/timerestriction/models.py +++ b/src/pretixplugins/timerestriction/models.py @@ -1,7 +1,7 @@ from django.db import models from django.utils.translation import ugettext_lazy as _ -from tixlbase.models import BaseRestriction +from pretixbase.models import BaseRestriction class TimeRestriction(BaseRestriction): diff --git a/src/tixlplugins/timerestriction/signals.py b/src/pretixplugins/timerestriction/signals.py similarity index 95% rename from src/tixlplugins/timerestriction/signals.py rename to src/pretixplugins/timerestriction/signals.py index 6e286e75d..355d1b20e 100644 --- a/src/tixlplugins/timerestriction/signals.py +++ b/src/pretixplugins/timerestriction/signals.py @@ -3,10 +3,10 @@ from django.utils.timezone import now from django.utils.translation import ugettext_lazy as _ from django.forms.models import inlineformset_factory -from tixlbase.signals import determine_availability -from tixlbase.models import Item -from tixlcontrol.views.forms import VariationsField, RestrictionInlineFormset, RestrictionForm -from tixlcontrol.signals import restriction_formset +from pretixbase.signals import determine_availability +from pretixbase.models import Item +from pretixcontrol.views.forms import VariationsField, RestrictionInlineFormset, RestrictionForm +from pretixcontrol.signals import restriction_formset from .models import TimeRestriction diff --git a/src/tixlplugins/timerestriction/tests.py b/src/pretixplugins/timerestriction/tests.py similarity index 98% rename from src/tixlplugins/timerestriction/tests.py rename to src/pretixplugins/timerestriction/tests.py index c612d4667..dba9f0616 100644 --- a/src/tixlplugins/timerestriction/tests.py +++ b/src/pretixplugins/timerestriction/tests.py @@ -3,13 +3,13 @@ from datetime import timedelta from django.test import TestCase from django.utils.timezone import now -from tixlbase.models import ( +from pretixbase.models import ( Event, Organizer, Item, Property, PropertyValue, ItemVariation ) # Do NOT use relative imports here -from tixlplugins.timerestriction import signals -from tixlplugins.timerestriction.models import TimeRestriction +from pretixplugins.timerestriction import signals +from pretixplugins.timerestriction.models import TimeRestriction class TimeRestrictionTest(TestCase): diff --git a/src/tixlpresale/__init__.py b/src/pretixpresale/__init__.py similarity index 100% rename from src/tixlpresale/__init__.py rename to src/pretixpresale/__init__.py diff --git a/src/tixlpresale/admin.py b/src/pretixpresale/admin.py similarity index 100% rename from src/tixlpresale/admin.py rename to src/pretixpresale/admin.py diff --git a/src/tixlpresale/tests.py b/src/pretixpresale/tests.py similarity index 100% rename from src/tixlpresale/tests.py rename to src/pretixpresale/tests.py diff --git a/src/tixlpresale/views.py b/src/pretixpresale/views.py similarity index 100% rename from src/tixlpresale/views.py rename to src/pretixpresale/views.py diff --git a/src/requirements.txt b/src/requirements.txt index bc9c3a960..5aa4f7824 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -1,9 +1,9 @@ # Functional requirements -Django>=1.7 +Django==1.7.3 pytz django-bootstrap3 --e git+https://github.com/tixl/django-formset-js.git@master#egg=django-formset-js --e git+https://github.com/tixl/cleanerversion.git@tixl#egg=cleanerversion +-e git+https://github.com/pretix/django-formset-js.git@master#egg=django-formset-js +-e git+https://github.com/pretix/cleanerversion.git@pretix#egg=cleanerversion django-compressor # Deployment / static file compilation requirements @@ -28,5 +28,5 @@ coveralls coverage selenium # PyVirtualDisplay -# -e git+https://github.com/tixl/sauceclient.git@master#egg=sauceclient +# -e git+https://github.com/pretix/sauceclient.git@master#egg=sauceclient # travis diff --git a/src/tixlbase/static/bootstrap b/src/tixlbase/static/bootstrap deleted file mode 160000 index c06816216..000000000 --- a/src/tixlbase/static/bootstrap +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c068162161154a4b85110ea1e7dd3d7897ce2b72 diff --git a/src/tixlcontrol/static/tixlcontrol/less/main.less b/src/tixlcontrol/static/tixlcontrol/less/main.less deleted file mode 100644 index 001ae5cfc..000000000 --- a/src/tixlcontrol/static/tixlcontrol/less/main.less +++ /dev/null @@ -1,4 +0,0 @@ -@import "../../../../tixlbase/static/bootstrap/less/bootstrap.less"; -@import "../../../../tixlbase/static/fontawesome/less/font-awesome.less"; -@fa-font-path: "../../fontawesome/fonts"; -@import "forms.less";