diff --git a/src/pretix/control/templates/pretixcontrol/organizers/device_connect.html b/src/pretix/control/templates/pretixcontrol/organizers/device_connect.html index ee91f73d1d..ebff668b06 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/device_connect.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/device_connect.html @@ -7,7 +7,16 @@
    -
  1. {% trans "Open the app that you want to connect and optionally reset it to the original state." %}
    2. +
  2. + {% trans "Download an app that is compatible with pretix. For example, our check-in app pretixSCAN is available on all major platforms." %}
    + + {% trans "Download pretixSCAN" %} + +
    3. +
  3. + {% trans "Open the app that you want to connect and optionally reset it to the original state." %} +
  4. {% trans "Scan the following configuration code:" %}


    {% trans "If your app/device does not support scanning a QR code, you can also enter the following information:" %} @@ -17,19 +26,6 @@
-
- - {% blocktrans trimmed %} - Please note that this is a new feature that currently only works for beta-stage software, such as - pretixPOS. pretixdroid 1.x and pretixdesk 0.x are not supported by this feature. Future versions of - pretixdroid and pretixdesk will be supported through this menu. - {% endblocktrans %} - -

- {% blocktrans trimmed %} - To set up pretixdroid or pretixdesk, please go to the Check-in devices section of an event. - {% endblocktrans %} -
{% trans "Device overview" %} diff --git a/src/pretix/control/templates/pretixcontrol/organizers/devices.html b/src/pretix/control/templates/pretixcontrol/organizers/devices.html index 49c98b931c..65f42d1e8c 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/devices.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/devices.html @@ -5,23 +5,12 @@

{% trans "Connected devices" %}

-
+

{% blocktrans trimmed %} This menu allows you to connect hardware devices such as box office terminals or scanning terminals to your account. {% endblocktrans %} - - {% blocktrans trimmed %} - Please note that this is a new feature that currently only works for beta-stage software, such as - pretixPOS. pretixdroid 1.x and pretixdesk 0.x are not supported by this feature. Future versions of - pretixdroid and pretixdesk will be supported through this menu. - {% endblocktrans %} - -

- {% blocktrans trimmed %} - To set up pretixdroid or pretixdesk, please go to the Check-in devices section of an event. - {% endblocktrans %} -

+

{% if devices|length == 0 %}

diff --git a/src/pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html b/src/pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html index bee4b32939..2dd453042a 100644 --- a/src/pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html +++ b/src/pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html @@ -5,10 +5,38 @@ {% block title %}{% trans "Check-in device configuration" %}{% endblock %} {% block content %}

{% 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 "We've got a new app!" %}

+

+ {% blocktrans trimmed %} + We've retired pretixdesk and pretixdroid in favor of our new app pretixSCAN that works on all major + platforms, allows convenient switching between events, has better performance when dealing with large + events and supports printing badges. We suggest that you switch to pretixSCAN for your events, but you + can continue using pretixdesk for at least all of 2019, if you like. + {% endblocktrans %} +

+
+
+

{% trans "Our new app: pretixSCAN" %}

+ +

{% trans "Available on Android, iOS, Windows, and Linux." %}

+

{% trans "Configuration is available in your organizer account's device list." %}

+ + {% trans "Switch to my device list" %} + +
+
+

{% trans "Our old apps: pretixdesk and pretixdroid" %}

+ +

{% trans "Available on Android, Windows, and Linux." %}

+

{% trans "Scroll down to create a configuration" %}

+
+
+
+ {% endif %} {% if not configs or "create" in request.GET %}

{% trans "Create app configuration" %}

diff --git a/src/pretix/static/pretixbase/img/pretixdroid.png b/src/pretix/static/pretixbase/img/pretixdroid.png new file mode 100644 index 0000000000..6eef3b8c4e Binary files /dev/null and b/src/pretix/static/pretixbase/img/pretixdroid.png differ diff --git a/src/pretix/static/pretixbase/img/pretixscan.svg b/src/pretix/static/pretixbase/img/pretixscan.svg new file mode 100644 index 0000000000..9b4e7fb641 --- /dev/null +++ b/src/pretix/static/pretixbase/img/pretixscan.svg @@ -0,0 +1,101 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/src/pretix/static/pretixcontrol/scss/main.scss b/src/pretix/static/pretixcontrol/scss/main.scss index 534fd32e5c..5a37d9384e 100644 --- a/src/pretix/static/pretixcontrol/scss/main.scss +++ b/src/pretix/static/pretixcontrol/scss/main.scss @@ -643,6 +643,16 @@ h1 .label { margin-top: 5px; } +.pretixscan-migration { + h2 { + margin-top: 0; + } + img { + width: 64px; + margin-bottom: 5px; + } +} + @media(max-width: $screen-sm-max) { .timeline { .col-date {