From 168e6cc29072fbdab72356404db11d24c1240fa8 Mon Sep 17 00:00:00 2001 From: Joel Falknau Date: Sun, 29 Dec 2024 21:14:40 +1000 Subject: [PATCH] remove temps from more templates --- .../templates/services/mumble/base.html | 4 +- .../templates/services/mumble/index.html | 131 ++++-------------- .../templates/services/mumble/link.html | 15 +- .../templates/services/mumble/login.html | 21 ++- 4 files changed, 46 insertions(+), 125 deletions(-) diff --git a/allianceauth/services/modules/mumble/templates/services/mumble/base.html b/allianceauth/services/modules/mumble/templates/services/mumble/base.html index c08c78a7..590da6fa 100644 --- a/allianceauth/services/modules/mumble/templates/services/mumble/base.html +++ b/allianceauth/services/modules/mumble/templates/services/mumble/base.html @@ -11,9 +11,9 @@ {% endblock header_nav_brand %} {% block content %} -
+
- {% block mumbletemps %}{% endblock %} + {% block mumble %}{% endblock mumble %}
{% endblock %} diff --git a/allianceauth/services/modules/mumble/templates/services/mumble/index.html b/allianceauth/services/modules/mumble/templates/services/mumble/index.html index c7ab0444..0da8824e 100644 --- a/allianceauth/services/modules/mumble/templates/services/mumble/index.html +++ b/allianceauth/services/modules/mumble/templates/services/mumble/index.html @@ -1,10 +1,9 @@ -{% extends "mumbletemps/base.html" %} +{% extends "services/mumble/base.html" %} {% load i18n %} {% load humanize %} -{% load timetags %} -{% block mumbletemps %} +{% block mumble %}
@@ -13,20 +12,29 @@

- {% translate 'Temp Links Give Access to mumble with the Guest Group for the preset time.' %} + {% blocktranslate trimmed with bold_start="" bold_end="" %} + Temp Links Give Access to mumble with the {{ bold_start }}Guest{{ bold_end }} Group for the preset time + {% endblocktranslate %}

- {% translate 'Connected users will not be kicked at the end of this period.' %} + {% blocktranslate trimmed with bold_start="" bold_end="" %} + Connected users {{ bold_start }}will not{{ bold_end }} be kicked at the end of this period. + {% endblocktranslate %}

- {% translate 'Templink users can be kicked in mumble by typing !kicktemps in mumble chat.' %} + {% blocktranslate trimmed with badge_start="" badge_end="" %} + Templink users can be kicked in mumble by typing {{ badge_start }}!kicktemps{{ badge_end }} in mumble chat. + {% endblocktranslate %}

- {% translate 'There are no restrictions on who or how many can use a templink, share wisely.' %} + {% blocktranslate trimmed with bold_start="" bold_end="" %} + There are {{ bold_start }}no restrictions{{ bold_end }} on who or how many can use a templink, share wisely. + {% endblocktranslate %}

+
@@ -40,7 +48,7 @@

{% translate "Your link will be displayed on the next page for an easy copy and paste." %}

-
+ {% csrf_token %}
@@ -71,9 +79,9 @@ {% translate "Expires in" %}:

-
{{ SITE_URL }}{% url 'mumbletemps:join' tl.link_ref %}
+
{{ SITE_URL }}{% url 'mumble:join' tl.link_ref %}
-
@@ -116,13 +124,13 @@ - {% translate "Nuke Link!" %} + {% translate "Nuke Link!" %} {% endfor %} @@ -162,7 +170,7 @@ {{ lnk.link_ref }} - {% translate "Nuke Link!" %} + {% translate "Nuke Link!" %} {% endfor %} @@ -172,103 +180,18 @@
{% endif %} -{% endblock mumbletemps %} +{% endblock mumble %} {% block extra_javascript %} - {% include 'bundles/clipboard-js.html' %} + {% include "bundles/clipboard-js.html" %} - {% include "bundles/moment-js.html" with locale=True %} - {% include "bundles/timers-js.html" %} - - {% endblock extra_javascript %} diff --git a/allianceauth/services/modules/mumble/templates/services/mumble/link.html b/allianceauth/services/modules/mumble/templates/services/mumble/link.html index 34f41aa2..55db3fe5 100644 --- a/allianceauth/services/modules/mumble/templates/services/mumble/link.html +++ b/allianceauth/services/modules/mumble/templates/services/mumble/link.html @@ -1,19 +1,18 @@ -{% extends "mumbletemps/base.html" %} +{% extends "services/mumble/base.html" %} {% load static %} {% load i18n %} -{% load timetags %} -{% block mumbletemps %} +{% block mumble %}

{{ link.creator.character_name }}

- {% blocktranslate with character=link.creator.character_name %} + {% blocktranslatelate with character=link.creator.character_name %} {{ character }} has invited you to join Mumble! - {% endblocktranslate %} + {% endblocktranslatelate %}

@@ -25,7 +24,7 @@

- {% translate 'Mumble' %} + {% translate 'Mumble' %} {% translate "Click to Join Mumble as" %}: {{ temp_user.name }} @@ -67,7 +66,7 @@ const locale = '{{ LANGUAGE_CODE }}'; const timers = [{ 'id': '{{ link.link_ref }}', - 'targetDate': moment('{{ link.expires|print_timestamp| date:"c" }}'), + 'targetDate': moment('{{ link.expires| date:"c" }}'), 'expired': false }]; @@ -118,4 +117,4 @@ // Start timed updates setInterval(timedUpdate, 1000); -{% endblock mumbletemps %} +{% endblock mumble %} diff --git a/allianceauth/services/modules/mumble/templates/services/mumble/login.html b/allianceauth/services/modules/mumble/templates/services/mumble/login.html index f7bea38a..a327ced9 100644 --- a/allianceauth/services/modules/mumble/templates/services/mumble/login.html +++ b/allianceauth/services/modules/mumble/templates/services/mumble/login.html @@ -1,20 +1,19 @@ -{% extends "mumbletemps/base.html" %} +{% extends "services/mumble/base.html" %} {% load static %} {% load i18n %} -{% load timetags %} -{% block mumbletemps %} +{% block mumble %}