diff --git a/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html b/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html index 33735010..96475ff5 100644 --- a/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html +++ b/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html @@ -10,7 +10,7 @@ {% endblock %} {% block user %} - {% translate "Username" %}: {{ char.character_name }} + {% include "services/service_username.html" with username=char.character_name %} {% endblock %} {#{% block active %}#} diff --git a/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html b/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html index e2e26379..d4b589e1 100644 --- a/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html +++ b/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html @@ -11,9 +11,7 @@ {% endblock %} {% block user %} - {% if username %} - {% translate "Username" %}: {{ username }} - {% endif %} + {% include "services/service_username.html" with username=username %} {% endblock %} {% block controls %} diff --git a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html index 2eca785a..4fafbead 100644 --- a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html +++ b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html @@ -14,7 +14,7 @@ {% endblock %} {% block user %} - {{ authinfo.teamspeak3_uid }} + {% include "services/service_username.html" with username=authinfo.teamspeak3_uid %} {% endblock %} {% block controls %} diff --git a/allianceauth/services/templates/services/service_username.html b/allianceauth/services/templates/services/service_username.html new file mode 100644 index 00000000..8d7e4542 --- /dev/null +++ b/allianceauth/services/templates/services/service_username.html @@ -0,0 +1,5 @@ +{% load i18n %} + +{% if username != '' %} + {% translate "Username" %}: {{ username }} +{% endif %} diff --git a/allianceauth/services/templates/services/services_ctrl_base.html b/allianceauth/services/templates/services/services_ctrl_base.html index e8423c41..ba20fdff 100644 --- a/allianceauth/services/templates/services/services_ctrl_base.html +++ b/allianceauth/services/templates/services/services_ctrl_base.html @@ -1,15 +1,29 @@ {% load i18n %} +
{% block active %} {% include "services/service_status.html" with username=username %} {% endblock active %}
-{% block url %}{% endblock url %}
-{% block user %}{% endblock user %}
+ ++ {% block url %}{% endblock url %} +
+ ++ {% block user %} + {% include "services/service_username.html" with username=username %} + {% endblock user %} +
+ {% block extra %}{% endblock extra %}