From e12941eab02cd431d0eea23752aa225c49efe7dc Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 15 Dec 2023 14:41:17 +0000 Subject: [PATCH 1/3] Improve user name/JID display Show the display name more prominently (if one is set), as it is more "friendly" name. The JID is now displayed instead of just the username, as this makes it more clear what is being displayed. The inspiration for this change was the observation that many users on my own server have the same display name and username, causing a repetitive list like: Jane jane Robert robert Sally sally Steven steven In addition, some accounts do not have a display name set, so it was not obvious why some people had their name rendered once, and some twice, and why the capitalization differences. --- snikket_web/scss/app.scss | 7 +++++++ snikket_web/templates/library.j2 | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/snikket_web/scss/app.scss b/snikket_web/scss/app.scss index 063a1ef..016b434 100644 --- a/snikket_web/scss/app.scss +++ b/snikket_web/scss/app.scss @@ -1304,4 +1304,11 @@ pre.guru-meditation { margin-left: 0.5em; } + .user-display-name { + font-size: 110%; + } + + .user-jid { + font-size: 90%; + } } diff --git a/snikket_web/templates/library.j2 b/snikket_web/templates/library.j2 index bb0cef2..9e5c660 100644 --- a/snikket_web/templates/library.j2 +++ b/snikket_web/templates/library.j2 @@ -25,10 +25,10 @@ {%- endif -%}
-
{{- user.localpart -}}
{%- if user.display_name %}
{{- user.display_name -}}
{%- endif %} +
{{- user.localpart -}}@{{- config["SNIKKET_DOMAIN"] -}}
{%- endmacro -%} From 5b2f3db8679d1c1f6baf73e41bbac4e4fc5a22cf Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 15 Dec 2023 15:00:13 +0000 Subject: [PATCH 2/3] Update user listing in 'edit circle' view to use new user profile layout --- snikket_web/templates/admin_edit_circle.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/snikket_web/templates/admin_edit_circle.html b/snikket_web/templates/admin_edit_circle.html index d2d3de6..65b19af 100644 --- a/snikket_web/templates/admin_edit_circle.html +++ b/snikket_web/templates/admin_edit_circle.html @@ -1,5 +1,5 @@ {% extends "admin_app.html" %} -{% from "library.j2" import form_button, standard_button, value_or_hint, custom_form_button, clipboard_button, icon %} +{% from "library.j2" import form_button, standard_button, value_or_hint, custom_form_button, clipboard_button, icon, render_user with context %} {% block head_lead %} {{ super() }} {% include "copy-snippet.html" %} @@ -71,7 +71,6 @@
- @@ -79,13 +78,12 @@ -
{% trans %}Login name{% endtrans %}{% trans %}Display name{% endtrans %} {% trans %}Actions{% endtrans %}
{%- if member -%} - {{ localpart }} + {%- call render_user(member) -%}{%- endcall -%} {%- else -%} {{ localpart }} ({% trans %}deleted{% endtrans %}) {%- endif -%} {% call value_or_hint(member.display_name) %}{% endcall %} {%- call custom_form_button("remove_user", form.action_remove_user.name, member.localpart, class="primary danger", slim=True) -%} {% trans username=member.localpart %}Remove user {{ username }} from circle{% endtrans %} From ab7149403af4aec807bfe854a3ee477d35411cbe Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 15 Dec 2023 15:04:46 +0000 Subject: [PATCH 3/3] Update translations pot (no actual string changes) --- snikket_web/translations/messages.pot | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/snikket_web/translations/messages.pot b/snikket_web/translations/messages.pot index c99a00f..3e38eba 100644 --- a/snikket_web/translations/messages.pot +++ b/snikket_web/translations/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2023-12-12 18:22+0000\n" +"POT-Creation-Date: 2023-12-15 15:03+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -23,7 +23,7 @@ msgid "Login name" msgstr "" #: snikket_web/admin.py:73 snikket_web/templates/admin_delete_user.html:12 -#: snikket_web/templates/admin_edit_circle.html:74 snikket_web/user.py:63 +#: snikket_web/user.py:63 msgid "Display name" msgstr "" @@ -544,7 +544,7 @@ msgstr "" #: snikket_web/templates/admin_circles.html:15 #: snikket_web/templates/admin_edit_circle.html:45 -#: snikket_web/templates/admin_edit_circle.html:75 +#: snikket_web/templates/admin_edit_circle.html:74 #: snikket_web/templates/admin_invites.html:24 #: snikket_web/templates/admin_users.html:10 msgid "Actions" @@ -742,37 +742,37 @@ msgstr "" msgid "All members of the circle will see each other in their contact list." msgstr "" -#: snikket_web/templates/admin_edit_circle.html:85 +#: snikket_web/templates/admin_edit_circle.html:84 msgid "The user has been deleted from the server." msgstr "" -#: snikket_web/templates/admin_edit_circle.html:85 +#: snikket_web/templates/admin_edit_circle.html:84 #: snikket_web/templates/library.j2:131 msgid "deleted" msgstr "" -#: snikket_web/templates/admin_edit_circle.html:91 +#: snikket_web/templates/admin_edit_circle.html:89 #, python-format msgid "Remove user %(username)s from circle" msgstr "" -#: snikket_web/templates/admin_edit_circle.html:99 +#: snikket_web/templates/admin_edit_circle.html:97 msgid "This circle currently has no members." msgstr "" -#: snikket_web/templates/admin_edit_circle.html:101 +#: snikket_web/templates/admin_edit_circle.html:99 msgid "Invite more members" msgstr "" -#: snikket_web/templates/admin_edit_circle.html:104 +#: snikket_web/templates/admin_edit_circle.html:102 msgid "Add existing user" msgstr "" -#: snikket_web/templates/admin_edit_circle.html:115 +#: snikket_web/templates/admin_edit_circle.html:113 msgid "All users added" msgstr "" -#: snikket_web/templates/admin_edit_circle.html:116 +#: snikket_web/templates/admin_edit_circle.html:114 msgid "All users on this service are already in this circle." msgstr ""