accrete 0.0.146__tar.gz → 0.0.147__tar.gz

{accrete-0.0.146 → accrete-0.0.147}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: accrete
-Version: 0.0.146
+Version: 0.0.147
 Summary: Django Shared Schema Multi Tenant
 Author-email: Benedikt Jilek <benedikt.jilek@pm.me>
 License: Copyright (c) 2025 Benedikt Jilek

{accrete-0.0.146 → accrete-0.0.147}/accrete/contrib/ui/response.py

@@ -100,13 +100,15 @@ class ListResponse(WindowResponse):
         panel_template: str = None,
         column_count: int = 1,
         column_height: str = '150px',
-        overview_template: str = 'ui/list.html'
+        overview_template: str = 'ui/list.html',
+        detail_response: 'DetailResponse' = None
     ):
         assert page is not None or ui_filter is not None, _(
             'Argument page or ui_filter must be supplied'
         )
         self.ui_filter = ui_filter
         self.overview_template = overview_template
+        self.show_content_right = bool(detail_response)
         super().__init__(
             title=title,
             context=context,
@@ -122,8 +124,11 @@ class ListResponse(WindowResponse):
             'ui_filter': ui_filter,
             'endless_scroll': endless_scroll,
             'column_count': column_count,
-            'column_height': column_height
+            'column_height': column_height,
+            'show_content_right': str(self.show_content_right).lower()
         })
+        if detail_response:
+            self.context.update(detail_response.context)
 
     def _has_panel(self):
         return bool(self.panel_template or self.ui_filter)
@@ -174,7 +179,7 @@ class TableResponse(WindowResponse):
         self, *,
         title: str,
         context: dict,
-        object_label: str,
+        instance_label: str,
         fields: list[str],
         footer: dict = None,
         page: paginator.Page = None,
@@ -182,7 +187,8 @@ class TableResponse(WindowResponse):
         endless_scroll: bool = True,
         header_template: str = None,
         panel_template: str = None,
-        overview_template: str = 'ui/table.html'
+        overview_template: str = 'ui/table.html',
+        detail_response: 'DetailResponse' = None
     ):
         assert page is not None or ui_filter is not None, _(
             'Argument page or ui_filter must be supplied'
@@ -203,9 +209,11 @@ class TableResponse(WindowResponse):
             'ui_filter': ui_filter,
             'endless_scroll': endless_scroll,
             'fields': fields,
-            'object_label': object_label,
+            'instance_label': instance_label,
             'footer': footer
         })
+        if detail_response:
+            self.context.update(detail_response.context)
 
     def _has_panel(self):
         return bool(self.panel_template or self.ui_filter)
@@ -230,6 +238,7 @@ class TableRowResponse(Response):
             'instance': instance,
             'fields': fields,
             'footer': footer,
+            'page': page
         }
         super().__init__(template=self.base_template, context=context)
 
@@ -252,13 +261,15 @@ class DetailResponse(Response):
     def __init__(
         self, *,
         context: dict,
-        detail_header_template: str = None,
-        detail_data_template: str = None
+        header_template: str = None,
+        data_template: str = None
     ):
         super().__init__(template=self.base_template, context=context)
+        self.header_template = header_template
+        self.data_template = data_template
         self.context.update({
-            'detail_header_template': detail_header_template,
-            'detail_data_template': detail_data_template
+            'detail_header_template': header_template,
+            'detail_data_template': data_template
         })
 
     @staticmethod
@@ -303,7 +314,7 @@ class TriggerResponse:
 
     def response(self):
         res = HttpResponse()
-        res.headers['HX-Reswap'] = 'None'
+        res.headers['HX-Reswap'] = 'none'
         for trigger in self.trigger:
             add_trigger(res, trigger.trigger, trigger.header)
         return res
@@ -345,7 +356,9 @@ def add_trigger(
 def update(request, ui_responses: list[Response]) -> HttpResponse:
     response = HttpResponse()
     content = ''
+    print(ui_responses)
     for res in ui_responses:
+        print(res.context)
         content += res.render(request)
         res.add_trigger(response)
     content += render_to_string('ui/message.html', request=request)

{accrete-0.0.146 → accrete-0.0.147}/accrete/contrib/ui/static/css/accrete.css

@@ -84,10 +84,6 @@ input[disabled] ~ .helptext {
   font-weight: normal !important; }
 
 textarea {
-  border-top: transparent !important;
-  border-right: transparent !important;
-  border-left: transparent !important;
-  border-radius: 0 !important;
   box-shadow: none !important; }
 
 textarea:focus {
@@ -161,7 +157,7 @@ select:focus {
   max-width: calc(var(--accrete-detail-width) - 6%); }
 
 .list-entry > .box:hover, .box.selected {
-  outline: 2px solid var(--bulma-success); }
+  box-shadow: 0 0 5px 2px var(--bulma-success); }
 
 .helptext {
   font-style: italic !important;

accrete-0.0.147/accrete/contrib/ui/static/css/accrete.css.map

@@ -0,0 +1,7 @@
+{
+"version": 3,
+"mappings": "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",
+"sources": ["accrete.scss"],
+"names": [],
+"file": "accrete.css"
+}

{accrete-0.0.146 → accrete-0.0.147}/accrete/contrib/ui/static/css/accrete.scss

@@ -106,10 +106,6 @@ input[disabled] ~ .helptext {
 }
 
 textarea {
-    border-top: transparent!important;
-    border-right: transparent!important;
-    border-left: transparent!important;
-    border-radius: 0!important;
     box-shadow: none!important;
 }
 
@@ -199,7 +195,7 @@ select:focus {
 }
 
 .list-entry > .box:hover, .box.selected {
-  outline: 2px solid var(--bulma-success);
+  box-shadow: 0 0 5px 2px var(--bulma-success);
 }
 
 .helptext {

{accrete-0.0.146 → accrete-0.0.147}/accrete/contrib/ui/templates/ui/layout.html

@@ -42,6 +42,7 @@
                 }
             })
         </script>
+        {% if script_template %}{% include script_template %}{% endif %}
         <title>{% block title %}{{ title }}{% endblock %}</title>
     {% endblock %}
 </head>
@@ -137,7 +138,7 @@
                     {% endfor %}
                 </div>
 
-                <div x-data="{showContentRight: false}"
+                <div x-data="{showContentRight: {{ show_content_right|default_if_falsy:'false' }}}"
                      @activate-detail.window="showContentRight = true;"
                      @deactivate-detail.window="showContentRight = false;"
                      class="is-flex is-flex-direction-row"
@@ -197,7 +198,7 @@
                         </div>
                     </div>
                 
-                    <div id="detail-container" x-show="showContentRight" style="display: none;"
+                    <div id="detail-container" x-show="showContentRight" {% if show_content_right != 'true' %}style="display: none;"{% endif %}
                              x-transition:enter.duration.200ms x-transition:leave.duration.50ms
                     >
                         <div id="detail-indicator" class="htmx-indicator">
@@ -208,7 +209,9 @@
                                 <div id="detail-header" class="is-flex is-flex-wrap-wrap is-flex-grow-1">
                                     {% if detail_header_template %}{% include detail_header_template %}{% endif %}
                                 </div>
-                                <button class="button is-light is-align-self-baseline" style="border-radius: var(--bulma-radius-medium)" x-on:click="showContentRight = false;">
+                                <button class="button is-light is-align-self-baseline" style="border-radius: var(--bulma-radius-medium)"
+                                        x-on:click="showContentRight = false; const url = new URL(window.location); url.searchParams.delete('detail'); history.replaceState(null, '', url);"
+                                >
                                     <span class="icon"><i class="fa fa-xmark"></i></span>
                                 </button>
                             </div>

accrete-0.0.147/accrete/contrib/ui/templates/ui/list.html

@@ -0,0 +1,42 @@
+{% load i18n %}
+{% load ui %}
+{% load partials %}
+
+<div class="fixed-grid has-{{ column_count }}-cols has-1-cols-mobile m-2">
+    <div id="list-grid" class="grid m-0">
+        {% for instance in page.object_list %}
+            {% partialdef entry inline=True %}
+                <div id="list-entry-{{ instance.pk }}" class="list-entry cell pb-0" style="height: {{ column_height }}">
+                    <div class="box p-3"
+                         style="word-break: break-word; height: 100%; overflow-y: auto; {% if instance.get_absolute_url %}cursor:pointer;{% endif %}"
+                         {% if instance.get_absolute_url %}
+                            hx-get="{{ instance.get_absolute_url }}{% querystring %}" hx-swap="none" hx-indicator="#detail-indicator" hx-replace-url="{% querystring detail=instance.pk %}"
+                            x-on:click="$dispatch('unselect-list-entry'); selected = true; $nextTick(() => { $el.scrollIntoView({block: 'nearest'}) });" x-bind:class="selected ? 'selected' : ''"
+                         {% endif %}
+                         x-data="{selected: false}" @unselect-list-entry.window="selected = false"
+                    >
+                        <div id="list-data-{{ instance.pk }}">
+                            {% if list_entry_template %}
+                                {% include list_entry_template %}
+                            {% else %}
+                                {{ instance }}
+                            {% endif %}
+                        </div>
+                    </div>
+                </div>
+            {% endpartialdef %}
+        {% endfor %}
+    </div>
+    {% if endless_scroll and page.has_next %}
+        <div id="endless-scroller"
+             hx-get="{% querystring page=page.next_page_number %}"
+             hx-target="#list-grid"
+             hx-trigger="intersect once"
+             hx-select=".list-entry"
+             hx-select-oob="#pagination-next-button,#pagination-end-index,#endless-scroller"
+             hx-swap="beforeend"
+             hx-replace-url="true"
+             hx-indicator="#endless-scroll-indicator"></div>
+        <progress id="endless-scroll-indicator" class="htmx-indicator progress is-small is-success" max="100">15%</progress>
+    {% endif %}
+</div>

accrete-0.0.147/accrete/contrib/ui/templates/ui/table.html

@@ -0,0 +1,75 @@
+{% load i18n %}
+{% load ui %}
+{% load partials %}
+
+<table id="content-table" class="table can-compact is-fullwidth is-hoverable is-narrow my-0" hx-indicator=".htmx-indicator" x-data="">
+    <thead style="position: sticky; top: 0; z-index: 10; background-color: var(--bulma-scheme-main)">
+        <tr>
+            <th>{{ instance_label }}</th>
+            {% for field in fields %}
+                <th style="text-align: {{ page.object_list|table_alignment:field }}">{{ page.object_list|verbose_field_name:field }}</th>
+            {% endfor %}
+        </tr>
+    </thead>
+    <tbody id="content-table-body" style="z-index: 9" x-ref="tbody">
+        {% for instance in page.object_list %}
+            {% partialdef tr inline=True %}
+                <tr id="tr-{{ instance.pk }}"
+                    {% if instance.get_absolute_url %}
+                        style="cursor: pointer;"
+                        hx-get="{{ instance.get_absolute_url }}{% querystring %}" hx-swap="none"
+                        hx-replace-url="{% querystring detail=instance.pk %}"
+                        x-data="{selected: false}" @unselect-tr.window="selected = false"
+                        x-on:click="$dispatch('unselect-tr'); selected = true; $nextTick(() => { $el.scrollIntoView( {block: 'nearest'} ) });" x-bind:class="selected ? 'is-success' : ''"
+                    {% endif %}
+                >
+                    {% partialdef td inline=True %}
+                        <td>{{ instance }}</td>
+                        {% for field in fields %}
+                            <td style="text-align: {{ instance|table_alignment:field }}">
+                                <span class="">
+                                    <span class="responsive-heading has-text-weight-light" style="margin-right: .2rem">{{ instance|verbose_field_name:field }}:</span>
+                                    {{ instance|table_display:field|default_if_none:'' }}
+                                </span>
+                            </td>
+                        {% endfor %}
+                    {% endpartialdef %}
+                </tr>
+            {% endpartialdef %}
+        {% endfor %}
+    </tbody>
+    <tfoot style="position: sticky; bottom: 0; z-index: 10; background-color: var(--bulma-scheme-main);" class="has-text-weight-bold">
+        <tr id="tf-row">
+            {% partialdef tf inline=True %}
+                <td class="p-0"></td>
+                {% for field in fields %}
+                    {% if field in footer %}
+                        <td style="text-align: {{ page.object_list|table_alignment:field }}">
+                            <span class="">
+                                <span class="responsive-heading has-text-weight-light" style="margin-right: .2rem">{{ page.object_list|verbose_field_name:field }}:</span>
+                                {{ footer|get_item:field }}
+                            </span>
+                        </td>
+                    {% else %}
+                        <td class="p-0"></td>
+                    {% endif %}
+                {% endfor %}
+            {% endpartialdef %}
+        </tr>
+    </tfoot>
+</table>
+
+<div id="endless-scroller"
+     {% if page.has_next %}
+        hx-get="{% querystring page=page.next_page_number %}"
+        hx-trigger="intersect once"
+        hx-select="tbody > tr"
+        hx-target="#content-table-body"
+        hx-swap="beforeend"
+        hx-select-oob="#pagination-next-button,#pagination-end-index,#endless-scroller"
+        hx-indicator="#endless-scroll-indicator"
+        hx-replace-url="true"
+     {% endif %}
+>
+</div>
+<progress id="endless-scroll-indicator" class="htmx-indicator progress is-small is-success" max="100">15%</progress>

accrete-0.0.147/accrete/contrib/ui/templates/ui/table_row_update.html

@@ -0,0 +1,14 @@
+<table>
+    <tbody>
+        <tr hx-swap-oob="innerHTML:#tr-{{ instance.pk }}">
+            {% include 'ui/table.html#td' with instance=instance fields=fields page=page %}
+        </tr>
+    </tbody>
+    {% if footer %}
+        <tfoot>
+            <tr hx-swap-oob="innerHTML:#tf-row">
+                {% include 'ui/table.html#tf' with instance=instance fields=fields page=page %}
+            </tr>
+        </tfoot>
+    {% endif %}
+</table>

{accrete-0.0.146 → accrete-0.0.147}/accrete/contrib/ui/templates/ui/templatetags/field.html

@@ -5,7 +5,15 @@
     <label class="label mt-2 mb-5">
         {{ field }}
         <span class="has-text-danger is-size-6">{{ field.errors }}</span>
-        <p class="helptext {% if field.field.required %}has-text-weight-bold{% endif %}">{% if label %}{{ label }}{% else %}{{ field.help_text|default_if_falsy:field.label }}{% endif %}</p>
+        <span class="helptext {% if field.field.required %}has-text-weight-bold{% endif %}">{% if label %}{{ label }}{% else %}{{ field.help_text|default_if_falsy:field.label }}{% endif %}</span>
+    </label>
+{% endpartialdef %}
+
+{% partialdef textarea %}
+    <label class="label mt-2 mb-5">
+        <span class="helptext {% if field.field.required %}has-text-weight-bold{% endif %}">{% if label %}{{ label }}{% else %}{{ field.help_text|default_if_falsy:field.label }}{% endif %}</span>
+        <span class="has-text-danger is-size-6">{{ field.errors }}</span>
+        {{ field }}
     </label>
 {% endpartialdef %}
 

{accrete-0.0.146 → accrete-0.0.147}/accrete/contrib/ui/templates/ui/widgets/model_search_select_multi.html

@@ -13,7 +13,7 @@
     <div id="{{ widget.attrs.id }}_display" class="input select py-1 pl-1" tabindex="0" x-ref="inputDisplay" aria-label="inputDisplay"
          style="padding-right: 30px; border-radius: 0; border-top: 0; border-right:0; border-left: 0; min-height: var(--bulma-control-height); height: fit-content; width: 100%"
          x-on:keydown="if (![9, 27, 38, 40].includes($event.keyCode)) {$refs.searchInput.focus();}"
-         x-on:mousedown.stop="if (!$event.target.classList.contains('delete')) {if (open) {open = false; } else {open = true; $refs.searchInput.focus();}}"
+         x-on:click.stop="if (!$event.target.classList.contains('delete')) {if (open) {open = false; } else {open = true; $refs.searchInput.focus();}}"
     >
         <div class="tags" x-ref="inputDisplayTags" 
              x-on:click="

{accrete-0.0.146 → accrete-0.0.147}/accrete/contrib/ui/templatetags/ui.py

@@ -8,6 +8,7 @@ from django.db.models import Manager, DecimalField, IntegerField, FloatField, Mo
 from django.apps import apps
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
+from django.forms import widgets
 
 _logger = logging.getLogger(__name__)
 register = template.Library()
@@ -149,8 +150,11 @@ def x_ref_save(param: str):
     return re.sub(r'[^A-Za-z]+','', param)
 
 
-@register.filter(name='wrap_label')
-def wrap_label(field, label=None):
+@register.filter(name='wrap_form_field')
+def wrap_form_fields(field, label=None):
+    if isinstance(field.field.widget, widgets.Textarea):
+        html = render_to_string('ui/templatetags/field.html#textarea', {'field': field, 'label': label})
+        return mark_safe(html)
     html = render_to_string('ui/templatetags/field.html#form_field', {'field': field, 'label': label})
     return mark_safe(html)
 
@@ -158,7 +162,7 @@ def wrap_label(field, label=None):
 @register.filter(name='wrap_model_field')
 def wrap_model_field(instance, field_name):
     field = instance._meta.get_field(field_name)
-    if field_name == 'invoicing_period' and field.choices:
+    if field.choices:
         value = getattr(instance, f'get_{field_name}_display')()
     else:
         value = getattr(instance, field_name)

{accrete-0.0.146 → accrete-0.0.147}/accrete/contrib/user/templates/user/change_email.html

@@ -5,8 +5,8 @@
 {% block modal_content %}
     <form id="{{ modal_id }}-form" hx-post="{% url 'user:change_email' %}">
         {% csrf_token %}
-        {{ form.email|wrap_label }}
-        {{ form.password|wrap_label }}
+        {{ form.email|wrap_form_field }}
+        {{ form.password|wrap_form_field }}
     </form>
 {% endblock %}
 

{accrete-0.0.146 → accrete-0.0.147}/accrete/contrib/user/templates/user/change_password.html

@@ -5,9 +5,9 @@
 {% block modal_content %}
     <form id="{{ modal_id }}-form" hx-post="{% url 'user:change_password' %}">
         {% csrf_token %}
-        {{ form.old_password|wrap_label }}
-        {{ form.new_password|wrap_label }}
-        {{ form.new_password_confirm|wrap_label }}
+        {{ form.old_password|wrap_form_field }}
+        {{ form.new_password|wrap_form_field }}
+        {{ form.new_password_confirm|wrap_form_field }}
 </form>
 {% endblock %}
 

{accrete-0.0.146 → accrete-0.0.147}/accrete/contrib/user/templates/user/user_preferences.html

@@ -23,19 +23,19 @@
                     {% include 'ui/form_error.html' %}
                 </div>
             </div>
-            <div class="columns m-0">
+            <div class="columns">
                 <div class="column is-6">
                     {% translate 'Username' as username %}
-                    {{ form.username|wrap_label:username }}
-                    {{ form.first_name|wrap_label }}
-                    {{ form.last_name|wrap_label }}
+                    {{ form.username|wrap_form_field:username }}
+                    {{ form.first_name|wrap_form_field }}
+                    {{ form.last_name|wrap_form_field }}
                 </div>
                 <div class="column is-6">
                     {% if not user.is_managed %}
                         {{ user|wrap_model_field:'email' }}
                     {% endif %}
-                    {{ form.language_code|wrap_label }}
-                    {{ form.theme|wrap_label }}
+                    {{ form.language_code|wrap_form_field }}
+                    {{ form.theme|wrap_form_field }}
                 </div>
             </div>
         </form>

{accrete-0.0.146 → accrete-0.0.147}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'hatchling.build'
 
 [project]
 name = 'accrete'
-version = '0.0.146'
+version = '0.0.147'
 authors = [
   { name='Benedikt Jilek', email='benedikt.jilek@pm.me' },
 ]

accrete-0.0.146/accrete/contrib/ui/static/css/accrete.css.map

@@ -1,7 +0,0 @@
-{
-"version": 3,
-"mappings": "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",
-"sources": ["accrete.scss"],
-"names": [],
-"file": "accrete.css"
-}

accrete-0.0.146/accrete/contrib/ui/templates/ui/list.html

@@ -1,45 +0,0 @@
-{#{% extends 'ui/layout.html' %}#}
-{% load i18n %}
-{% load ui %}
-{% load partials %}
-
-{% block overview %}
-    <div class="fixed-grid has-{{ column_count }}-cols has-1-cols-mobile m-2">
-        <div id="list-grid" class="grid m-0">
-            {% for instance in page.object_list %}
-                {% partialdef entry inline=True %}
-                    <div id="list-entry-{{ instance.pk }}" class="list-entry cell pb-0" style="height: {{ column_height }}">
-                        <div class="box p-3"
-                             style="word-break: break-word; height: 100%; overflow-y: auto; {% if instance.get_absolute_url %}cursor:pointer;{% endif %}"
-                             {% if instance.get_absolute_url %}
-                                hx-get="{{ instance.get_absolute_url }}{% querystring %}" hx-swap="none" hx-indicator="#detail-indicator"
-                                x-on:click="$dispatch('unselect-list-entry'); selected = true; $nextTick(() => { $el.scrollIntoView({block: 'nearest'}) });" x-bind:class="selected ? 'box selected' : ''"
-                             {% endif %}
-                             x-data="{selected: false}" @unselect-list-entry.window="selected = false"
-                        >
-                            <div id="list-data-{{ instance.pk }}">
-                                {% if list_entry_template %}
-                                    {% include list_entry_template %}
-                                {% else %}
-                                    {{ instance }}
-                                {% endif %}
-                            </div>
-                        </div>
-                    </div>
-                {% endpartialdef %}
-            {% endfor %}
-        </div>
-        {% if endless_scroll and page.has_next %}
-            <div id="endless-scroller"
-                 hx-get="{% querystring page=page.next_page_number %}"
-                 hx-target="#list-grid"
-                 hx-trigger="intersect once"
-                 hx-select=".list-entry"
-                 hx-select-oob="#pagination-next-button,#pagination-end-index,#endless-scroller"
-                 hx-swap="beforeend"
-                 hx-replace-url="true"
-                 hx-indicator="#endless-scroll-indicator"></div>
-            <progress id="endless-scroll-indicator" class="htmx-indicator progress is-small is-success" max="100">15%</progress>
-        {% endif %}
-    </div>
-{% endblock %}

accrete-0.0.146/accrete/contrib/ui/templates/ui/table.html

@@ -1,77 +0,0 @@
-{% extends 'ui/layout.html' %}
-{% load i18n %}
-{% load ui %}
-{% load partials %}
-
-{% block content_left %}
-    <table id="content-table" class="table can-compact is-fullwidth is-hoverable is-narrow my-0" hx-indicator=".htmx-indicator" x-data="">
-        <thead style="position: sticky; top: 0; z-index: 10; background-color: var(--bulma-scheme-main)">
-            <tr>
-                <th>{{ object_label }}</th>
-                {% for field in fields %}
-                    <th style="text-align: {{ page.object_list|table_alignment:field }}">{{ page.object_list|verbose_field_name:field }}</th>
-                {% endfor %}
-            </tr>
-        </thead>
-        <tbody id="content-table-body" style="z-index: 9" x-ref="tbody">
-            {% for object in page.object_list %}
-                {% partialdef tr inline=True %}
-                    <tr id="tr-{{ object.pk }}"
-                        {% if object.get_absolute_url %}
-                            style="cursor: pointer;"
-                            hx-get="{{ object.get_absolute_url }}{% querystring %}" hx-swap="none"
-                            x-data="{selected: false}" @unselect-tr.window="selected = false"
-                            x-on:click="$dispatch('unselect-tr'); selected = true; $nextTick(() => { $el.scrollIntoView( {block: 'nearest'} ) });" x-bind:class="selected ? 'is-success' : ''"
-                        {% endif %}
-                    >
-                        {% partialdef td inline=True %}
-                            <td>{{ object }}</td>
-                            {% for field in fields %}
-                                <td style="text-align: {{ object|table_alignment:field }}">
-                                    <span class="">
-                                        <span class="responsive-heading has-text-weight-light" style="margin-right: .2rem">{{ object|verbose_field_name:field }}:</span>
-                                        {{ object|table_display:field|default_if_none:'' }}
-                                    </span>
-                                </td>
-                            {% endfor %}
-                        {% endpartialdef %}
-                    </tr>
-                {% endpartialdef %}
-            {% endfor %}
-        </tbody>
-        <tfoot style="position: sticky; bottom: 0; z-index: 10; background-color: var(--bulma-scheme-main);" class="has-text-weight-bold">
-            <tr id="tf-row">
-                {% partialdef tf inline=True %}
-                    <td class="p-0"></td>
-                    {% for field in fields %}
-                        {% if field in footer %}
-                            <td style="text-align: {{ queryset|table_alignment:field }}">
-                                <span class="">
-                                    <span class="responsive-heading has-text-weight-light" style="margin-right: .2rem">{{ queryset|verbose_field_name:field }}:</span>
-                                    {{ footer|get_item:field }}
-                                </span>
-                            </td>
-                        {% else %}
-                            <td class="p-0"></td>
-                        {% endif %}
-                    {% endfor %}
-                {% endpartialdef %}
-            </tr>
-        </tfoot>
-    </table>
-    
-    <div id="endless-scroller"
-         {% if page.has_next %}
-            hx-get="{% querystring page=page.next_page_number %}"
-            hx-trigger="intersect once"
-            hx-select="tbody > tr"
-            hx-target="#content-table-body"
-            hx-swap="beforeend"
-            hx-select-oob="#pagination-next-button,#pagination-end-index,#endless-scroller"
-            hx-indicator="#endless-scroll-indicator"
-            hx-replace-url="true"
-         {% endif %}
-    >
-    </div>
-    <progress id="endless-scroll-indicator" class="htmx-indicator progress is-small is-success" max="100">15%</progress>
-{% endblock %}

accrete-0.0.146/accrete/contrib/ui/templates/ui/table_row_update.html

@@ -1,14 +0,0 @@
-<table>
-    <tbody>
-        <tr hx-swap-oob="innerHTML:#tr-{{ object.pk }}">
-            {% include 'ui/table.html#td' with object=object fields=fields %}
-        </tr>
-    </tbody>
-    {% if footer %}
-        <tfoot>
-            <tr hx-swap-oob="innerHTML:#tf-row">
-                {% include 'ui/table.html#tf' with object=object fields=fields %}
-            </tr>
-        </tfoot>
-    {% endif %}
-</table>