From f2242b4557ca2ecdb3814b36e07cec920c3313bd Mon Sep 17 00:00:00 2001 From: Michael Woods Date: Sun, 28 Dec 2025 19:28:56 -0500 Subject: [PATCH] message pagination --- packetserver/http/routers/messages.py | 2 +- packetserver/http/templates/message_list.html | 184 ++++++++++-------- 2 files changed, 102 insertions(+), 84 deletions(-) diff --git a/packetserver/http/routers/messages.py b/packetserver/http/routers/messages.py index ba381db..e8ab18a 100644 --- a/packetserver/http/routers/messages.py +++ b/packetserver/http/routers/messages.py @@ -235,6 +235,6 @@ async def message_list_page( "page": page, "per_page": per_page, "total_pages": total_pages, - "current_user": current_user, + "current_user": current_user.username, }, ) \ No newline at end of file diff --git a/packetserver/http/templates/message_list.html b/packetserver/http/templates/message_list.html index 5781aeb..2d55e0c 100644 --- a/packetserver/http/templates/message_list.html +++ b/packetserver/http/templates/message_list.html @@ -1,89 +1,107 @@ -

Messages

+{% extends "base.html" %} -
-
- -
    -
  • - Received -
    • -
  • - Sent -
    • -
  • - All -
    • +{% block title %}Messages{% endblock %} + +{% block content %} +
    +

    Messages

    + +
    +
    + + +
    + +
    + +
    + + + +
    + {% if current_search %} + Clear + {% endif %} + + + +
    +
    + + {% if total > 0 %} +

    + Showing {{ ((page-1)*per_page) + 1 }}–{{ page*per_page if page*per_page < total else total }} of {{ total }} messages +

    + {% endif %} + + {% if messages %} +
      + {% for msg in messages %} +
    • + + + {{ msg.text[:80] }}{% if msg.text|length > 80 %}...{% endif %} + + + {% if msg.has_attachments %}Attachments{% endif %} + {% if not msg.retrieved %}Unread{% endif %} +
      + From: {{ msg.from }} | To: {{ msg.to | join(', ') }} | {{ msg.sent_at[:10] }} {{ msg.sent_at[11:16] }} +
      +
      + {{ msg.text[:200] }}{% if msg.text|length > 200 %}...{% endif %} +
      +
      • + {% endfor %}
    -
    + {% else %} +
    + {% if current_search %} + No messages found matching "{{ current_search }}". + {% else %} + No messages yet. + {% endif %} +
    + {% endif %} -
    - -
    - - - -
    - {% if current_search %} - Clear - {% endif %} + + {% if total_pages > 1 %} + + {% endif %} + +
    + ← Back to Dashboard
    - -{% if total > 0 %} -

    - Showing {{ ((page-1)*per_page) + 1 }}–{{ page*per_page if page*per_page < total else total }} of {{ total }} messages -

    -{% else %} -

    No messages

    -{% endif %} - -{% if messages %} -
      - {% for msg in messages %} -
    • - {{ msg.text[:60] }}{% if msg.text|length > 60 %}...{% endif %} - {% if msg.has_attachments %}(Attachments){% endif %} - {% if not msg.retrieved %}(Unread){% endif %} - - From: {{ msg.from }} | To: {{ msg.to | join(', ') }} | {{ msg.sent_at[:10] }} {{ msg.sent_at[11:19] }} - -
      {{ msg.text[:200] }}{% if msg.text|length > 200 %}...{% endif %}
      -
      • - {% endfor %} -
    -{% else %} -
    - {% if current_search %}No messages found matching "{{ current_search }}".{% else %}No messages yet.{% endif %} -
    -{% endif %} - - -{% if total_pages > 1 %} - -{% endif %} - -

    ← Back to Dashboard

    \ No newline at end of file +{% endblock %} \ No newline at end of file