accrete 0.0.146__py3-none-any.whl → 0.0.148__py3-none-any.whl

accrete/contrib/ui/response.py

@@ -21,9 +21,12 @@ class Response:
     def add_trigger(response):
         pass
 
+    def get_context(self):
+        return self.context
+
     def render(self, request) -> str:
         return render_to_string(
-            template_name=self.template, context=self.context, request=request
+            template_name=self.template, context=self.get_context(), request=request
         )
 
     def response(self, request, extra_content: str = None, replace_body: bool = False) -> HttpResponse:
@@ -47,11 +50,18 @@ class OobResponse(Response):
 
     def __init__(self, *, template: str, context: dict, swap: str, tag: str = 'div'):
         super().__init__(template=self.oob_template, context=context)
-        self.context.update({'oob': {
-            'template': template,
-            'swap': swap,
-            'tag': tag
+        self.include_template = template
+        self.swap = swap
+        self.tag = tag
+
+    def get_context(self):
+        context = super().get_context()
+        context.update({'oob': {
+            'template': self.include_template,
+            'swap': self.swap,
+            'tag': self.tag
         }})
+        return context
 
 
 class WindowResponse(Response):
@@ -68,20 +78,29 @@ class WindowResponse(Response):
         is_centered: bool = False
     ):
         super().__init__(template=self.base_template, context=context)
+        self.title = title
+        self.overview_template = overview_template
+        self.header_template = header_template
         self.panel_template = panel_template
-        if 'has_panel' not in self.context.keys():
-            self.context.update(has_panel=self._has_panel())
-        self.context.update({
-            'title': title,
-            'overview_template': overview_template,
-            'header_template': header_template,
-            'panel_template': panel_template,
-            'is_centered': is_centered
-        })
+        self.panel_template = panel_template
+        self.is_centered = is_centered
 
     def _has_panel(self):
         return bool(self.panel_template)
 
+    def get_context(self):
+        context = super().get_context()
+        if 'has_panel' not in context.keys():
+            context.update(has_panel=self._has_panel())
+        context.update({
+            'title': self.title,
+            'overview_template': self.overview_template,
+            'header_template': self.header_template,
+            'panel_template': self.panel_template,
+            'is_centered': self.is_centered
+        })
+        return context
+
     def response(self, request, extra_content: str = None, replace_body: bool = True) -> HttpResponse:
         return super().response(request, extra_content, replace_body)
 
@@ -100,34 +119,50 @@ 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_header_template: str = None,
+        detail_data_template: str = 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
         super().__init__(
             title=title,
             context=context,
-            overview_template=self.overview_template,
+            overview_template=overview_template,
             header_template=header_template,
             panel_template=panel_template,
         )
-        if ui_filter and not page:
-            page = ui_filter.get_page()
-        self.context.update({
-            'list_entry_template': list_entry_template,
-            'page': page,
-            'ui_filter': ui_filter,
-            'endless_scroll': endless_scroll,
-            'column_count': column_count,
-            'column_height': column_height
-        })
+        self.page = page or (ui_filter and ui_filter.get_page())
+        self.list_entry_template = list_entry_template
+        self.page = page
+        self.ui_filter = ui_filter
+        self.endless_scroll = endless_scroll
+        self.column_count = column_count
+        self.column_height = column_height
+        self.detail_header_template = detail_header_template
+        self.detail_data_template = detail_data_template
 
     def _has_panel(self):
         return bool(self.panel_template or self.ui_filter)
 
+    def get_context(self):
+        context = super().get_context()
+        context.update({
+            'list_entry_template': self.list_entry_template,
+            'page': self.page,
+            'ui_filter': self.ui_filter,
+            'endless_scroll': self.endless_scroll,
+            'column_count': self.column_count,
+            'column_height': self.column_height,
+            'detail_header_template': self.detail_header_template,
+            'detail_data_template': self.detail_data_template,
+            'show_content_right': str(bool(
+                self.detail_header_template or self.detail_data_template
+            )).lower(),
+        })
+        return context
+
     def response(self, request, extra_content: str = None, replace_body: bool = False) -> HttpResponse:
         return super().response(request, extra_content, replace_body)
 
@@ -146,15 +181,24 @@ class ListEntryResponse(Response):
         column_count: int = 1,
         column_height: str = '150px',
     ):
-        self.page = page
         super().__init__(template=self.base_template, context=context or {})
-        self.context.update({
-            'instance': instance,
-            'list_entry_template': list_entry_template,
-            'is_new': is_new,
-            'column_count': column_count,
-            'column_height': column_height
+        self.instance = instance
+        self.list_entry_template = list_entry_template
+        self.page = page
+        self.is_new = is_new
+        self.column_count = column_count
+        self.column_height = column_height
+
+    def get_context(self):
+        context = super().get_context()
+        context.update({
+            'instance': self.instance,
+            'list_entry_template': self.list_entry_template,
+            'is_new': self.is_new,
+            'column_count': self.column_count,
+            'column_height': self.column_height
         })
+        return context
 
     def render(self, request) -> str:
         res = super().render(request)
@@ -174,7 +218,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,34 +226,49 @@ 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_header_template: str = None,
+        detail_data_template: str = 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
         super().__init__(
             title=title,
             context=context,
-            overview_template=self.overview_template,
+            overview_template=overview_template,
             header_template=header_template,
             panel_template=panel_template
         )
-        if ui_filter and not page:
-            page = ui_filter.get_page()
-        self.context.update({
-            'page': page,
-            'ui_filter': ui_filter,
-            'endless_scroll': endless_scroll,
-            'fields': fields,
-            'object_label': object_label,
-            'footer': footer
-        })
+        self.instance_label = instance_label
+        self.fields = fields
+        self.footer = footer
+        self.page = page or (ui_filter and ui_filter.get_page())
+        self.ui_filter = ui_filter
+        self.endless_scroll = endless_scroll
+        self.detail_header_template = detail_header_template
+        self.detail_data_template = detail_data_template
 
     def _has_panel(self):
         return bool(self.panel_template or self.ui_filter)
 
+    def get_context(self):
+        context = super().get_context()
+        context.update({
+            'page': self.page,
+            'ui_filter': self.ui_filter,
+            'endless_scroll': self.endless_scroll,
+            'fields': self.fields,
+            'instance_label': self.instance_label,
+            'footer': self.footer,
+            'detail_header_template': self.detail_header_template,
+            'detail_data_template': self.detail_data_template,
+            'show_content_right': str(bool(
+                self.detail_header_template or self.detail_data_template
+            )).lower()
+        })
+        return context
+
     def response(self, request, extra_content: str = None, replace_body: bool = False) -> HttpResponse:
         return super().response(request, extra_content, replace_body)
 
@@ -225,13 +284,21 @@ class TableRowResponse(Response):
         footer: dict = None,
         page: paginator.Page = None,
     ):
+        super().__init__(template=self.base_template, context={})
+        self.instance = instance
+        self.fields = fields
+        self.footer = footer
         self.page = page
-        context = {
-            'instance': instance,
-            'fields': fields,
-            'footer': footer,
-        }
-        super().__init__(template=self.base_template, context=context)
+
+    def get_context(self):
+        context = super().get_context()
+        context.update({
+            'instance': self.instance,
+            'fields': self.fields,
+            'footer': self.footer,
+            'page': self.page
+        })
+        return context
 
     def render(self, request) -> str:
         res = super().render(request)
@@ -252,19 +319,26 @@ 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.context.update({
-            'detail_header_template': detail_header_template,
-            'detail_data_template': detail_data_template
-        })
+        self.header_template = header_template
+        self.data_template = data_template
+        self.context.update()
 
     @staticmethod
     def add_trigger(response):
         add_trigger(response, 'activate-detail')
 
+    def get_context(self):
+        context = super().get_context()
+        context.update({
+            'detail_header_template': self.header_template,
+            'detail_data_template': self.data_template
+        })
+        return context
+
 
 class ModalResponse(Response):
 
@@ -280,13 +354,22 @@ class ModalResponse(Response):
 
     ):
         super().__init__(template=template, context=context)
-        self.context.update({
-            'title': title,
-            'modal_id': re.sub(r'[^A-Za-z-]+', '', modal_id).strip('-'),
-            'is_update': is_update,
-            'is_blocking': is_blocking,
-            'modal_width': modal_width
+        self.modal_id = modal_id
+        self.title = title
+        self.is_update = is_update
+        self.is_blocking = is_blocking
+        self.modal_width = modal_width
+
+    def get_context(self):
+        context = super().get_context()
+        context.update({
+            'title': self.title,
+            'modal_id': re.sub(r'[^A-Za-z-]+', '', self.modal_id).strip('-'),
+            'is_update': self.is_update,
+            'is_blocking': self.is_blocking,
+            'modal_width': self.modal_width
         })
+        return context
 
 
 @dataclass
@@ -303,7 +386,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

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/contrib/ui/static/css/accrete.css.map

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

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/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/contrib/ui/templates/ui/list.html

@@ -1,45 +1,42 @@
-{#{% 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 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>
-                {% 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>
+            {% endpartialdef %}
+        {% endfor %}
     </div>
-{% endblock %}
+    {% 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/contrib/ui/templates/ui/table.html

@@ -1,77 +1,75 @@
-{% 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 %}
+<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 %}
-        </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 }}">
+        </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">{{ queryset|verbose_field_name:field }}:</span>
-                                    {{ footer|get_item:field }}
+                                    <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>
-                        {% 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 %}
+                        {% 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/contrib/ui/templates/ui/table_row_update.html

@@ -1,13 +1,13 @@
 <table>
     <tbody>
-        <tr hx-swap-oob="innerHTML:#tr-{{ object.pk }}">
-            {% include 'ui/table.html#td' with object=object fields=fields %}
+        <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 object=object fields=fields %}
+                {% include 'ui/table.html#tf' with instance=instance fields=fields page=page %}
             </tr>
         </tfoot>
     {% endif %}

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/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/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/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/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/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.dist-info → accrete-0.0.148.dist-info}/METADATA

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

{accrete-0.0.146.dist-info → accrete-0.0.148.dist-info}/RECORD

@@ -66,7 +66,7 @@ accrete/contrib/ui/apps.py,sha256=E0ao2ox6PQ3ldfeR17FXJUUJuGiWjm2DPCxHbPXGzls,15
 accrete/contrib/ui/filter.py,sha256=WWELsSZF-v7FxAWw1gGvYHFBB0BhmQWuWacI_joTKas,13703
 accrete/contrib/ui/middleware.py,sha256=QprWR8FXK9iMPIvLQAeYASaUJSW0uD9BHoYroMKrph0,1560
 accrete/contrib/ui/models.py,sha256=Vjc0p2XbAPgE6HyTF6vll98A4eDhA5AvaQqsc4kQ9AQ,57
-accrete/contrib/ui/response.py,sha256=QwCxuPrzPLcJHOnZHfy0GcqqRWzZIu5kiInFxLE6VYg,10423
+accrete/contrib/ui/response.py,sha256=dXc0G6HDg0CfQieumqQmaloYwLzd72LiMgRiNEKlG0g,13419
 accrete/contrib/ui/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 accrete/contrib/ui/urls.py,sha256=5XUfK85HYWYf7oopMoJEEYmQ6pNgHgZBErBEn97pBt4,337
 accrete/contrib/ui/views.py,sha256=5VUbP0jgMcLMv9-3AKxkV315RA0qXuw5PmTRejPc0Yg,1136
@@ -167,9 +167,9 @@ accrete/contrib/ui/static/bulma/versions/bulma-no-dark-mode.scss,sha256=1tXoYLlK
 accrete/contrib/ui/static/bulma/versions/bulma-no-helpers-prefixed.scss,sha256=NRrD7Euz_mfDI02D92a63M6H4UhArjhWy3g5DIhQr5o,366
 accrete/contrib/ui/static/bulma/versions/bulma-no-helpers.scss,sha256=gyRiEug6frpDJEaxZ7VybdApnmNS5R5A9Zn1R0yWLJg,335
 accrete/contrib/ui/static/bulma/versions/bulma-prefixed.scss,sha256=cDhte1VyFupdjYFXpUyQb7wGB8aUKDGYuKluZCY5CtA,133
-accrete/contrib/ui/static/css/accrete.css,sha256=C5GVDuOcSiCVczvpvIzGAmpZQ7_VFbU-0Z_CQ_RtDGE,8208
-accrete/contrib/ui/static/css/accrete.css.map,sha256=r0fiRbfcq57rvMPOC3RZvz7DGKiglLzC2fs5Y8-cHGw,4802
-accrete/contrib/ui/static/css/accrete.scss,sha256=lVgtZx6HsInVdV0LVO0JVijoS6wBupi4GiPhRpQvQ4I,8261
+accrete/contrib/ui/static/css/accrete.css,sha256=i3NxjXuMwb-wgnDgX_GohHdWxfDRakv-isig-y_Li18,8065
+accrete/contrib/ui/static/css/accrete.css.map,sha256=pue97ypofcpAUPiKg7jIHJB8UeGnash813UNiNA0QFY,4712
+accrete/contrib/ui/static/css/accrete.scss,sha256=OTD_70Fv1q38PBghFop-IGmZidmPFXqw_Grzys5DbkU,8114
 accrete/contrib/ui/static/css/fa.css,sha256=wiz7ZSCn_btzhjKDQBms9Hx4sSeUYsDrTLg7roPstac,102641
 accrete/contrib/ui/static/css/icons.css,sha256=5550KHsaayeEtRaUdf0h7esQhyec-_5ZfecZ_sOC6v0,6334
 accrete/contrib/ui/static/icons/Logo.svg,sha256=hGZuxrAa-LRpFavFiF8Lnc7X9OQcqmb6Xl_dxx-27hM,1861
@@ -200,25 +200,25 @@ accrete/contrib/ui/templates/ui/content_right.html,sha256=aOFjbtXjjlqwmHpGoEpAUz
 accrete/contrib/ui/templates/ui/detail.html,sha256=V0HccLE0Pb-5haQFpvIoWZfF1UOrvMwPYv2UTwRnt_A,293
 accrete/contrib/ui/templates/ui/favicon.html,sha256=ZSK6qDGV4Cexgt0VA3KOHYN100yZHOFjfOiFZVudWg0,90
 accrete/contrib/ui/templates/ui/form_error.html,sha256=WWqfFWyJ_LCzm5IkxXztn23GFak5wyM2HZcmiZ3Eq9s,417
-accrete/contrib/ui/templates/ui/layout.html,sha256=r3ZylKY2iPK8HwNcRPSzuJ4dfEQKQMGFCu7CBBE9gUg,13674
-accrete/contrib/ui/templates/ui/list.html,sha256=xyEUYwQKcj-65CO5Te8ixQcUoUj_bh4nmN9cpHaO9uM,2437
+accrete/contrib/ui/templates/ui/layout.html,sha256=sMCoIDFS-LKyTiUaOJwhDMoKZH9K0tPbnTQlP_cTUJ0,14022
+accrete/contrib/ui/templates/ui/list.html,sha256=5ORnXkIZdGXl5HB77oI_FbgfLGI6GZscbTc567pCxiw,2264
 accrete/contrib/ui/templates/ui/list_update.html,sha256=CUV-OJCieOBrtSbh0vAoyZYL-_e9lP7vQrY4j1TlT7M,276
 accrete/contrib/ui/templates/ui/message.html,sha256=dQnPNkHIrrOzelXCTO8CLWG5ufmxJ8MuWp66YLZbmro,773
 accrete/contrib/ui/templates/ui/modal.html,sha256=3FzvnFVWvwRQ_r1-2qd9N5wYIOh6_oYDDp7uk6XoJPE,3481
 accrete/contrib/ui/templates/ui/oob.html,sha256=lZHIBBYclefbGkKguS1A7vrtOhODJizbSRaGAAHDvG8,267
-accrete/contrib/ui/templates/ui/table.html,sha256=u6JJz1FykuljZiiC2hL83hy8RbMeXcSH8xuU1ji2SHc,3939
-accrete/contrib/ui/templates/ui/table_row_update.html,sha256=Jvt0wlq4btlIRk1RoSv467nT0MUBn7OwC1EbzawDej4,409
+accrete/contrib/ui/templates/ui/table.html,sha256=WNAclm7qmeFbRX8itc7PIHYHfeWwAxFpRTA-k1zK3OE,3700
+accrete/contrib/ui/templates/ui/table_row_update.html,sha256=v3YHCzQbGbp3zC6zmJ_EvNvtgvCH_84R6gUsH5mpC0k,439
 accrete/contrib/ui/templates/ui/filter/filter.html,sha256=GOTXouHH4RSCFsIzg1UPFAcmKaNNxTPmRj5Bx9K1m4o,759
 accrete/contrib/ui/templates/ui/filter/query_input.html,sha256=Qg_41fODXMgL534ohktb0QOxNzAEbaeBzAajJCEK7Pg,2035
 accrete/contrib/ui/templates/ui/filter/query_operator.html,sha256=h4WWLDnse6DK5Rb_0TTb0wqWxhvY_g3qjwx8_eENMuI,569
 accrete/contrib/ui/templates/ui/filter/query_params.html,sha256=wCkyZ9oSK_ivraNiL-UAY_9TflYw5EspnHHm6V6uOzk,9548
 accrete/contrib/ui/templates/ui/filter/query_tags.html,sha256=ooeIwIwvhT0fG5SMAuLoMquTVUmYf5n50DM-3gC_iAo,1567
-accrete/contrib/ui/templates/ui/templatetags/field.html,sha256=njmCBUBpLQsSu1r740PMXuh5gNfjDxI6Lmo_dm4JTqw,776
+accrete/contrib/ui/templates/ui/templatetags/field.html,sha256=G029l141G0VICuEgPxr6jfr3eBV4MuE-yt6iQLVrrlg,1168
 accrete/contrib/ui/templates/ui/widgets/model_search_select.html,sha256=AUlWN2gKhHk_tWP1-KGel5ifaRMTF60MUtgbap7CGQ4,2938
-accrete/contrib/ui/templates/ui/widgets/model_search_select_multi.html,sha256=NV_PWH8-3TqSfJT2l4aN3TOCFyYWxxtCQ9sh6X8gML0,4686
+accrete/contrib/ui/templates/ui/widgets/model_search_select_multi.html,sha256=0YtxEmKqagUAIjkP0a36G2T4z0ySi8He4qmMu9EmMVw,4682
 accrete/contrib/ui/templates/ui/widgets/model_search_select_options.html,sha256=4Wky0XkYWZlIKXTXzGjJkJTX3H9rhjXTY1hYai3Q3TA,242
 accrete/contrib/ui/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-accrete/contrib/ui/templatetags/ui.py,sha256=cWWgzjQKgcxy6uAJZlIJzeP-O3oqFjbrCZrZdnxNUVk,4924
+accrete/contrib/ui/templatetags/ui.py,sha256=YRiIdTat-CCKjYP5FG3o-JaHpO4RffqUn6V14B4emeI,5124
 accrete/contrib/ui/widgets/__init__.py,sha256=W_y10jfu37lygp4frXuKFSGec97gpNbWskG6DMhTKtY,69
 accrete/contrib/ui/widgets/search_select.py,sha256=zKmOt54QsxUobNkDNEA2ut3pPAl8a5DqmEpcfam1l1I,3762
 accrete/contrib/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -243,11 +243,11 @@ accrete/contrib/user/migrations/0007_user_managed_login.py,sha256=SfG1Yj9m_g-sZb
 accrete/contrib/user/migrations/0008_remove_user_no_email_for_managed_user_and_more.py,sha256=XypG6tN0WmLyJV8sbZgSVqNFbTxRsBHWhIRyMJGfV7c,655
 accrete/contrib/user/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/user/templates/user/accrete_navbar_end_dropdown.html,sha256=suPoeu1Dm49rDCrhnrkSZY8cBDsovnKqKGXcS5q-7o0,334
-accrete/contrib/user/templates/user/change_email.html,sha256=C53Ow_J80nycjbfrUrvETdd2-J4ZJnbHAjGKk1N2zUo,463
-accrete/contrib/user/templates/user/change_password.html,sha256=pOc4C0J-rY7Nr0ltMGT-DpKdsVBOvEWqj1UBa_kTYVw,523
+accrete/contrib/user/templates/user/change_email.html,sha256=frkoUCUwNtVSe9fhxmFmiM8T3RaFzLKOpAv5gZ7F-AY,473
+accrete/contrib/user/templates/user/change_password.html,sha256=e9_8pGJoEj8FqfgrC_IcDiHuP3gB9BD8ayj-BU-R8kA,538
 accrete/contrib/user/templates/user/login.html,sha256=SXbxgq3baEch3ksGMsZqIws5heqAtpkdCLAFX3SLhtQ,2669
 accrete/contrib/user/templates/user/password_forgotten.html,sha256=aoNR9VUhLkDFLIQ3NUA2Oh19bFlro0ZXvcRUdGDNPnc,30
-accrete/contrib/user/templates/user/user_preferences.html,sha256=s-WmVASO0-5R2PY-y_ExS5kl9yOtMQpElVH3nKLqW0g,1646
+accrete/contrib/user/templates/user/user_preferences.html,sha256=KkRwI1NdLTN0JlGEZIx38pjJ7robb08u6FpvzKfKLdc,1667
 accrete/contrib/user_registration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/user_registration/admin.py,sha256=kwmGTsg4Hii-lsw9-UaJG7AhQ4k4SPi48GSrtpZ4YR4,119
 accrete/contrib/user_registration/apps.py,sha256=mYu3fuuubfjImeJHk4D_Wd6Edw2r3oUNXGcFbAkhir4,181
@@ -276,7 +276,7 @@ accrete/utils/forms.py,sha256=naV4urdfvmpxcx5Vf3Fo72M5Fy8DjGg5-vkysMKptbA,3914
 accrete/utils/log.py,sha256=BH0MBDweAjx30wGBO4F3sFhbgkSoEs7T1lLLjlYZNnA,407
 accrete/utils/models.py,sha256=2xTacvcpmDK_Bp4rAK7JdVLf8HU009LYNJ6eSpMgYZI,1014
 accrete/utils/views.py,sha256=mHfcKNDOiq-38LQ6tz9pDPQt-xs03b2qMxwJClprqu8,5022
-accrete-0.0.146.dist-info/METADATA,sha256=fFoFLZA3KrYwNZnCox5GJUegFEFKcrqpVg8BpMSbOzg,4953
-accrete-0.0.146.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-accrete-0.0.146.dist-info/licenses/LICENSE,sha256=vHwb4Qnv8UfYKFiCWyTuRGsi49x19UQwHRCky3b2_NE,1057
-accrete-0.0.146.dist-info/RECORD,,
+accrete-0.0.148.dist-info/METADATA,sha256=SLPaFIGp5oZTsazu0XIeEoAs1jzlZ4PJFz4-rVJT75s,4953
+accrete-0.0.148.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+accrete-0.0.148.dist-info/licenses/LICENSE,sha256=vHwb4Qnv8UfYKFiCWyTuRGsi49x19UQwHRCky3b2_NE,1057
+accrete-0.0.148.dist-info/RECORD,,