Skip to content
Snippets Groups Projects
Commit 6f8ecbc4 authored by siebenseitig's avatar siebenseitig
Browse files

feat: update message show and list

parent afe7ffc3
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/core/locale/en/LC_MESSAGES/django.po
+ 6
− 0
View file @ 6f8ecbc4
......@@ -18,6 +18,12 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
msgid "messages_from_sender"
msgstr "Message from"
msgid "messages_was_sent"
msgstr "sent"
msgid "PlatformUser__favorite_event"
msgstr "favorite event"
......
src/plainui/jinja2/plainui/personal_message_list.html
+ 18
− 9
View file @ 6f8ecbc4
......@@ -5,21 +5,25 @@
{% block content %}
{{ titleMacro.title(_("Personal Messages") ) }}
<div class="border border-tertiary my-8 p-6 text-center">
<div class="border my-8 p-6 text-center">
<ul class="row mb-0 list-unstyled mw-664 mx-auto">
<li class="col-12 col-sm-4 mb-3 mb-sm-0">
{% if sent_mode %}
<li class="col-12 col-sm-6 mb-3 mb-sm-0">
<a role="button" class="btn btn-block btn-lg btn-secondary" href="{{ url('plainui:personal_message', conf_slug=conf.slug) }}">{{_("Inbox")}}</a>
</li>
<li class="col-12 col-sm-4 mb-3 mb-sm-0">
{% endif %}
{% if not sent_mode %}
<li class="col-12 col-sm-6 mb-3 mb-sm-0">
<a role="button" class="btn btn-block btn-lg btn-secondary" href="{{ url('plainui:personal_message_outbox', conf_slug=conf.slug) }}">{{_("Outbox")}}</a>
</li>
<li class="col-12 col-sm-4">
{% endif %}
<li class="col-12 col-sm-6">
<a role="button" class="btn btn-block btn-lg btn-primary" href="{{ url('plainui:personal_message_send', conf_slug=conf.slug) }}">{{_("New PM")}}</a>
</li>
</ul>
</div>
<div class="border border-tertiary p-6 mx-0 mt-8 mb-11">
<div class="border p-6 mx-0 mt-8 mb-11">
<h2 class="text-center bg-info p-3 text-white h3">{% if not sent_mode %}{{ _("Received Messages") }} {% else %}{{ _("Sent Messages") }}{% endif %}</h2>
<form method="POST" action="{{ url('plainui:personal_message_delete', conf_slug=conf.slug) }}">
{{ csrf_input }}
......@@ -50,6 +54,11 @@
<path d="M.05 3.555A2 2 0 0 1 2 2h12a2 2 0 0 1 1.95 1.555L8 8.414.05 3.555zM0 4.697v7.104l5.803-3.558L0 4.697zM6.761 8.83l-6.57 4.027A2 2 0 0 0 2 14h12a2 2 0 0 0 1.808-1.144l-6.57-4.027L8 9.586l-1.239-.757zm3.436-.586L16 11.801V4.697l-5.803 3.546z"/>
</svg>
{% endif %}
{% else %}
<svg class="rc3-tile-message__icon" xmlns="http://www.w3.org/2000/svg" width="3.125rem" height="3.125rem" fill="currentColor" class="bi bi-mailbox" viewBox="0 0 16 16">
<title>{{_("messages_was_sent")}}</title>
<path fill-rule="evenodd" d="M6 8a.5.5 0 0 0 .5.5h5.793l-2.147 2.146a.5.5 0 0 0 .708.708l3-3a.5.5 0 0 0 0-.708l-3-3a.5.5 0 0 0-.708.708L12.293 7.5H6.5A.5.5 0 0 0 6 8zm-2.5 7a.5.5 0 0 1-.5-.5v-13a.5.5 0 0 1 1 0v13a.5.5 0 0 1-.5.5z"/>
</svg>
{% endif %}
</a>
</figure>
......
src/plainui/jinja2/plainui/personal_message_show.html
+ 34
− 23
View file @ 6f8ecbc4
......@@ -4,28 +4,29 @@
{% extends "plainui/base.html" %}
{% block title %}{{conf.name}} - {{ _("Personal Message") }}{% endblock %}
{% block content %}
{{ titleMacro.title( msg.subject, report_url=msg.id, report_kind="pn") }}
<div class="border p-6 text-light mx-0 my-11">
<h2 class="text-center bg-info p-3 text-white h3">
{{ _("messages_from_short") }} {{ msg.sender.username }} {{ _("messages_to_short") }} {{ msg.recipient.username }}
<time datetime="{{msg.timestamp}}" class="d-block font-sans-serif fs-medium">
{{ msg.timestamp | strftime }}
</time>
</h2>
<article class="mb-11">
{% set title = _("messages_from_sender") + " " + msg.sender.username %}
{{ titleMacro.title( title , report_url=msg.id, report_kind="pn") }}
{{ markdown(msg_body) }}
<div class="border my-8 p-6 text-center">
<ul class="row mb-0 list-unstyled mw-664 mx-auto">
<li class="col-12 col-sm-4 mb-3 mb-sm-0">
<a class="btn btn-xl btn-block btn-secondary" href="{{ url('plainui:personal_message', conf_slug=conf.slug) }}">
{{_("Messages")}}
</a>
</li>
<ul class="row justify-content-end list-unstyled mt-5 mb-0">
<li class="col-12 col-md-3 mb-3 mb-lg-0">
<li class="col-12 col-sm-4 mb-3 mb-sm-0">
<form method="POST" action="{{ url('plainui:personal_message_delete', conf_slug=conf.slug) }}">
<button class="ml-2 btn btn-xl btn-block btn-secondary" type="submit" name="id" value="{{msg.id}}" title="{{ _("messages_delete") }}">
<button class="btn btn-xl btn-block btn-secondary" type="submit" name="id" value="{{msg.id}}" title="{{ _("messages_delete") }}">
{{ _("Delete") }}
</button>
</form>
</li>
{% if user.id == msg.recipient.id %}
<li class="col-12 col-md-3">
<li class="col-12 col-sm-4">
<a class="btn btn-xl btn-block btn-primary" href="{{ url('plainui:personal_message_send_to', conf_slug=conf.slug, recipient=msg.sender.username) ~ '?in_reply_to=' ~ msg.id | urlencode ~ '&subject=AW: ' ~ msg.subject | truncate(100) | urlencode }}">
{{_("Reply")}}
</a>
......@@ -33,4 +34,14 @@
{% endif %}
</ul>
</div>
<h2 class="d-flex flex-row flex-wrap mt-11">
{{ msg.subject }}
<time datetime="{{msg.timestamp}}" class="d-block font-sans-serif fs-medium pl-2 ml-auto align-self-center">
{{ msg.timestamp | strftime }}
</time>
</h2>
{{ markdown(msg_body) }}
</article>
{% endblock %}
src/plainui/locale/de/LC_MESSAGES/django.po
+ 6
− 0
View file @ 6f8ecbc4
......@@ -411,6 +411,9 @@ msgstr "Löschen"
msgid "messages_was_read"
msgstr "gelesen"
msgid "messages_was_sent"
msgstr "gesendet"
msgid "messages_x_of_n"
msgstr "von"
......@@ -426,6 +429,9 @@ msgstr "Abschicken"
msgid "Personal Message"
msgstr "Persönliche Nachricht"
msgid "messages_from_sender"
msgstr "Nachricht von"
msgid "messages_from_short"
msgstr "Von"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutzerklärung