diff --git a/snikket_web/main.py b/snikket_web/main.py index a3db81d..c1fb7cd 100644 --- a/snikket_web/main.py +++ b/snikket_web/main.py @@ -91,24 +91,27 @@ async def login() -> typing.Union[str, quart.Response]: @bp.route("/meta/about.html") async def about() -> str: version = None + core_versions = {} extra_versions = {} - if current_app.debug or client.is_admin_session: version = _version.version + try: + core_versions["Prosody"] = await client.get_server_version() + except quart.exceptions.Unauthorized: + core_versions["Prosody"] = "unknown" + + if current_app.debug: extra_versions["Quart"] = quart.__version__ extra_versions["aiohttp"] = aiohttp.__version__ extra_versions["babel"] = babel.__version__ extra_versions["wtforms"] = wtforms.__version__ extra_versions["flask-wtf"] = flask_wtf.__version__ - try: - extra_versions["Prosody"] = await client.get_server_version() - except quart.exceptions.Unauthorized: - extra_versions["Prosody"] = "unknown" return await render_template( "about.html", version=version, extra_versions=extra_versions, + core_versions=core_versions, ) diff --git a/snikket_web/templates/about.html b/snikket_web/templates/about.html index 001eb50..b6e4b05 100644 --- a/snikket_web/templates/about.html +++ b/snikket_web/templates/about.html @@ -17,9 +17,12 @@

{% trans %}Trademarks{% endtrans %}

{% trans trademarks_url="https://snikket.org/about/trademarks/" %}“Snikket” and the parrot logo are trademarks of Snikket Community Interest Company. For more information about the trademarks, visit the Snikket Trademarks information page.{% endtrans %}

{% trans %}Software Versions{% endtrans %}

-
Snikket Server
-Domain: {{ config["SNIKKET_DOMAIN"] }}
-Snikket Web Portal{% if version %} ({{ version }}){% endif %}
+		
Domain: {{ config["SNIKKET_DOMAIN"] }}
+Web Portal{% if version %} ({{ version }}){% endif %}
+{%- if core_versions -%}
+{% for name, version in core_versions.items() %}
+{{ name }} ({{ version }}){% endfor %}
+{%- endif -%}
 {%- if extra_versions -%}
 {% for name, version in extra_versions.items() %}
 {{ name }} ({{ version }}){% endfor %}