little cosmetics and more translations

This commit is contained in:
Jan Koppe 2020-05-02 00:10:36 +02:00
parent 0400e85f89
commit 9cc2e13b2c
Signed by: thunfisch
GPG Key ID: BE935B0735A2129B
16 changed files with 173 additions and 183 deletions

View File

@ -1,5 +1,6 @@
from django.apps import AppConfig
class CoreConfig(AppConfig):
name = 'core'

View File

@ -1,17 +1,16 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# Copyright (C) Chaoswest TV
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# Jan Koppe <post@jankoppe.de>, 2020.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Project-Id-Version: portier 0.6.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-01 17:01+0000\n"
"POT-Creation-Date: 2020-05-01 22:10+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Last-Translator: Jan Koppe <post@jankoppe.de>\n"
"Language-Team: German <post@chaoswest.tv>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -28,31 +27,31 @@ msgstr "Englisch"
#: restream/models.py:11
msgid "restreamconfig_stream_help"
msgstr ""
msgstr "Stream der als Quelle für die Weiterleitung verwendet wird"
#: restream/models.py:12
msgid "restreamconfig_target_help"
msgstr ""
msgstr "RTMP Ziel URL an die der Stream weitergeleitet wird"
#: restream/models.py:13
msgid "restreamconfig_name_help"
msgstr ""
msgstr "Name für diese Restream Konfiguration"
#: restream/models.py:14
msgid "restreamconfig_activate_help"
msgstr ""
msgstr "Nur aktive Konfigurationen werden bei eingehenden Streams ausgeführt"
#: restream/models.py:17
msgid "restreamconfig_verbose_name"
msgstr ""
msgstr "Restream Konfiguration"
#: restream/models.py:18
msgid "restreamconfig_verbose_name_plural"
msgstr ""
msgstr "Restream Konfigurationen"
#: restream/models.py:21
msgid "restreamconfig_class_name"
msgstr ""
msgstr "Restream Konfiguration"
#: restream/templates/restream/restreamconfig_confirm_delete.html:6
#: rtmp/templates/rtmp/stream_confirm_delete.html:6
@ -74,7 +73,7 @@ msgstr "Löschen"
#: restream/templates/restream/restreamconfig_detail.html:12
msgid "restreamconfig_configuration_details_header"
msgstr ""
msgstr "Restream Konfiguration Details"
#: restream/templates/restream/restreamconfig_detail.html:17
#: rtmp/templates/rtmp/stream_detail.html:17
@ -82,9 +81,9 @@ msgid "change"
msgstr "Ändern"
#: restream/templates/restream/restreamconfig_detail.html:28
#: restream/templates/restream/restreamconfig_list.html:18
#: restream/templates/restream/restreamconfig_list.html:25
#: rtmp/templates/rtmp/stream_detail.html:28
#: rtmp/templates/rtmp/stream_list.html:18
#: rtmp/templates/rtmp/stream_list.html:24
msgid "name"
msgstr "Name"
@ -92,7 +91,12 @@ msgstr "Name"
msgid "stream"
msgstr "Stream"
#: restream/templates/restream/restreamconfig_detail.html:35
#: restream/templates/restream/restreamconfig_detail.html:32
#: restream/templates/restream/restreamconfig_list.html:26
msgid "active"
msgstr "Aktiv"
#: restream/templates/restream/restreamconfig_detail.html:43
msgid "configured_target_url"
msgstr "Konfigurierte Ziel-URL"
@ -104,35 +108,42 @@ msgstr "Neue Restream Konfiguration erstellen"
#: restream/templates/restream/restreamconfig_update_form.html:14
#: rtmp/templates/rtmp/stream_form.html:14
#: rtmp/templates/rtmp/stream_update_form.html:14
#: templates/registration/password_change_form.html:13
#: templates/registration/password_reset_form.html:13
#: templates/registration/password_change_form.html:14
#: templates/registration/password_reset_form.html:14
msgid "submit"
msgstr "Abschicken"
#: restream/templates/restream/restreamconfig_form.html:21
msgid "create_new_restreamconfig_configuration_text_html"
#: restream/templates/restream/restreamconfig_update_form.html:21
msgid "restreamconfig_configuration_text_html"
msgstr ""
"<p>Eine Restream Konfiguration erlaubt es dir eingehende Streams in das "
"System unverändert an externe System weiterzuleiten.</p><p>Die Restream "
"Konfiguration benötigt einen vorher konfigurierten Quell-Stream und ein "
"Ziel, dass du über eine RTMP URL frei definieren kannst. Die RTMP URL sollte "
"zum Beispiel so ausschauen: <code>rtmp://servername/app/streamkey</code></"
"p><p>Du kannst natürlich mehrere Restream Konfigurationen auf einen "
"einzelnen Quell-Stream einrichten. Das erlaubt es dir von deinem Encoder nur "
"einmal einen Stream zu senden, diesen aber automatisch an mehrere Platformen "
"weiterzuleiten.</p><p>Nur Restream Konfigurationen die auf Aktiv geschaltet "
"sind werden bei einem neu eingehenden Stream ausgeführt!</p>"
#: restream/templates/restream/restreamconfig_list.html:8
#: restream/templates/restream/restreamconfig_list.html:11
msgid "restreamconfig_configuration_header"
msgstr "Restream Konfiguration"
#: restream/templates/restream/restreamconfig_list.html:12
#: rtmp/templates/rtmp/stream_list.html:12
#: restream/templates/restream/restreamconfig_list.html:16
#: rtmp/templates/rtmp/stream_list.html:15
msgid "create"
msgstr "Erstellen"
#: restream/templates/restream/restreamconfig_list.html:19
msgid "active"
msgstr "Aktiv"
#: restream/templates/restream/restreamconfig_list.html:20
#: rtmp/templates/rtmp/stream_list.html:20
#: restream/templates/restream/restreamconfig_list.html:27
#: rtmp/templates/rtmp/stream_list.html:26
msgid "actions"
msgstr "Aktionen"
#: restream/templates/restream/restreamconfig_list.html:38
#: rtmp/templates/rtmp/stream_list.html:38
#: restream/templates/restream/restreamconfig_list.html:44
#: rtmp/templates/rtmp/stream_list.html:43
msgid "details"
msgstr "Details"
@ -140,10 +151,6 @@ msgstr "Details"
msgid "update_restreamconfig_configuration_header"
msgstr "Restream Konfiguration anpassen"
#: restream/templates/restream/restreamconfig_update_form.html:21
msgid "update_restreamconfig_configuration_text_html"
msgstr ""
#: rtmp/models.py:13
msgid "rtmp_application_name"
msgstr "RTMP Application Name"
@ -200,83 +207,79 @@ msgid "application"
msgstr "Application"
#: rtmp/templates/rtmp/stream_detail.html:33
msgid "stream_configuration_do_not_share_warning"
msgstr "Achtung! Gebe diese Stream ID niemals weiter."
#: rtmp/templates/rtmp/stream_detail.html:36
msgid "how_to_configure_your_encoder_header"
msgstr "Wie du deinen Encoder konfigurierst"
#: rtmp/templates/rtmp/stream_detail.html:38
#: rtmp/templates/rtmp/stream_detail.html:35
msgid "set_this_stream_server_in_encoder"
msgstr "Stelle diesen Stream Server in deinem Encoder ein"
#: rtmp/templates/rtmp/stream_detail.html:40
#: rtmp/templates/rtmp/stream_detail.html:37
msgid "set_this_stream_id_in_encoder"
msgstr "Stelle diese Stream ID in deinem Encoder ein"
#: rtmp/templates/rtmp/stream_detail.html:48
msgid "you_may_need_to_use_this_full_url_instead"
msgstr "Vielleicht musst du diese volle URL verwenden"
#: rtmp/templates/rtmp/stream_detail.html:46
#: rtmp/templates/rtmp/stream_form.html:21
#: rtmp/templates/rtmp/stream_update_form.html:21
msgid "stream_configuration_text_html"
msgstr ""
"<p>Eine Stream Konfiguration erlaubt es dir einen Stream in das System zu "
"schicken</p><p>Nur Streams die zu einer vorher erstellten Konfiguration "
"zugeordnet werden können werden vom System angenommen.</p><p>Der Name dient "
"dazu den Stream beim Erstellen von weiteren Konfigurationen leicht zu "
"identifizieren. Die tatsächliche Stream ID wird dir nach dem erstellen "
"angezeigt. <strong>Halte die Stream ID auf jeden Fall geheim.</strong></p>"
#: rtmp/templates/rtmp/stream_form.html:5
msgid "create_new_stream_configuration_header"
msgstr "Neue Stream Konfiguration erstellen"
#: rtmp/templates/rtmp/stream_form.html:21
msgid "create_new_stream_configuration_text_html"
msgstr ""
#: rtmp/templates/rtmp/stream_list.html:8
#: rtmp/templates/rtmp/stream_list.html:10
msgid "stream_configuration_header"
msgstr "Stream Konfiguration"
#: rtmp/templates/rtmp/stream_list.html:19
#: rtmp/templates/rtmp/stream_list.html:25
msgid "receiving"
msgstr "Empfängt"
msgstr "Empfange"
#: rtmp/templates/rtmp/stream_update_form.html:5
msgid "update_stream_configuration_header"
msgstr "Stream Konfiguration anpassen"
#: rtmp/templates/rtmp/stream_update_form.html:21
msgid "update_stream_configuration_text_html"
msgstr ""
#: templates/base.html:36
#: templates/base.html:40
msgid "navbar_streaming"
msgstr "Streaming"
#: templates/base.html:39
#: templates/base.html:43
msgid "navbar_configuration_streams"
msgstr "Streams"
#: templates/base.html:40
#: templates/base.html:44
msgid "navbar_configuration_restreams"
msgstr "Restreams"
#: templates/base.html:47
#: templates/base.html:51
#, python-format
msgid "hello_%(username)s"
msgstr "Hallo, %(username)s!"
#: templates/base.html:50
#: templates/base.html:54
msgid "navbar_account_password_change"
msgstr "Passwort ändern"
#: templates/base.html:51
#: templates/base.html:55
msgid "navbar_account_logout"
msgstr "Abmelden"
#: templates/base.html:55
#: templates/base.html:59
msgid "navbar_login"
msgstr "Anmelden"
#: templates/registration/login.html:5 templates/registration/login.html:13
#: templates/registration/login.html:5 templates/registration/login.html:14
msgid "login"
msgstr "Anmelden"
#: templates/registration/login.html:18
#: templates/registration/login.html:19
msgid "forgot_password_q"
msgstr "Passwort vergessen?"
@ -284,22 +287,23 @@ msgstr "Passwort vergessen?"
msgid "password_change_successful"
msgstr "Passwort erfolgreich geändert"
#: templates/registration/password_change_done.html:6
#: templates/registration/password_change_done.html:7
msgid "password_change_successful_text"
msgstr ""
#: templates/registration/password_change_done.html:7
msgid "take_me_to_safety"
msgstr "Bring mich in Sicherheit!"
"Das Passwort wurde erfolgreich geändert. Du kannst dich ab jetzt mit dem "
"neuen Passwort anmelden."
#: templates/registration/password_change_form.html:5
msgid "change_password"
msgstr "Passwort ändern"
#: templates/registration/password_change_form.html:20
msgid "change_password_text_html"
msgstr ""
#: templates/registration/password_reset_form.html:5
msgid "reset_password"
msgstr "Passwort vergessen"
#: templates/registration/password_reset_form.html:20
#: templates/registration/password_reset_form.html:21
msgid "reset_password_text_html"
msgstr ""
"Du hast dein Passwort vergessen? Kein Problem. Gib hier die E-mail Adresse "
"deines Nutzerkonto an, und wir schicken dir einen Link zu mit dem du ein "
"neues Passwort setzen kannst."

View File

@ -1,17 +1,16 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# Copyright (C) Chaoswest TV
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# Jan Koppe <post@jankoppe.de>, 2020.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Project-Id-Version: portier 0.6.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-01 17:01+0000\n"
"POT-Creation-Date: 2020-05-01 22:10+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Last-Translator: Jan Koppe <post@jankoppe.de>\n"
"Language-Team: english <post@chaoswest.tv>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -28,19 +27,19 @@ msgstr "English"
#: restream/models.py:11
msgid "restreamconfig_stream_help"
msgstr ""
msgstr "Stream that's being used as source for the restreaming"
#: restream/models.py:12
msgid "restreamconfig_target_help"
msgstr ""
msgstr "RTMP target url that the stream is being restreamed to"
#: restream/models.py:13
msgid "restreamconfig_name_help"
msgstr ""
msgstr "Name for this restream configuration"
#: restream/models.py:14
msgid "restreamconfig_activate_help"
msgstr ""
msgstr "Only active configurations will be executed for incoming streams"
#: restream/models.py:17
msgid "restreamconfig_verbose_name"
@ -81,9 +80,9 @@ msgid "change"
msgstr "Change"
#: restream/templates/restream/restreamconfig_detail.html:28
#: restream/templates/restream/restreamconfig_list.html:18
#: restream/templates/restream/restreamconfig_list.html:25
#: rtmp/templates/rtmp/stream_detail.html:28
#: rtmp/templates/rtmp/stream_list.html:18
#: rtmp/templates/rtmp/stream_list.html:24
msgid "name"
msgstr "Name"
@ -91,7 +90,12 @@ msgstr "Name"
msgid "stream"
msgstr "Stream"
#: restream/templates/restream/restreamconfig_detail.html:35
#: restream/templates/restream/restreamconfig_detail.html:32
#: restream/templates/restream/restreamconfig_list.html:26
msgid "active"
msgstr "Active"
#: restream/templates/restream/restreamconfig_detail.html:43
msgid "configured_target_url"
msgstr "Configured target URL"
@ -103,35 +107,41 @@ msgstr "Create new restream configuration"
#: restream/templates/restream/restreamconfig_update_form.html:14
#: rtmp/templates/rtmp/stream_form.html:14
#: rtmp/templates/rtmp/stream_update_form.html:14
#: templates/registration/password_change_form.html:13
#: templates/registration/password_reset_form.html:13
#: templates/registration/password_change_form.html:14
#: templates/registration/password_reset_form.html:14
msgid "submit"
msgstr "Submit"
#: restream/templates/restream/restreamconfig_form.html:21
msgid "create_new_restreamconfig_configuration_text_html"
#: restream/templates/restream/restreamconfig_update_form.html:21
msgid "restreamconfig_configuration_text_html"
msgstr ""
"<p>A restream configuration allows you to forward incoming streamswithout "
"further processing to external systems.<p><p>The restream configuration "
"needs a previously configured source stream and a target RTMP URL which you "
"can freely chose. The target RTMP URL should look e.g. like this: "
"<code>rtmp://servername/app/streamkey</code></p>You can of course create "
"multiple restream configurations with the same source stream. This allows "
"you to only send one stream from your encoder, but distribute this to "
"multiple platforms.</p><p>Only restream configurations that are marked "
"active will be executed for an incoming stream!</p>"
#: restream/templates/restream/restreamconfig_list.html:8
#: restream/templates/restream/restreamconfig_list.html:11
msgid "restreamconfig_configuration_header"
msgstr "Restream configuration"
#: restream/templates/restream/restreamconfig_list.html:12
#: rtmp/templates/rtmp/stream_list.html:12
#: restream/templates/restream/restreamconfig_list.html:16
#: rtmp/templates/rtmp/stream_list.html:15
msgid "create"
msgstr "Create"
#: restream/templates/restream/restreamconfig_list.html:19
msgid "active"
msgstr "Active"
#: restream/templates/restream/restreamconfig_list.html:20
#: rtmp/templates/rtmp/stream_list.html:20
#: restream/templates/restream/restreamconfig_list.html:27
#: rtmp/templates/rtmp/stream_list.html:26
msgid "actions"
msgstr "Actions"
#: restream/templates/restream/restreamconfig_list.html:38
#: rtmp/templates/rtmp/stream_list.html:38
#: restream/templates/restream/restreamconfig_list.html:44
#: rtmp/templates/rtmp/stream_list.html:43
msgid "details"
msgstr "Details"
@ -139,10 +149,6 @@ msgstr "Details"
msgid "update_restreamconfig_configuration_header"
msgstr "Update restream configuration"
#: restream/templates/restream/restreamconfig_update_form.html:21
msgid "update_restreamconfig_configuration_text_html"
msgstr ""
#: rtmp/models.py:13
msgid "rtmp_application_name"
msgstr "RTMP application name"
@ -199,38 +205,38 @@ msgid "application"
msgstr "Application"
#: rtmp/templates/rtmp/stream_detail.html:33
msgid "stream_configuration_do_not_share_warning"
msgstr "Attention! Do not share this stream ID with anyone."
#: rtmp/templates/rtmp/stream_detail.html:36
msgid "how_to_configure_your_encoder_header"
msgstr "How to configure your encoder"
#: rtmp/templates/rtmp/stream_detail.html:38
#: rtmp/templates/rtmp/stream_detail.html:35
msgid "set_this_stream_server_in_encoder"
msgstr "Set this stream server in your encoder"
#: rtmp/templates/rtmp/stream_detail.html:40
#: rtmp/templates/rtmp/stream_detail.html:37
msgid "set_this_stream_id_in_encoder"
msgstr "Set this stream ID in your encoder"
#: rtmp/templates/rtmp/stream_detail.html:48
msgid "you_may_need_to_use_this_full_url_instead"
msgstr "You may need to use this full URL instead"
#: rtmp/templates/rtmp/stream_detail.html:46
#: rtmp/templates/rtmp/stream_form.html:21
#: rtmp/templates/rtmp/stream_update_form.html:21
msgid "stream_configuration_text_html"
msgstr ""
"<p>A stream configuration allows you to send a stream into the system.</"
"p><p>Only streams that can be matched to a previously configured stream will "
"be accepted by the system.</p><p>The only purpose of the name is to make "
"this stream easily identifiable when creating further configurations.The "
"actual stream ID will be shown to you after creation. <strong>Always keep "
"your stream ID secret.</strong></p>"
#: rtmp/templates/rtmp/stream_form.html:5
msgid "create_new_stream_configuration_header"
msgstr "Create new stream configuration"
#: rtmp/templates/rtmp/stream_form.html:21
msgid "create_new_stream_configuration_text_html"
msgstr ""
#: rtmp/templates/rtmp/stream_list.html:8
#: rtmp/templates/rtmp/stream_list.html:10
msgid "stream_configuration_header"
msgstr "Stream configuration"
#: rtmp/templates/rtmp/stream_list.html:19
#: rtmp/templates/rtmp/stream_list.html:25
msgid "receiving"
msgstr "Receiving"
@ -238,44 +244,40 @@ msgstr "Receiving"
msgid "update_stream_configuration_header"
msgstr "Change stream configuration"
#: rtmp/templates/rtmp/stream_update_form.html:21
msgid "update_stream_configuration_text_html"
msgstr ""
#: templates/base.html:36
#: templates/base.html:40
msgid "navbar_streaming"
msgstr "Streaming"
#: templates/base.html:39
#: templates/base.html:43
msgid "navbar_configuration_streams"
msgstr "Streams"
#: templates/base.html:40
#: templates/base.html:44
msgid "navbar_configuration_restreams"
msgstr "Restreams"
#: templates/base.html:47
#: templates/base.html:51
#, python-format
msgid "hello_%(username)s"
msgstr "Hello, %(username)s!"
#: templates/base.html:50
#: templates/base.html:54
msgid "navbar_account_password_change"
msgstr "Change password"
#: templates/base.html:51
#: templates/base.html:55
msgid "navbar_account_logout"
msgstr "Logout"
#: templates/base.html:55
#: templates/base.html:59
msgid "navbar_login"
msgstr "Login"
#: templates/registration/login.html:5 templates/registration/login.html:13
#: templates/registration/login.html:5 templates/registration/login.html:14
msgid "login"
msgstr "Login"
#: templates/registration/login.html:18
#: templates/registration/login.html:19
msgid "forgot_password_q"
msgstr "Did you forget your password?"
@ -283,22 +285,23 @@ msgstr "Did you forget your password?"
msgid "password_change_successful"
msgstr "Password change was successful"
#: templates/registration/password_change_done.html:6
#: templates/registration/password_change_done.html:7
msgid "password_change_successful_text"
msgstr ""
#: templates/registration/password_change_done.html:7
msgid "take_me_to_safety"
msgstr "Help! Take me back to safety!"
"The password has succesfully been changed. From now on you can login with "
"your new password."
#: templates/registration/password_change_form.html:5
msgid "change_password"
msgstr "Change password"
#: templates/registration/password_change_form.html:20
msgid "change_password_text_html"
msgstr ""
#: templates/registration/password_reset_form.html:5
msgid "reset_password"
msgstr "Password forgotten?"
#: templates/registration/password_reset_form.html:20
#: templates/registration/password_reset_form.html:21
msgid "reset_password_text_html"
msgstr ""
"Did you forget your password? No worries. Enter the e-mail address of your "
"user account here. We will send an e-mail with a link to you, which you can "
"use to reset the password."

View File

@ -2,7 +2,7 @@ from django.contrib.contenttypes.models import ContentType
from django.db.models import Q
from guardian.models import UserObjectPermission
from guardian.models import GroupObjectPermission
from django.contrib.auth.models import User, Group
from django.contrib.auth.models import Group
from django.conf import settings

View File

@ -29,12 +29,20 @@
<dd class="col-sm-9">{{ object.name }}</dd>
<dt class="col-sm-3">{% trans "stream" %}</dt>
<dd class="col-sm-9"><a href="{% url 'rtmp:stream_detail' pk=object.stream.pk %}">{{ object.stream.name }}</a></dd>
<dt class="col-sm-3">{% trans "active" %}</dt>
<dd class="col-sm-9">
{% if object.active %}
<span class="text-success">{% fa5_icon 'check-circle' %}</span>
{% else %}
<span class="text-danger">{% fa5_icon 'times-circle' %}</span>
{% endif %}
</dd>
</dl>
</div>
<div class="col-sm">
<p>{% trans "configured_target_url" %}</p>
<div class="input-group mb-4" id="show_hide_target_url">
<input class="form-control" type="password" value="{{ object.target }}">
<input readonly class="form-control" type="password" value="{{ object.target }}">
<div class="input-group-append">
<a href="" class="btn btn-outline-secondary"><i class="fa fa-eye-slash" aria-hidden="true"></i></a>
</div>

View File

@ -18,7 +18,7 @@
</form>
</div>
<div class="col-sm">
{% trans "create_new_restreamconfig_configuration_text_html" %}
{% trans "restreamconfig_configuration_text_html" %}
</div>
</div>
{% endblock %}

View File

@ -41,12 +41,10 @@
{% endif %}
</td>
<td align="right">
<div class="btn-group" role="group">
<a href="{% url 'restream:restreamconfig_detail' pk=object.pk %}" type="button" class="btn btn-sm btn-outline-primary">{% trans "details" %}</a>
{% if "delete_restreamconfig" in obj_perms %}
<a href="{% url 'restream:restreamconfig_delete' pk=object.pk %}" type="button" class="btn btn-sm btn-outline-danger">{% fa5_icon 'trash' %}</a>
{% endif %}
</div>
</td>
</tr>
{% endif %}

View File

@ -18,7 +18,7 @@
</form>
</div>
<div class="col-sm">
{% trans "update_restreamconfig_configuration_text_html" %}
{% trans "restreamconfig_configuration_text_html" %}
</div>
</div>
{% endblock %}

View File

@ -30,28 +30,20 @@
<dt class="col-sm-3">{% trans "application" %}</dt>
<dd class="col-sm-9">{{ object.application }}</dd>
</dl>
<p>{% trans "stream_configuration_do_not_share_warning" %}</p>
</div>
<div class="col-sm">
<h6>{% trans "how_to_configure_your_encoder_header" %}</h6>
<hr class="my-4">
<p>{% trans "set_this_stream_server_in_encoder" %}</p>
<code>rtmp://TODO TODO SERVER BASE URL/{{ object.application }}/</code>
<p class="mb-4"><code>rtmp://TODO TODO SERVER BASE URL/{{ object.application }}/</code></p>
<p>{% trans "set_this_stream_id_in_encoder" %}</p>
<div class="input-group mb-4" id="show_hide_stream_key">
<input class="form-control" type="password" value="{{ object.stream }}">
<input readonly class="form-control" type="password" value="{{ object.stream }}">
<div class="input-group-append">
<a href="" class="btn btn-outline-secondary"><i class="fa fa-eye-slash" aria-hidden="true"></i></a>
</div>
</div>
<hr class="my-4">
<p>{% trans "you_may_need_to_use_this_full_url_instead" %}</p>
<div class="input-group mb-4" id="show_hide_stream_url">
<input class="form-control" type="password" value="rtmp://TODO TODO TODO SERVER BASE URL/{{ object.stream }}">
<div class="input-group-append">
<a href="" class="btn btn-outline-secondary"><i class="fa fa-eye-slash" aria-hidden="true"></i></a>
</div>
</div>
<div class="col-sm">
{% trans "stream_configuration_text_html" %}
</div>
</div>
<script>
@ -72,19 +64,5 @@
}
});
});
$(function() {
$("#show_hide_stream_url a").on('click', function(event) {
event.preventDefault();
if ($('#show_hide_stream_url input').attr('type') == 'text') {
$('#show_hide_stream_url input').attr('type', 'password');
$('#show_hide_stream_url i').addClass('fa-eye-slash');
$('#show_hide_stream_url i').removeClass('fa-eye');
} else if ($('#show_hide_stream_url input').attr('type') == 'password') {
$('#show_hide_stream_url input').attr('type', 'text');
$('#show_hide_stream_url i').removeClass('fa-eye-slash');
$('#show_hide_stream_url i').addClass('fa-eye');
}
});
});
</script>
{% endblock %}

View File

@ -18,7 +18,7 @@
</form>
</div>
<div class="col-sm">
{% trans "create_new_stream_configuration_text_html" %}
{% trans "stream_configuration_text_html" %}
</div>
</div>
{% endblock %}

View File

@ -40,12 +40,10 @@
{% endif %}
</td>
<td align="right">
<div class="btn-group" role="group">
<a href="{% url 'rtmp:stream_detail' pk=object.pk %}" type="button" class="btn btn-sm btn-outline-primary ">{% trans "details" %}</a>
{% if "delete_stream" in obj_perms %}
<a href="{% url 'rtmp:stream_delete' pk=object.pk %}" type="button" class="btn btn-sm btn-outline-danger">{% fa5_icon 'trash' %}</a>
{% endif %}
</div>
</td>
</tr>
{% endif %}

View File

@ -18,7 +18,7 @@
</form>
</div>
<div class="col-sm">
{% trans "update_stream_configuration_text_html" %}
{% trans "stream_configuration_text_html" %}
</div>
</div>
{% endblock %}

View File

@ -22,6 +22,7 @@
<body>
<header>
<nav class="navbar navbar-expand-md navbar-light bg-light mb-4 border boder-bottom-0">
<div class="container">
<span class="navbar-brand mb-0 h1">
<a href="{% url 'index' %}">portier</a>
</span>
@ -78,6 +79,7 @@
</li>
</ul>
</div>
</div>
</nav>
</header>
<main class="container" roles="main">

View File

@ -5,5 +5,4 @@
<h6>{% trans "password_change_successful" %}</h6>
<hr class="my-4">
<p>{% trans "password_change_successful_text" %}</p>
<a class="btn btn-primary btn-lg" href="{% url 'index' %}">{% trans "take_me_to_safety" %}</a>
{% endblock %}

View File

@ -18,7 +18,6 @@
</form>
</div>
<div class="col-sm">
{% trans "change_password_text_html" %}
</div>
</div>
{% endblock %}

View File

@ -2,7 +2,7 @@
{% load i18n %}
{% load bootstrap4 %}
{% block 'content' %}
<h6>{% trans "reset_password"}</h6>
<h6>{% trans "reset_password" %}</h6>
<hr class="my-4">
<div class="row">
<div class="col-sm border-right">