From e4955b4f7f06c1d258d9829a56ba080d67e813c1 Mon Sep 17 00:00:00 2001
From: weeman <weeman@frankfurt.ccc.de>
Date: Mon, 16 Dec 2024 21:28:34 +0100
Subject: [PATCH] =?UTF-8?q?=C3=9Cberarbeite=20Nachrichten=20UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../plainui/personal_message_list.html.j2 | 71 ++++++------
.../plainui/personal_message_send.html.j2 | 67 ++++++------
.../plainui/personal_message_show.html.j2 | 102 +++++++++---------
src/plainui/locale/de/LC_MESSAGES/django.po | 24 ++---
src/plainui/locale/en/LC_MESSAGES/django.po | 20 ++--
5 files changed, 130 insertions(+), 154 deletions(-)
diff --git a/src/plainui/jinja2/plainui/personal_message_list.html.j2 b/src/plainui/jinja2/plainui/personal_message_list.html.j2
index 696407bf0..763cfeee4 100644
--- a/src/plainui/jinja2/plainui/personal_message_list.html.j2
+++ b/src/plainui/jinja2/plainui/personal_message_list.html.j2
@@ -1,5 +1,6 @@
{% import "plainui/components/function_btns.html.j2" as fbtns with context %}
{% import "plainui/components/nav.html.j2" as navMacro with context %}
+{% import "plainui/components/tagbox.html.j2" as tagboxMacro %}
{% extends "plainui/base.html.j2" %}
@@ -10,42 +11,31 @@
{% block content %}
{{ navMacro.top_nav(_("Personal Messages") ) }}
- <div class="m-0 p-0">
+ <div>
<div class="d-flex">
- <h2 class="hub-section-title flex-grow-1">
- {% if not sent_mode %}
- {{ _("Received Messages") }}
- {% else %}
- {{ _("Sent Messages") }}
- {% endif %}
- </h2>
- <div class="m-0 float-end hub-tags">
- {% if sent_mode %}
- <a role="button"
- class="a a-bold hub-tag hub-tag--secondary"
+ <ul class="nav nav-pills mb-3">
+ <li class="nav-item">
+ <a class="nav-link {% if not sent_mode %}active{% endif %}"
href="{{ url('plainui:personal_message') }}">{{ _("Inbox") }}</a>
- {% endif %}
- {% if not sent_mode %}
- <a role="button"
- class="a a-bold hub-tag hub-tag--secondary"
+ </li>
+ <li class="nav-item">
+ <a class="nav-link {% if sent_mode %}active{% endif %}"
href="{{ url('plainui:personal_message_outbox') }}">{{ _("Outbox") }}</a>
- {% endif %}
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" href="{{ url('plainui:personal_message_send') }}">{{ _("New PM") }}</a>
+ </li>
+ </ul>
- <a role="button"
- class="a hub-tag hub-tag--secondary"
- href="{{ url('plainui:personal_message_send') }}">{{ _("New PM") }}</a>
- </div>
</div>
{% if msgs %}
- <form method="post"
- action="{{ url('plainui:personal_message_delete') }}"
- class="p-3">
+ <form method="post" action="{{ url('plainui:personal_message_delete') }}">
{{ csrf_input }}
- <ul class="hub-list mb-0">
+ <ul class="hub-list">
{%- for msg in msgs %}
<li class="hub-list-item hub-grid-title-buttons">
- <article class="row no-gutters flex-nowrap">
- <figure class="hub-tile-message__icon-col col mb-0">
+ <article class="row flex-column flex-lg-row no-gutters flex-nowrap">
+ <figure class="hub-tile-message__icon-col col mb-0 d-none d-lg-flex">
<a class="hub-tile-message__icon-container text-white"
href="{{ url('plainui:personal_message_show', msg_id=msg.id) }}">
{% if not sent_mode %}
@@ -94,22 +84,23 @@
{% endif %}
</a>
</figure>
- <section class="col pt-3 px-2">
-
- {% set recipient = msg.sender.display_name if not sent_mode else msg.recipient.display_name %}
- {% set recipient_pronouns = msg.sender.pronouns if not sent_mode else msg.recipient.pronouns %}
- {% set recipient_slug = msg.sender.slug if not sent_mode else msg.recipient.slug %}
-
- <a class="text-white"
+ <section class="col">
+ <a class="text-white d-block mb-2 mb-lg-0"
href="{{ url('plainui:personal_message_show', msg_id=msg.id) }}">
<p class="card-title h4 text-white">{{ msg.subject }}</p>
</a>
- <footer class="card-footer d-flex align-items-center bg-transparent text-white font-sans-serif fs-medium">
- <a class="pe-1 a a-bold"
- href="{{ url('plainui:user', user_slug=recipient_slug) }}">{{ recipient }},</a>
- <time datetime="{{ msg.timestamp }}">{{ msg.timestamp | strftime }}</time>
- <div class="d-inline-flex ms-auto">
+ <footer class="card-footer d-flex flex-column flex-lg-row align-items-lg-center bg-transparent text-white font-sans-serif fs-medium gap-2">
+ <div class="d-md-flex">
+ <div class="me-2">
+ {{ tagboxMacro.user(msg.sender.get_display_name() ,
+ link=url('plainui:user', user_slug=msg.sender.slug)
+ ) }}
+ </div>
+
+ <time datetime="{{ msg.timestamp }}">{{ msg.timestamp | strftime }}</time>
+ </div>
+ <div class="d-inline-flex ms-lg-auto">
<a class="me-2 btn-icon-big btn btn-transparent"
title="{{ _('read') }}"
href="{{ url('plainui:personal_message_show', msg_id=msg.id) }}">
@@ -146,7 +137,7 @@
</li>
{%- endfor %}
</ul>
- <p class="font-headings text-white text-right p-0">{{ msgs | length }} {{ _("messages_x_of_n") }} {{ total }}</p>
+ <p class="font-headings text-white text-end pt-2">{{ msgs | length }} {{ _("messages_x_of_n") }} {{ total }}</p>
</form>
{% else %}
<p class="hub-empty-section">{{ _("No entries available.") }}</p>
diff --git a/src/plainui/jinja2/plainui/personal_message_send.html.j2 b/src/plainui/jinja2/plainui/personal_message_send.html.j2
index 309837476..80de8b428 100644
--- a/src/plainui/jinja2/plainui/personal_message_send.html.j2
+++ b/src/plainui/jinja2/plainui/personal_message_send.html.j2
@@ -9,48 +9,47 @@
{% endblock title %}
{% block content %}
- {{ navMacro.top_nav(_("Send Personal Message") , has_breadcrumbs=True) }}
- <nav aria-label="breadcrumb">
- <ol class="breadcrumb hub-breadcrumbs">
- <li class="breadcrumb-item">
- <a href="{{ url('plainui:index') }}">{{ conf.name }}</a>
- </li>
- <li class="breadcrumb-item">
- <a href="{{ url('plainui:personal_message') }}">{{ _("Personal Messages") }}</a>
- </li>
- </ol>
- </nav>
+ {{ navMacro.top_nav(_("Personal Messages") ) }}
+
+ <ul class="nav nav-pills mb-3">
+ <li class="nav-item">
+ <a class="nav-link" href="{{ url('plainui:personal_message') }}">{{ _("Inbox") }}</a>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" href="{{ url('plainui:personal_message_outbox') }}">{{ _("Outbox") }}</a>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link active"
+ href="{{ url('plainui:personal_message_send') }}">{{ _("New PM") }}</a>
+ </li>
+ </ul>
<form method="post" class="{% if form.errors %}border-danger{% endif %}">
- <div class="m-0 p-0">
+ <div class="hub-card">
<h2 class="hub-section-title">{{ _("New Personal Message") }}</h2>
- <div class="hub-card">
- <div class="p-3">
- {{ csrf_input }}
-
- {{ form_elements.errors(form) }}
- {{ form_elements.hidden(form, 'in_reply_to') }}
- {{ form_elements.text(form, 'recipient') }}
- {{ form_elements.text(form, 'subject') }}
- {{ form_elements.textarea(form, 'body') }}
-
- <ul class="d-flex justify-content-center list-unstyled mb-0">
- <li class="m-2">
- <button type="submit" class="btn btn-primary">{{ _("Send") }}</button>
- </li>
- </ul>
- </div>
+
+ {{ csrf_input }}
+
+ {{ form_elements.errors(form) }}
+ {{ form_elements.hidden(form, 'in_reply_to') }}
+ {{ form_elements.text(form, 'recipient') }}
+ {{ form_elements.text(form, 'subject') }}
+ {{ form_elements.textarea(form, 'body') }}
+
+ <div class="mt-3">
+ <button type="submit" class="btn btn-primary">{{ _("Send") }}</button>
</div>
</div>
</form>
{% if in_reply_to %}
<hr class="hub-spacer">
- <div class="p-0 m-0">
- <div class="hub-card">
- <h2 class="hub-head-main">{{ in_reply_to.subject }}</h2>
- <div class="card-body">{{ markdown(in_reply_to_body, border=False) }}</div>
- </div>
+ <div class="hub-card">
+ <h2 class="hub-section-title">
+ <small>{{ _("In Reply To") }}</small>
+ <br>
+ {{ in_reply_to.subject }}
+ </h2>
+ <div class="card-body">{{ markdown(in_reply_to_body, border=False) }}</div>
</div>
{% endif %}
- <hr class="hub-spacer">
{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/personal_message_show.html.j2 b/src/plainui/jinja2/plainui/personal_message_show.html.j2
index f3aca15e4..f7b93563d 100644
--- a/src/plainui/jinja2/plainui/personal_message_show.html.j2
+++ b/src/plainui/jinja2/plainui/personal_message_show.html.j2
@@ -1,6 +1,7 @@
{% import "plainui/components/function_btns.html.j2" as fbtns with context %}
{% import "plainui/components/nav.html.j2" as navMacro with context %}
{% from "plainui/components/markdown.html.j2" import markdown %}
+{% import "plainui/components/tagbox.html.j2" as tagboxMacro %}
{% extends "plainui/base.html.j2" %}
@@ -9,61 +10,58 @@
{% endblock title %}
{% block content %}
- {{ navMacro.top_nav(_("Message from %(user)s", user=msg.sender.display_name) , has_breadcrumbs=True) }}
+ {{ navMacro.top_nav(_("Message from %(user)s", user=msg.sender.display_name) ) }}
<article class="mb-11">
- <nav aria-label="breadcrumb">
- <ol class="breadcrumb hub-breadcrumbs">
- <li class="breadcrumb-item">
- <a href="{{ url('plainui:index') }}">{{ conf.name }}</a>
- </li>
- <li class="breadcrumb-item">
- <a href="{{ url('plainui:personal_message') }}">{{ _("Personal Messages") }}</a>
- </li>
- </ol>
- </nav>
+ <ul class="nav nav-pills mb-3">
+ <li class="nav-item">
+ <a class="nav-link" href="{{ url('plainui:personal_message') }}">{{ _("Inbox") }}</a>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" href="{{ url('plainui:personal_message_outbox') }}">{{ _("Outbox") }}</a>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" href="{{ url('plainui:personal_message_send') }}">{{ _("New PM") }}</a>
+ </li>
+ </ul>
- <div class="p-0 m-0">
- <div class="hub-card">
- <div class="d-flex">
- <h2 class="hub-head-main flex-grow-1">{{ msg.subject }}</h2>
- <div class="m-0 float-end hub-tags">
- {% if user.id == msg.recipient.id %}
- <a class="a hub-tag hub-tag--primary"
- href="{{ url('plainui:personal_message_send_to', recipient=msg.sender.username) ~ '?in_reply_to=' ~ msg.id | urlencode ~ '&subject=AW: ' ~ msg.subject | truncate(100) | urlencode }}">
- {{ _("Reply") }}
- </a>
- <a class="a hub-tag text-bg-warning"
- href="{{ build_report_url(request, reported_url=msg.id, kind='pn', next_url=request.url) }}">
- {{ _("Report") }}
- </a>
- {% endif %}
- <form method="post" action="{{ url('plainui:personal_message_delete') }}">
- {{ csrf_input }}
- <button class="a hub-tag hub-tag--danger"
- type="submit"
- name="id"
- value="{{ msg.id }}"
- title="{{ _('messages_delete') }}">{{ _("Delete") }}</button>
- </form>
- </div>
- </div>
- <div class="card-title pe-4">
- <p>
- {% if msg.sender %}
- <a class="a a-bold"
- href="{{ url('plainui:user', user_slug=msg.sender.slug) }}">{{ msg.sender.display_name }}</a>
- {% else %}
- <span class="m-0 ps-3">{{ _("disabled user") }}</span>
- {% endif %}
- <time datetime="{{ msg.timestamp }}"
- class="font-sans-serif fw-normal m-0 ps-3">
- {{ msg.timestamp | strftime }}
- </time>
- {% if msg.has_responded %}<span class="m-0 ps-3">{{ _("you have responded") }}</span>{% endif %}
- </p>
- </div>
- <div class="card-body">{{ markdown(msg_body, border=False) }}</div>
+ <div class="hub-card p-4">
+ <h2 class="hub-head-main">{{ msg.subject }}</h2>
+ <div class="hub-tags my-3">
+ {% if msg.sender %}
+ {{ tagboxMacro.user(msg.sender.get_display_name() ,
+ link=url('plainui:user', user_slug=msg.sender.slug)
+ ) }}
+ {% else %}
+ <span>{{ _("disabled user") }}</span>
+ {% endif %}
+ <time datetime="{{ msg.timestamp }}" class="font-sans-serif fw-normal">
+ {{ msg.timestamp | strftime }}
+ </time>
+ {% if msg.has_responded %}<span>({{ _("you have responded") }})</span>{% endif %}
+ </div>
+ <div class="card-body mb-3">{{ markdown(msg_body, border=False) }}</div>
+ <div class="d-flex gap-3">
+ {% if user.id == msg.recipient.id %}
+ <a class="btn btn-primary me-auto"
+ href="{{ url('plainui:personal_message_send_to', recipient=msg.sender.username) ~ '?in_reply_to=' ~ msg.id | urlencode ~ '&subject=AW: ' ~ msg.subject | truncate(100) | urlencode }}">
+ {{ _("Reply") }}
+ </a>
+ <a class="btn btn-warning"
+ href="{{ build_report_url(request, reported_url=msg.id, kind='pn', next_url=request.url) }}">
+ {{ _("Report") }}
+ </a>
+ {% endif %}
+ <form class="d-inline-block"
+ method="post"
+ action="{{ url('plainui:personal_message_delete') }}">
+ {{ csrf_input }}
+ <button class="btn btn-danger ms-auto"
+ type="submit"
+ name="id"
+ value="{{ msg.id }}"
+ title="{{ _('messages_delete') }}">{{ _("Delete") }}</button>
+ </form>
</div>
</div>
</article>
diff --git a/src/plainui/locale/de/LC_MESSAGES/django.po b/src/plainui/locale/de/LC_MESSAGES/django.po
index e96ccbe92..2615eaf84 100644
--- a/src/plainui/locale/de/LC_MESSAGES/django.po
+++ b/src/plainui/locale/de/LC_MESSAGES/django.po
@@ -533,12 +533,6 @@ msgstr "Wenn du keine E-Mail erhältst, vergewissere dich bitte, dass du die Adr
msgid "Personal Messages"
msgstr "Persönliche Nachrichten"
-msgid "Received Messages"
-msgstr "Empfangene Nachrichten"
-
-msgid "Sent Messages"
-msgstr "Gesendete Nachrichten"
-
msgid "Inbox"
msgstr "Posteingang"
@@ -578,21 +572,24 @@ msgstr "Neue Persönliche Nachricht"
msgid "Send"
msgstr "senden"
+msgid "In Reply To"
+msgstr "Als Antwort auf"
+
msgid "Personal Message"
msgstr "Persönliche Nachricht"
-msgid "Reply"
-msgstr "Antwort"
-
-msgid "Report"
-msgstr "Melden"
-
msgid "disabled user"
msgstr "deaktivierter User"
msgid "you have responded"
msgstr "du hast geantwortet"
+msgid "Reply"
+msgstr "Antwort"
+
+msgid "Report"
+msgstr "Melden"
+
msgid "last login"
msgstr "Letzter Login"
@@ -1005,9 +1002,6 @@ msgstr "%(conf)s - Passwort-Reset gesendet"
msgid "report this message"
msgstr "diese Nachricht melden"
-msgid "Send Personal Message"
-msgstr "Persönliche Nachricht senden"
-
#, python-format
msgid "Message from %(user)s"
msgstr "Nachricht von %(user)s"
diff --git a/src/plainui/locale/en/LC_MESSAGES/django.po b/src/plainui/locale/en/LC_MESSAGES/django.po
index d81ef5900..36d0dc33f 100644
--- a/src/plainui/locale/en/LC_MESSAGES/django.po
+++ b/src/plainui/locale/en/LC_MESSAGES/django.po
@@ -533,12 +533,6 @@ msgstr ""
msgid "Personal Messages"
msgstr ""
-msgid "Received Messages"
-msgstr "Received Messages"
-
-msgid "Sent Messages"
-msgstr "Sent Messages"
-
msgid "Inbox"
msgstr ""
@@ -578,19 +572,22 @@ msgstr ""
msgid "Send"
msgstr ""
+msgid "In Reply To"
+msgstr ""
+
msgid "Personal Message"
msgstr ""
-msgid "Reply"
+msgid "disabled user"
msgstr ""
-msgid "Report"
+msgid "you have responded"
msgstr ""
-msgid "disabled user"
+msgid "Reply"
msgstr ""
-msgid "you have responded"
+msgid "Report"
msgstr ""
msgid "last login"
@@ -1005,9 +1002,6 @@ msgstr ""
msgid "report this message"
msgstr ""
-msgid "Send Personal Message"
-msgstr ""
-
#, python-format
msgid "Message from %(user)s"
msgstr ""
--
GitLab