diff --git a/res/logo.svg b/res/logo.svg
index 1930c8ea6..8bc5bf2dc 100644
--- a/res/logo.svg
+++ b/res/logo.svg
@@ -9,15 +9,16 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="294.15625"
- height="149.59375"
+ width="600"
+ height="400"
id="svg2"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.1 r"
sodipodi:docname="logo.svg"
- inkscape:export-filename="/home/raphael/proj/pretix/pretix/logo_draft.png"
- inkscape:export-xdpi="88.529999"
- inkscape:export-ydpi="88.529999">
+ inkscape:export-filename="/tmp/LOGO.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96"
+ viewBox="0 0 562.50001 375.00002">
+ transform="translate(-259.03125,-322.09374)">
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#3b1c4a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.91138947;marker:none;enable-background:accumulate"
+ d="m 297.38548,404.85558 v 65.16643 c 21.86016,0 39.6016,17.74144 39.6016,39.60159 0,21.86015 -17.74144,39.54187 -39.6016,39.54187 v 65.16644 h 280.37693 v -18.1582 h 5.73417 v 18.1582 h 199.68046 v -65.16644 c -0.02,4e-5 -0.0397,0 -0.0596,0 -21.86015,0 -39.6016,-17.68172 -39.6016,-39.54187 0,-21.86015 17.74145,-39.60159 39.6016,-39.60159 0.02,0 0.0397,-4e-5 0.0596,0 V 404.85558 H 583.49658 v 17.38169 h -5.73417 V 404.85558 Z M 577.76241,435.617 h 5.73417 v 26.75945 h -5.73417 z m 79.21068,24.53074 c 5.33405,0 9.60172,3.68466 9.60172,8.24287 0,4.5582 -4.26767,8.33993 -9.60172,8.33993 -5.2371,0 -9.50469,-3.78173 -9.50469,-8.33993 0,-4.55821 4.26759,-8.24287 9.50469,-8.24287 z m -25.28486,8.04874 v 15.32472 h 7.56717 v 12.02458 h -7.56717 v 23.47051 c 0,3.87934 1.35737,5.33473 4.0729,5.33473 1.35775,0 2.03951,-0.19461 3.49427,-0.77651 v 11.34514 c -1.35777,0.77585 -4.56174,1.84419 -8.829,1.84419 -11.73495,0 -17.16515,-7.17511 -17.16515,-16.19455 v -25.02351 h -5.43179 V 483.5212 h 5.43179 v -10.66944 z m -53.92582,7.5597 h 5.73417 v 26.75945 h -5.73417 z m -142.52917,6.79439 c 16.19618,0 27.15517,8.63124 27.15517,26.96104 0,16.48713 -9.6016,26.96105 -23.08227,26.96105 -3.29741,0 -6.01528,-0.38857 -7.37304,-0.77651 v 20.95062 H 413.50612 V 486.5264 c 4.94614,-2.32759 11.64087,-3.97583 21.72712,-3.97583 z m 95.30815,0 c 16.39014,0 24.14917,11.34479 23.17933,29.09269 l -30.45158,4.27076 c 1.1638,5.62501 4.16799,8.437 10.85985,8.437 6.20689,0 11.05633,-1.36007 13.96583,-2.81482 l 4.0729,11.2518 c -4.5582,2.23062 -10.6662,3.97584 -20.36451,3.97584 -17.06903,0 -26.08749,-11.54096 -26.08749,-27.25223 0,-15.71126 8.43552,-26.96104 24.82567,-26.96104 z m -34.25568,0.0113 c 1.70649,0.026 3.49392,0.0859 5.36084,0.18292 l -3.20307,12.80108 c -3.39442,-1.6487 -6.69185,-1.74642 -9.11643,-0.87356 v 41.121 h -18.42698 v -49.2668 c 5.3462,-2.63068 13.44024,-4.1463 25.38564,-3.96465 z m 151.47387,0.95943 h 18.42699 v 52.27202 h -18.42699 z m 25.29605,0 h 19.20348 l 6.30535,13.09227 h 0.19412 l 6.884,-13.09227 h 17.16517 l -15.22393,24.14622 16.67986,28.1258 h -20.3645 l -6.69361,-14.45115 h -0.19412 l -6.98104,14.45115 h -18.62112 l 16.38867,-26.96104 z m -143.29075,9.60175 c -5.43106,0 -8.43651,4.94275 -7.85461,14.05916 l 14.8394,-2.22871 c 0,-7.9526 -2.3296,-11.83045 -6.98479,-11.83045 z m -94.6287,0.19038 c -1.35776,0 -2.33024,0.19437 -3.20308,0.48532 v 31.4222 c 0.67888,0.29093 1.65112,0.48531 2.91189,0.48531 6.59487,0 9.31055,-5.42933 9.31055,-16.09748 0,-10.95908 -2.32753,-16.29535 -9.01936,-16.29535 z m 142.62623,22.58194 h 5.73417 v 26.75946 h -5.73417 z m 0,40.13918 h 5.73417 v 26.75946 h -5.73417 z"
+ id="rect3888"
+ inkscape:connector-curvature="0"
+ inkscape:export-filename="/tmp/LOGO.png"
+ inkscape:export-xdpi="88"
+ inkscape:export-ydpi="88" />
diff --git a/src/pretix/plugins/pretixdroid/__init__.py b/src/pretix/plugins/pretixdroid/__init__.py
index e210650c0..8557d27e7 100644
--- a/src/pretix/plugins/pretixdroid/__init__.py
+++ b/src/pretix/plugins/pretixdroid/__init__.py
@@ -6,14 +6,14 @@ from pretix import __version__ as version
class PretixdroidApp(AppConfig):
name = 'pretix.plugins.pretixdroid'
- verbose_name = _("pretixdroid API")
+ verbose_name = _("Check-in device API")
class PretixPluginMeta:
- name = _("pretixdroid API")
+ name = _("Check-in device API")
author = _("the pretix team")
version = version
visible = True
- description = _("This plugin allows you to use the pretixdroid Android app for your event.")
+ description = _("This plugin allows you to use the pretixdroid and pretixdesk apps for your event.")
def ready(self):
from . import signals # NOQA
diff --git a/src/pretix/plugins/pretixdroid/forms.py b/src/pretix/plugins/pretixdroid/forms.py
index 04e94910e..5eb2c51f5 100644
--- a/src/pretix/plugins/pretixdroid/forms.py
+++ b/src/pretix/plugins/pretixdroid/forms.py
@@ -6,11 +6,12 @@ from pretix.plugins.pretixdroid.models import AppConfiguration
class AppConfigurationForm(forms.ModelForm):
class Meta:
model = AppConfiguration
- fields = ('all_items', 'items', 'list', 'show_info', 'allow_search')
+ fields = ('all_items', 'items', 'list', 'show_info', 'allow_search', 'app')
widgets = {
'items': forms.CheckboxSelectMultiple(attrs={
'data-inverse-dependency': '#id_all_items'
}),
+ 'app': forms.RadioSelect
}
def __init__(self, **kwargs):
diff --git a/src/pretix/plugins/pretixdroid/migrations/0005_auto_20180106_2122.py b/src/pretix/plugins/pretixdroid/migrations/0005_auto_20180106_2122.py
new file mode 100644
index 000000000..8b8f79396
--- /dev/null
+++ b/src/pretix/plugins/pretixdroid/migrations/0005_auto_20180106_2122.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.8 on 2018-01-06 21:22
+from __future__ import unicode_literals
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('pretixdroid', '0004_auto_20171124_1657'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='appconfiguration',
+ name='app',
+ field=models.CharField(choices=[('pretixdroid', 'pretixdroid – for Android smartphones'), ('pretixdesk', 'pretixdesk – for desktop computers')], default='pretixdroid', max_length=190, verbose_name='Scan software'),
+ ),
+ migrations.AlterField(
+ model_name='appconfiguration',
+ name='allow_search',
+ field=models.BooleanField(default=True, help_text='If disabled, the device can not search for attendees by name. pretixdroid 1.6 or pretixdesk only.', verbose_name='Search allowed'),
+ ),
+ migrations.AlterField(
+ model_name='appconfiguration',
+ name='list',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='pretixbase.CheckinList', verbose_name='Check-in list'),
+ ),
+ migrations.AlterField(
+ model_name='appconfiguration',
+ name='show_info',
+ field=models.BooleanField(default=True, help_text='If disabled, the device can not see how many tickets exist and how many are already scanned. pretixdroid 1.6 or pretixdesk only.', verbose_name='Show information'),
+ ),
+ ]
diff --git a/src/pretix/plugins/pretixdroid/models.py b/src/pretix/plugins/pretixdroid/models.py
index 16dc87613..10824f835 100644
--- a/src/pretix/plugins/pretixdroid/models.py
+++ b/src/pretix/plugins/pretixdroid/models.py
@@ -12,10 +12,14 @@ class AppConfiguration(models.Model):
items = models.ManyToManyField('pretixbase.Item', blank=True, verbose_name=_('Can scan these products'))
show_info = models.BooleanField(default=True, verbose_name=_('Show information'),
help_text=_('If disabled, the device can not see how many tickets exist and how '
- 'many are already scanned. pretixdroid 1.6 or newer only.'))
+ 'many are already scanned. pretixdroid 1.6 or pretixdesk only.'))
allow_search = models.BooleanField(default=True, verbose_name=_('Search allowed'),
help_text=_('If disabled, the device can not search for attendees by name. '
- 'pretixdroid 1.6 or newer only.'))
+ 'pretixdroid 1.6 or pretixdesk only.'))
+ app = models.CharField(max_length=190, verbose_name=_('Scan software'), default='pretixdroid', choices=(
+ ('pretixdroid', _('pretixdroid – for Android smartphones')),
+ ('pretixdesk', _('pretixdesk – for desktop computers')),
+ ))
list = models.ForeignKey(
'pretixbase.CheckinList', on_delete=models.CASCADE, verbose_name=_('Check-in list')
)
diff --git a/src/pretix/plugins/pretixdroid/signals.py b/src/pretix/plugins/pretixdroid/signals.py
index 36ccb57de..ea7b23e00 100644
--- a/src/pretix/plugins/pretixdroid/signals.py
+++ b/src/pretix/plugins/pretixdroid/signals.py
@@ -19,13 +19,13 @@ def control_nav_import(sender, request=None, **kwargs):
return []
return [
{
- 'label': _('pretixdroid'),
+ 'label': _('Check-in devices'),
'url': reverse('plugins:pretixdroid:config', kwargs={
'event': request.event.slug,
'organizer': request.event.organizer.slug,
}),
'active': (url.namespace == 'plugins:pretixdroid' and url.url_name == 'config'),
- 'icon': 'android',
+ 'icon': 'mobile',
}
]
diff --git a/src/pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html b/src/pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html
index 4ec46b86e..f59ca2f0a 100644
--- a/src/pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html
+++ b/src/pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html
@@ -2,18 +2,19 @@
{% load i18n %}
{% load bootstrap3 %}
{% load staticfiles %}
-{% block title %}{% trans "pretixdroid configuration" %}{% endblock %}
+{% block title %}{% trans "Check-in device configuration" %}{% endblock %}
{% block content %}
-
{% trans "pretixdroid configuration" %}
+
{% trans "Check-in device configuration" %}
{% blocktrans trimmed %}
pretixdroid is an Android app that you can use to control tickets at the entrance of your event.
+ pretixdesk is the corresponding app for desktop computers.
{% endblocktrans %}
{% if not configs or "create" in request.GET %}
{% trans "Create app configuration" %}
{% blocktrans trimmed %}
- To start scanning tickets with our Android app, first create a configuration code here:
+ To start scanning tickets with our apps, first create a configuration code here:
{% endblocktrans %}