diff --git a/templates/base.html b/templates/base.html index beef325..0f57627 100644 --- a/templates/base.html +++ b/templates/base.html @@ -4,144 +4,127 @@ {% load django_htmx %} + + + + - - - - - + + {% if config.TF_CLUB_NAME != "TeamForge" %}{{ config.TF_CLUB_NAME }} - {% endif %}TeamForge + - - {% if config.TF_CLUB_NAME != "TeamForge" %}{{ config.TF_CLUB_NAME }} - {% endif %}TeamForge - + + - - + + + + - - - - + {% tailwind_css %} + {% htmx_script %} + - {% tailwind_css %} - {% htmx_script %} + - - + h-screen + overflow-hidden on .drawer keeps the viewport fixed. + overflow-y-auto on .drawer-content lets the right column scroll independently. + sticky top-0 on the topbar header keeps it pinned within that scrolling column. + --> +
+ - - - - -
- - - - - + - -
-
- {% include "backend/partials/messages.html" %} - -
- {% block content %} -

Welcome!

-

This is your main content area.

- {% endblock %} + +
+ {% avatar first_name=request.user.first_name last_name=request.user.last_name %} +
+

{{ request.user.get_full_name }}

+

{{ request.user.email }}

-
-
+
+ +
+ - - - - - \ No newline at end of file + }); + + + diff --git a/templates/members/member_filter.html b/templates/members/member_filter.html index 2135480..bd89f2f 100644 --- a/templates/members/member_filter.html +++ b/templates/members/member_filter.html @@ -12,13 +12,68 @@ {% include "backend/partials/messages.html" %} {% endif %} -

{% translate "Members" %}

+ +
+

{% translate "Members" %}

-
+
+ {% flag "TF_MASS_UPLOAD" %} + + {% endflag %} + + + + {% translate "Add member" %} + +
+
+ + + + + + +
-
{% translate "Filter" %}{% if filter.is_bound %}active{% endif %}
+
+ + {% translate "Filter" %} + {% if filter.is_bound %} + active + {% endif %} +
-
+ {% for field in filter.form %} {% form_field field show_label=False size="small" %} {% endfor %} @@ -27,9 +82,11 @@ - {% if filter.is_bound %} - + {% translate "Clear" %} {% endif %} @@ -38,41 +95,8 @@
-
- - -
- {% flag "TF_MASS_UPLOAD" %} - - {% endflag %} - - - {% translate "Add member" %} - -
-
- -