Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhance the branding of eventyay-talk plugin for videos and change to own naming conventions #2

Merged
merged 1 commit into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pretalx_venueless/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

class PluginApp(AppConfig):
name = "pretalx_venueless"
verbose_name = "Venueless integration"
verbose_name = "Eventyay video integration"

class PretalxPluginMeta:
name = gettext_lazy("Venueless integration")
author = "Tobias Kunze"
name = gettext_lazy("Eventyay video integration")
author = "Eventyay"
description = gettext_lazy(
"Venueless integration in pretalx: Notify venueless about new schedule releases!"
"Eventyay video integration in pretalx: Notify eventyay about new schedule releases!"
)
visible = True
version = __version__
Expand Down
8 changes: 4 additions & 4 deletions pretalx_venueless/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
class VenuelessSettingsForm(I18nModelForm):
token = forms.CharField(
help_text=_(
"Generate a token with the trait 'world:api' in the Config -> Token Generator menu in Venueless. Leave empty to leave unchanged."
"Generate a token with the trait 'world:api' in the Config -> Token Generator menu in Eventyay video. Leave empty to leave unchanged."
),
label=_("Venueless Token"),
label=_("Eventyay video Token"),
required=True,
)
url = forms.URLField(
help_text=_("URL of your Venueless event"),
label=_("Venueless URL"),
help_text=_("URL of your Eventyay video event"),
label=_("Eventyay video URL"),
required=True,
)
return_url = forms.CharField(widget=forms.HiddenInput(), required=False)
Expand Down
18 changes: 9 additions & 9 deletions pretalx_venueless/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ class VenuelessSettings(models.Model):
)
token = models.TextField(
help_text=_(
"Generate a token with the trait 'world:api' in the Config -> Token Generator menu in Venueless. Leave empty to leave unchanged."
"Generate a token with the trait 'world:api' in the Config -> Token Generator menu in Eventyay video. Leave empty to leave unchanged."
),
verbose_name=_("Venueless Token"),
verbose_name=_("Eventyay video Token"),
null=True,
blank=True, # for easier get_or_create
)
url = models.URLField(
help_text=_("URL of your Venueless event"),
verbose_name=_("Venueless URL"),
help_text=_("URL of your Eventyay video event"),
verbose_name=_("Eventyay video URL"),
null=True,
blank=True, # for easier get_or_create
)
Expand All @@ -30,29 +30,29 @@ class VenuelessSettings(models.Model):
# settings required for join URLs
show_join_link = models.BooleanField(
help_text=_(
"If you enable this feature, speakers will find a venueless join button on their profile pages."
"If you enable this feature, speakers will find a Eventyay video join button on their profile pages."
),
verbose_name=_("Show join button"),
default=False,
)
join_url = models.URLField(
help_text=_("URL used for sign-up links"),
verbose_name=_("Venueless URL"),
verbose_name=_("Eventyay video URL"),
null=True,
blank=True,
)
secret = models.TextField(
verbose_name=_("Venueless secret"),
verbose_name=_("Eventyay video secret"),
null=True,
blank=True,
)
issuer = models.TextField(
verbose_name=_("Venueless issuer"),
verbose_name=_("Eventyay video issuer"),
null=True,
blank=True,
)
audience = models.TextField(
verbose_name=_("Venueless audience"),
verbose_name=_("Eventyay video audience"),
null=True,
blank=True,
)
Expand Down
2 changes: 1 addition & 1 deletion pretalx_venueless/signals.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def navbar_info(sender, request, **kwargs):

return [
{
"label": _("Venueless"),
"label": _("Eventyay video"),
"url": reverse(
"plugins:pretalx_venueless:settings",
kwargs={
Expand Down
20 changes: 10 additions & 10 deletions pretalx_venueless/templates/pretalx_venueless/settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,31 @@
{% block content %}

{% if connect_in_progress %}
<h2>{% trans "Confirm your Venueless connection" %}</h2>
<h2>{% trans "Confirm your Eventyay video connection" %}</h2>
<div class="alert alert-info">
<div>
{% blocktranslate trimmed %}
<b>Venueless</b> is asking to connect to your pretalx event. If you confirm
this connection, pretalx will notify Venueless about all schedule changes.
<b>Eventyay video</b> is asking to connect to your pretalx event. If you confirm
this connection, pretalx will notify Eventyay video about all schedule changes.
{% endblocktranslate %}
</div>
</div>
{% else %}
<h2>{% trans "Venueless" %}</h2>
<h2>{% trans "Eventyay video" %}</h2>
{% endif %}
{% if last_push %}
<div class="alert alert-success">
{% blocktranslate trimmed with last_push=last_push %}
Successfully connected to venueless. Data was last pushed on {{ last_push }}.
Successfully connected to Eventyay video. Data was last pushed on {{ last_push }}.
{% endblocktranslate %}
</div>
{% elif not connect_in_progress %}
<div class="alert alert-warning">
<div>
{% blocktranslate trimmed %}
Setting up the connection with Venueless will configure the pretalx settings
in Venueless, and will automatically push schedule changes to venueless users.
Please use Venueless to begin this process. Go to <b>Config → Event</b> in Venueless,
Setting up the connection with Eventyay video will configure the pretalx settings
in Eventyay video, and will automatically push schedule changes to Eventyay video users.
Please use Eventyay video to begin this process. Go to <b>Config → Event</b> in Eventyay video,
and enter the following settings to create the connection:
{% endblocktranslate %}
<ul>
Expand All @@ -62,7 +62,7 @@ <h2>{% translate "Main settings" %}</h2>
<p>
{% blocktranslate trimmed %}
These settings will get filled in automatically when you set up
your event with venueless. Please follow the instructions at the
your event with Eventyay video. Please follow the instructions at the
top of this page!
{% endblocktranslate %}
</p>
Expand All @@ -77,7 +77,7 @@ <h2>{% translate "Join link settings" %}</h2>
<p>
{% blocktranslate trimmed %}
These settings are only required if you want to distribute the sign-up links to
venueless for your speakers by way of pretalx.
Eventyay video for your speakers by way of pretalx.
{% endblocktranslate %}
</p>

Expand Down
6 changes: 3 additions & 3 deletions pretalx_venueless/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@

urlpatterns = [
path(
"orga/event/<slug:event>/settings/p/venueless/",
"orga/event/<slug:event>/settings/p/eventyay-video/",
views.Settings.as_view(),
name="settings",
),
path(
"<slug:event>/p/venueless/check",
"<slug:event>/p/eventyay-video/check",
views.check,
name="check",
),
path(
"<slug:event>/p/venueless/join",
"<slug:event>/p/eventyay-video/join",
views.SpeakerJoin.as_view(),
name="join",
),
Expand Down
4 changes: 2 additions & 2 deletions pretalx_venueless/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ def post(self, request, *args, **kwargs):
"profile": profile,
"traits": list(
{
f"pretalx-event-{request.event.slug}",
f"eventyay-video-event-{request.event.slug}",
}
| {f"pretalx-session-{submission.code}" for submission in talks}
| {f"eventyay-video-session-{submission.code}" for submission in talks}
),
}
token = jwt.encode(payload, venueless_settings.secret, algorithm="HS256")
Expand Down
Loading