accrete 0.0.9__py3-none-any.whl → 0.0.11__py3-none-any.whl

accrete/contrib/ui/__init__.py

@@ -1,4 +1,3 @@
-from . import config
 from .filter import Filter
 from .helper import (
     ClientAction,
@@ -6,7 +5,7 @@ from .helper import (
     FormContext,
     ListContext,
     BreadCrumb,
+    TableField,
     build_querystring,
-    parse_client_actions,
     queryset_from_querystring
 )

accrete/contrib/ui/helper.py

@@ -8,11 +8,10 @@ from django.utils.translation import gettext_lazy as _
 from django.core.exceptions import FieldDoesNotExist
 from django.core.paginator import Paginator
 from accrete.contrib.ui.filter import Filter
-from . import config
 
 _logger = logging.getLogger(__name__)
 
-ACTIONS_TEMPLATE = config.ACCRETE_UI_ACTIONS_TEMPLATE
+DEFAULT_PAGINATE_BY = 40
 
 
 @dataclass
@@ -25,18 +24,6 @@ class ClientAction:
     submit: bool = False
     form_id: str = 'form'
     class_list: list = field(default_factory=list)
-    mobile: bool = True
-    tablet: bool = True
-
-
-def parse_client_actions(actions: list[ClientAction], actions_template: str = None):
-    tablet = (not all(action.tablet for action in actions))
-    mobile = (not all(action.mobile for action in actions))
-    return {
-        'actions_template': actions_template or ACTIONS_TEMPLATE,
-        'actions': actions,
-        'action_button': {'mobile': mobile, 'tablet': tablet}
-    }
 
 
 @dataclass
@@ -46,6 +33,13 @@ class BreadCrumb:
     url: str
 
 
+@dataclass
+class TableField:
+
+    label: str
+    name: str
+
+
 @dataclass
 class ListContext:
 
@@ -57,12 +51,14 @@ class ListContext:
     extra_query: Q = None
     related_fields: list[str] = field(default_factory=list)
     prefetch_fields: list[str] = field(default_factory=list)
-    paginate_by: int = 20
+    paginate_by: int = DEFAULT_PAGINATE_BY
     order_by: list[str] = None
     column_width: int = 12
     filter_relation_depth: int = 4
     actions: list[ClientAction] = field(default_factory=list)
     breadcrumbs: list[BreadCrumb] = field(default_factory=list)
+    obj_label: str = None
+    fields: list[TableField] = field(default_factory=list)
 
     def get_queryset(self):
         order = self.get_order()
@@ -116,10 +112,11 @@ class ListContext:
             'filter_terms': Filter(self.model, self.filter_relation_depth).get_query_terms(),
             'view_type': 'list',
             'breadcrumbs': self.breadcrumbs,
-            'querystring': build_querystring(self.get_params)
+            'querystring': build_querystring(self.get_params),
+            'actions': self.actions,
+            'obj_label': self.obj_label or _('Name'),
+            'fields': self.fields
         }
-        if self.actions:
-            context.update(parse_client_actions(self.actions))
         context.update(self.context)
         return context
 
@@ -130,14 +127,15 @@ class DetailContext:
     obj: Model
     get_params: dict
     order_by: str = None
-    paginate_by: int = 20
+    paginate_by: int = DEFAULT_PAGINATE_BY
     title: str = None
     queryset: type[QuerySet] = None
     extra_query: Q = None
     related_fields: list[str] = field(default_factory=list)
     prefetch_fields: list[str] = field(default_factory=list)
     actions: list[ClientAction] = field(default_factory=list)
-    breadcrumbs: list[BreadCrumb] = field(default_factory=list)
+    breadcrumbs: list[BreadCrumb] = field(default_factory=list),
+    context: dict = field(default_factory=dict)
 
     def get_queryset(self):
         order = self.get_order()
@@ -197,25 +195,26 @@ class DetailContext:
             'detail_pagination': False,
             'view_type': 'detail',
             'breadcrumbs': self.breadcrumbs,
-            'querystring': build_querystring(self.get_params, ['page'])
+            'querystring': build_querystring(self.get_params, ['page']),
+            'actions': self.actions
         }
         if self.paginate_by > 0:
             ctx.update(self.get_pagination_context())
-        if self.actions:
-            ctx.update(parse_client_actions(self.actions))
+        ctx.update(self.context)
         return ctx
 
 
 @dataclass
 class FormContext:
 
-    model: Model|type[Model]
+    model: Model | type[Model]
     get_params: dict
     title: str = None
     context: dict = field(default_factory=dict)
     form_id: str = 'form'
     add_default_actions: bool = True
     discard_url: str = None
+    actions: list[ClientAction] = field(default_factory=list)
 
     def get_default_form_actions(self):
         actions = [
@@ -228,12 +227,11 @@ class FormContext:
         ]
         try:
             url = self.discard_url or self.model.get_absolute_url()
-        except TypeError as e:
-            _logger.exception(
+        except TypeError:
+            raise TypeError(
                 'Supply the discard_url parameter if FormContext is called '
                 'with a model class instead of an instance.'
             )
-            raise e
         except AttributeError as e:
             _logger.error(
                 'Supply the discard_url parameter if FormContext is '
@@ -264,10 +262,12 @@ class FormContext:
             'title': self.get_title(),
             'view_type': 'form',
             'form_id': self.form_id,
-            'querystring': build_querystring(self.get_params, ['page'])
+            'querystring': build_querystring(self.get_params, ['page']),
+            'actions': []
         }
         if self.add_default_actions:
-            ctx.update(parse_client_actions(self.get_default_form_actions()))
+            ctx.update({'actions': self.get_default_form_actions()})
+        ctx['actions'].extend(self.actions)
         ctx.update(self.context)
         return ctx
 
@@ -276,6 +276,8 @@ def build_querystring(get_params: dict, extra_params: list[str] = None) -> str:
     querystring = f'?q={get_params.get("q", "[]")}'
     if paginate_by := get_params.get('paginate_by', False):
         querystring += f'&paginate_by={paginate_by}'
+    # if page := get_params.get('page', False):
+    #     querystring += f'&page={page}'
     if order_by := get_params.get('order_by', False):
         querystring += f'&order_by={order_by}'
     for param in extra_params or []:

accrete/contrib/ui/static/css/accrete.css

@@ -1,32 +1,9 @@
-.header-sticky {
-    position: sticky;
-    top: 0;
-    background: white;
-}
-
-table {
-    margin-bottom: 12px !important;
-}
-
-th {
-    background-color: white;
-}
-
-/*tbody > tr:hover {*/
-/*    background-color: #f5f5f5;*/
-/*}*/
-
-label {
-    word-break: break-word;
-}
-
-.dropdown-link:hover {
-    cursor: pointer;
-    background-color: #f5f5f5;
+.columns {
+    margin: 0;
 }
 
-.link-row:hover {
-    cursor: pointer;
+.columns:last-child {
+    margin-bottom: 0;
 }
 
 .main-columns {
@@ -34,34 +11,16 @@ label {
     height: 100vh;
 }
 
-.side-panel {
-    height: 100%;
-    padding: 0 4px 0 0;
-    border-radius: 0;
-    position: sticky;
-    top: 0;
-}
-
-.side-panel > .panel {
-    border-radius: 0;
-    height: 100%;
-    overflow-y: auto;
-    position: sticky;
-    top: 0;
-}
-
-.info-panel {
-    padding: 4px;
-    border-radius: 0;
+.column {
+    padding: 0;
 }
 
-.info-panel > .panel {
-    border-radius: 0;
-    box-shadow: 0 0 0 0
+.breadcrumb * a {
+    color: #0a0a0a;
 }
 
-.title {
-    word-break: break-all;
+.table td, .table th {
+    padding: .2rem .75rem .2rem 0;
 }
 
 td > a {
@@ -69,15 +28,7 @@ td > a {
     width:100%;
 }
 
-.notification {
-    word-wrap: break-word
-}
-
-.list-link {
-    color: #48c78e;
-}
-
-a:link:not(.list-link) {
+a {
     color: #0a0a0a;
 }
 
@@ -85,39 +36,10 @@ a:visited {
     color: #0a0a0a;
 }
 
-.content-column {
-    height: 100%;
-    overflow-y: auto;
-}
-
-.content-column > table > thead th {
-    position: sticky;
-    top: 0;
-}
-
-.buttons > .panel-block {
-    padding: .5rem 0 .5rem .5rem;
-}
-
-.level-item > .panel-block {
-    padding-left: 2px;
-    padding-right: 2px;
-}
-
-.level-item > .panel-block:first-child {
-    padding-left: 0;
-}
-
-.panel-block:not(:last-child) {
+.side-panel * .panel-block:not(:last-child) {
     border-bottom: none !important;
 }
 
-.container > .level {
-    margin: 0;
-    max-width: 100%;
-    overflow-x: hidden;
-}
-
 .level * {
     max-width: 100%;
 }
@@ -126,10 +48,6 @@ a:visited {
     word-break: break-all;
 }
 
-.columns {
-    margin: 0;
-}
-
 input:focus {
     outline: 1px solid #48c78e !important;
     border: 1px solid #48c78e !important;
@@ -218,8 +136,22 @@ select:focus {
     margin-bottom: 0;
 }
 
-.level-is-shrinkable .level-left,
-.level-is-shrinkable .level-item,
-.level-is-shrinkable .level-right {
-  flex-shrink: 1;
-}
+.label.has-field {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: end;
+    font-weight: 300;
+    word-break: break-all;
+    padding: 12px 12px 12px 0;
+}
+
+.label.is-required {
+    font-weight: 700;
+}
+
+@media screen and (max-width: 768px) {
+    .label.has-field {
+        padding: 12px 0 12px 0;
+    }
+}

accrete/contrib/ui/templates/ui/detail.html

@@ -5,7 +5,6 @@
     <div class="columns is-desktop">
         {% block messages %}{% endblock %}
         <div class="column p-0 is-8-desktop">
-            {% include 'ui/partials/header.html' %}
             <div>
                 {% block detail_content %}{% endblock %}
             </div>

accrete/contrib/ui/templates/ui/form.html

@@ -4,7 +4,6 @@
 {% block content %}
     <div class="columns is-desktop">
         <div class="column p-0 is-8-desktop">
-            {% include 'ui/partials/header.html' %}
             <div>
                 {% include 'ui/partials/form_errors.html' with show_field_errors=True %}
                 {% block form %}{% endblock %}

accrete/contrib/ui/templates/ui/layout.html

@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load accrete_ui %}
 
-<html lang="en">
+<html lang="en" style="overflow: hidden">
 
 <head>
 {% block head %}
@@ -62,47 +62,79 @@
     {% endblock %}
 
     <div class="main-columns columns m-0 is-mobile">
-        {% block main_columns %}
-            {% block side_panel %}
-                <div class="side-panel column is-3-widescreen is-2-fullhd is-hidden-touch is-hidden-desktop-only is-hidden-widescreen-only" style="height: 100%">
-                    <nav class="panel is-shadowless pb-5">
-                        {% if list_pagination %}
-                            <div class="panel-block">
-                                {% include 'ui/partials/pagination_list.html' %}
-                            </div>
-                        {% endif %}
-                        {% if detail_pagination %}
-                            <div class="panel-block">
-                                {% include 'ui/partials/pagination_detail.html' %}
-                            </div>
-                        {% endif %}
-                        <div id="panel-actions">
-                            {% block side_panel_items %}{% if actions and actions_template %}{% include actions_template with all=True %}{% endif %}{% endblock %}
+        <div class="side-panel column is-3-widescreen is-2-fullhd is-hidden-touch is-hidden-desktop-only is-hidden-widescreen-only p-0" style="height: 100%; position: sticky; top: 0">
+            <nav class="panel is-shadowless pb-5" style="height: 100%; overflow-y: auto; position: sticky; top: 0">
+                {% if list_pagination %}
+                    <div class="panel-block pb-0">
+                        {% include 'ui/partials/pagination_list.html' %}
+                    </div>
+                {% endif %}
+                {% if detail_pagination %}
+                    <div class="panel-block pb-0">
+                        {% include 'ui/partials/pagination_detail.html' %}
+                    </div>
+                {% endif %}
+                <div id="panel-actions">
+                    {% for action in actions %}
+                        <div class="panel-block pb-0">
+                            {% if action.submit %}
+                                <input class="button is-fullwidth {{ action.class_list|join:' ' }}"
+                                       type="submit" form={{ action.form_id }} value="{{ action.name }}"
+                                       {% for attr in action.attrs %}{{ attr }}{% endfor %}
+                                >
+                            {% else %}
+                                <a class="button is-fullwidth {{ action.class_list|join:' ' }}"
+                                   href="{{ action.url }}{{ querystring|default_if_none:'?' }}{% if page %}&page={{ page.number }}{% endif %}{{ action.query_params }}"
+                                   {% for attr in action.attrs %}{{ attr }}{% endfor %}
+                                >{{ action.name }}
+                                </a>
+                            {% endif %}
                         </div>
-                        {% if filter_terms %}
-                            <div class="panel-list px-3 has-text-centered">
-                                <span>{% translate 'Filter' %}</span>
-                            </div>
-                            <div class="panel-block" style="position: sticky">
-                                <button id="reset-filter-button"
-                                        class="button is-fullwidth mr-1">{% translate 'Reset' %}
-                                </button>
-                                <button id="apply-filter-button"
-                                        class="button is-fullwidth ml-1">{% translate 'Filter' %}
-                                </button>
-                            </div>
-                            <div id="filter-panel">
-                                {% include 'ui/partials/filter.html' %}
-                            </div>
-                        {% endif %}
-                    </nav>
+                    {% endfor %}
                 </div>
-            {% endblock %}
+                {% if filter_terms %}
+                    <div id="filter-panel" class="mt-2">
+                        <div class="panel-list px-3 has-text-centered">
+                            <span>{% translate 'Filter' %}</span>
+                        </div>
+                        <div class="panel-block" style="position: sticky">
+                            <button id="reset-filter-button"
+                                    class="button is-fullwidth mr-1">{% translate 'Reset' %}
+                            </button>
+                            <button id="apply-filter-button"
+                                    class="button is-fullwidth ml-1">{% translate 'Filter' %}
+                            </button>
+                        </div>
+                        {% include 'ui/partials/filter.html' %}
+                    </div>
+                {% endif %}
+            </nav>
+        </div>
 
-            <div id="content" class="column content-column p-0" style="height: 100%; overflow-y: auto">
-                {% block content %}{% endblock %}
+        <div class="column" style="overflow-x: auto">
+            <div class="is-flex is-flex-direction-column" style="height: 100%; overflow: hidden">
+                <div>
+                    {% include 'ui/partials/header.html' %}
+                </div>
+                <div id="content" class="px-3 pb-4" style="overflow: auto; flex-grow: 1">
+                    {% block messages %}{% endblock %}
+                    {% block content %}{% endblock %}
+                </div>
+                <div>
+                    {% if list_pagination or detail_pagination %}
+                        <div class="level is-hidden-tablet is-align-self-flex-start m-3">
+                            <div class="level-item is-align-content-flex-start">
+                                {% if list_pagination %}
+                                    {% include 'ui/partials/pagination_list.html' %}
+                                {% elif detail_pagination %}
+                                    {% include 'ui/partials/pagination_detail.html' %}
+                                {% endif %}
+                            </div>
+                        </div>
+                    {% endif %}
+                </div>
             </div>
-        {% endblock %}
+        </div>
     </div>
 
     {% if filter_terms %}
@@ -126,22 +158,5 @@
         </div>
     {% endif %}
 
-    {% if actions %}
-        <div id="action-modal" class="modal">
-            <div class="modal-background action-modal-close"></div>
-            <div class="modal-card">
-                <header class="modal-card-head">
-                    <p class="modal-card-title">
-                        {% block action_modal_title %}{% translate 'Actions' %}{% endblock %}</p>
-                    <button class="delete action-modal-close" aria-label="close"></button>
-                </header>
-                <section class="modal-card-body">
-                    <div id="modal-actions">
-                        {% block action_modal_body %}{% if actions_template %}{% include actions_template with all=True %}{% endif %}{% endblock %}
-                    </div>
-                </section>
-            </div>
-        </div>
-    {% endif %}
     <div id="form-modal" class="modal"></div>
 </body>

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

@@ -8,27 +8,15 @@
 {% endblock %}
 
 {% block content %}
-    <div id="list" class="columns">
-        <div class="column p-0">
-            {% include 'ui/partials/header.html' %}
-            <div class="columns py-0">
-                <div class="column is-12 py-0">
-                    {% block messages %}{% endblock %}
+    <div class="columns is-multiline">
+        {% for obj in page %}
+            <div class="column is-{{ column_width }}">
+                <div class="box p-2 pb-4 mb-1" style="word-break: break-word; height: 100%; border: solid #ccc 1px">
+                    {% block object_data %}
+                        {{ obj }}
+                    {% endblock %}
                 </div>
             </div>
-            <div style="margin-left: -8px; margin-right: 8px">
-                <div class="columns is-multiline pl-1 mb-5" style="max-width: 100%">
-                    {% for obj in page %}
-                        <div class="column is-{{ column_width }} mb-0 pr-0 pb-1 pt-0">
-                            <div class="box p-2 pb-4 mb-1" style="word-break: break-word; height: 100%; border: solid #ccc 1px">
-                                {% block object_data %}
-                                    {{ obj }}
-                                {% endblock %}
-                            </div>
-                        </div>
-                    {% endfor %}
-                </div>
-            </div>
-        </div>
+        {% endfor %}
     </div>
 {% endblock %}

accrete/contrib/ui/templates/ui/partials/header.html

@@ -1,18 +1,7 @@
 {% load i18n %}
 
-<div style="position: sticky; top: 0; background: white; z-index: 10">
-    {% if list_pagination or detail_pagination %}
-        <div class="level is-hidden-tablet is-hidden-fullhd is-align-self-flex-start pt-3 mx-2 mb-0">
-            <div class="level-item is-align-content-flex-start">
-                {% if list_pagination %}
-                    {% include 'ui/partials/pagination_list.html' %}
-                {% elif detail_pagination %}
-                    {% include 'ui/partials/pagination_detail.html' %}
-                {% endif %}
-            </div>
-        </div>
-    {% endif %}
-    <div class="level pt-4 px-3 level-is-shrinkable is-flex {% if detail_pagination %}is-mobile {% endif %}{% if list_pagination %}mb-1 {% else %}mb-0{% endif %}">
+<div class="pt-3">
+    <div class="level level-is-shrinkable is-flex mb-2 pl-3 {% if detail_pagination %}is-mobile {% endif %}">
         <div class="level-left">
             <div class="level-item has-text-weight-bold">
                 <nav class="breadcrumb" aria-label="breadcrumbs" style="white-space: unset; word-break: break-word">
@@ -26,7 +15,7 @@
             </div>
         </div>
         {% if list_pagination or detail_pagination %}
-            <div class="level-right is-mobile is-hidden-mobile is-hidden-fullhd px-3 mb-1 is-align-self-flex-start">
+            <div class="level-right is-mobile is-hidden-mobile is-hidden-fullhd is-align-self-flex-start px-3">
                 <div class="level-item">
                     {% if list_pagination %}
                         {% include 'ui/partials/pagination_list.html' %}
@@ -38,28 +27,27 @@
         {% endif %}
     </div>
 
-    <div class="level p-0 m-0 is-mobile">
-        <div class="level-left">
-            <div class="level-item is-mobile is-hidden-tablet mr-0">
-                <div class="buttons">
-                    {% block mobile_actions %}
-                        {% if actions_template %}{% include actions_template with mobile=True %}{% endif %}
-                    {% endblock %}
-                </div>
-            </div>
-
-            <div class="level-item is-mobile is-hidden-fullhd is-hidden-mobile mr-0">
-                <div class="buttons">
-                    {% block tablet_actions %}
-                        {% if actions_template %}{% include actions_template with tablet=True %}{% endif %}
-                    {% endblock %}
-                </div>
-            </div>
-            <div class="level-item is-mobile is-hidden-fullhd is-hidden-mobile mr-0">
-                <div class="buttons">
-                    <button id="modal-filter-button" class="button">Filter</button>
-                </div>
-            </div>
+    <div class="is-flex is-hidden-fullhd is-justify-content-space-between mb-2">
+        <div class="is-flex py-1 px-1 ml-2" style="overflow-x: auto">
+            {% for action in actions %}
+                {% if action.submit %}
+                    <input class="button mr-2 {{ action.class_list|join:' ' }}"
+                           type="submit" form={{ action.form_id }} value="{{ action.name }}"
+                           {% for attr in action.attrs %}{{ attr }}{% endfor %}
+                    >
+                {% else %}
+                    <a class="button mr-2 {{ action.class_list|join:' ' }}"
+                       href="{{ action.url }}{{ querystring|default_if_none:'?' }}{% if page %}&page={{ page.number }}{% endif %}{{ action.query_params }}"
+                       {% for attr in action.attrs %}{{ attr }}{% endfor %}
+                    >{{ action.name }}
+                    </a>
+                {% endif %}
+            {% endfor %}
         </div>
+        {% if filter_terms %}
+            <div class="is-flex ml-2 py-1 pr-3">
+                <button id="modal-filter-button" class="button">Filter</button>
+            </div>
+        {% endif %}
     </div>
-</div>
+</div>

accrete/contrib/ui/templates/ui/partials/pagination_detail.html

@@ -3,24 +3,20 @@
         <button class="button"
                 hx-get="{{ previous_object_url }}{{ querystring }}"
                 hx-replace-url="true"
-                hx-select-oob="#content,#detail-pagination"
+                hx-select-oob="#content,#detail-pagination,#panel-actions"
         ><
         </button>
 
     </p>
-    {% if total_objects > 99999 %}
-        <p class="control is-expanded">
-            <button class="button is-fullwidth px-1"><span class="is-size-7">{{ current_object_idx }}<br>/{{ total_objects }}</span></button>
-        </p>
-    {% else %}
-        <p class="control is-expanded">
-            <button class="button is-fullwidth px-1">{{ current_object_idx }} / {{ total_objects }}</button>
-        </p>
-    {% endif %}
+    <p class="control is-expanded">
+        <button class="button is-fullwidth px-1" style="white-space: normal">
+            <span class="{% if total_objects > 99999 %}is-size-7{% endif %}">{{ current_object_idx }} / {{ total_objects }}</span>
+        </button>
+    </p>
     <p class="control">
         <button class="button" hx-get="{{ next_object_url }}{{ querystring }}"
                 hx-replace-url="true"
-                hx-select-oob="#content,#detail-pagination"
+                hx-select-oob="#content,#detail-pagination,#panel-actions"
         >>
         </button>
     </p>

accrete/contrib/ui/templates/ui/partials/pagination_list.html

@@ -4,25 +4,23 @@
         <button class="button"
                 hx-get="{{ querystring }}&page={% if page.has_previous %}{{ page.previous_page_number }}{% else %}{{ paginator.num_pages }}{% endif %}"
                 hx-replace-url="true"
-                hx-select-oob="#content,#list-pagination"
+                hx-select-oob="#content,#list-pagination,#panel-actions"
         >
             <
         </button>
     </p>
     <p class="control is-expanded">
-        {% if paginator.count > 9999 %}
-            <button class="button is-fullwidth px-0">
-                <span class="is-size-7">{{ page.start_index }}-{{ page.end_index }}<br>/{{ paginator.count }}</span>
-            </button>
-        {% else %}
-            <button class="button is-fullwidth">{{ page.start_index }}-{{ page.end_index }}/{{ paginator.count }}</button>
-        {% endif %}
+        <button class="button is-fullwidth px-1" style="white-space: normal">
+            <span class="{% if paginator.count > 9999 %}is-size-7{% endif %}">
+                {{ page.start_index }}-{{ page.end_index }} / {{ paginator.count }}
+            </span>
+        </button>
     </p>
     <p class="control">
         <button class="button"
                 hx-get="{{ querystring }}&page={% if page.has_next %}{{ page.next_page_number }}{% else %}1{% endif %}"
                 hx-replace-url="true"
-                hx-select-oob="#content,#list-pagination"
+                hx-select-oob="#content,#list-pagination,#panel-actions"
         >
             >
         </button>

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

@@ -1,6 +1,7 @@
 {% extends 'ui/layout.html' %}
 {% load static %}
 {% load i18n %}
+{% load accrete_ui %}
 
 {% block script %}
     {{ block.super }}
@@ -8,34 +9,32 @@
 {% endblock %}
 
 {% block content %}
-    <div class="columns">
-        <div class="column p-0">
-            {% include 'ui/partials/header.html' %}
-            <div class="columns py-0">
-                <div class="column is-12 py-0">
-                    {% block messages %}{% endblock %}
-                </div>
-            </div>
-            <div class="table-container">
-                <table class="table is-fullwidth is-hoverable">
-                    <thead>
-                        {% block table_header_row %}
-                            <tr>
-                                {% block table_header %}{% endblock %}
-                            </tr>
-                        {% endblock %}
-                    </thead>
-                    <tbody>
-                        {% for obj in page %}
-                            {% block table_data_row %}
-                                <tr>
-                                    {% block table_data %}{% endblock %}
-                                </tr>
-                            {% endblock %}
+    <table class="table is-fullwidth is-hoverable">
+        <thead style="position: sticky; top: 0; background: white; z-index: 10">
+            {% block table_header_row %}
+                <tr>
+                    {% block table_header %}
+                        <th>{{ obj_label }}</th>
+                        {% for field in fields %}
+                            <th>{{ field.label }}</th>
                         {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
+                    {% endblock %}
+                </tr>
+            {% endblock %}
+        </thead>
+        <tbody style="z-index: 9">
+            {% for obj in page %}
+                {% block table_data_row %}
+                    <tr>
+                        {% block table_data %}
+                            <td><a class="is-underlined" href="{{ obj.get_absolute_url }}{{ querystring }}&page={{ page.number }}">{{ obj }}</a></td>
+                            {% for field in fields %}
+                                <td>{{ obj|get_attr:field.name|default_if_none:'---' }}</td>
+                            {% endfor %}
+                        {% endblock %}
+                    </tr>
+                {% endblock %}
+            {% endfor %}
+        </tbody>
+    </table>
 {% endblock %}

accrete/contrib/ui/templatetags/accrete_ui.py

@@ -1,8 +1,10 @@
+import logging
 from django import template
 from django.conf import settings
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
 
+_logger = logging.getLogger(__name__)
 register = template.Library()
 
 
@@ -17,6 +19,19 @@ def combine_templates(template_name):
     return mark_safe(html)
 
 
+@register.filter(name='get_attr')
+def get_attr_from_string(param, value):
+    try:
+        attr = getattr(param, value)
+    except AttributeError:
+        _logger.exception(f'Object {param} has no attribute {value}')
+        return ''
+    if callable(attr):
+        return attr()
+    else:
+        return attr
+
+
 @register.filter(name='render_query_params')
 def query_params_to_html(params):
     html = ''

accrete/contrib/ui/views.py

@@ -2,7 +2,7 @@ from django.shortcuts import render
 
 
 def home(request):
-    return render(request, 'ui/layout.html')
+    return render(request, 'ui/layout.html', {})
 
 
 def form_modal(request):

{accrete-0.0.9.dist-info → accrete-0.0.11.dist-info}/METADATA

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

{accrete-0.0.9.dist-info → accrete-0.0.11.dist-info}/RECORD

@@ -32,17 +32,16 @@ accrete/contrib/system_mail/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2
 accrete/contrib/system_mail/views.py,sha256=xc1IQHrsij7j33TUbo-_oewy3vs03pw_etpBWaMYJl0,63
 accrete/contrib/system_mail/migrations/0001_initial.py,sha256=6cwkkRXGjXvwXoMjjgmWmcPyXSTlUbhW1vMiHObk9MQ,1074
 accrete/contrib/system_mail/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-accrete/contrib/ui/__init__.py,sha256=KtdoYsDesEdQJCnlDaZ0iI-ss4JEQXdJhj_ROdFHgMs,238
+accrete/contrib/ui/__init__.py,sha256=b0Aq41co9EVKRKKrsRyhHQsUHCqtbaeI90slAxSLgK0,207
 accrete/contrib/ui/admin.py,sha256=suMo4x8I3JBxAFBVIdE-5qnqZ6JAZV0FESABHOSc-vg,63
 accrete/contrib/ui/apps.py,sha256=E0ao2ox6PQ3ldfeR17FXJUUJuGiWjm2DPCxHbPXGzls,152
-accrete/contrib/ui/config.py,sha256=X9cAYyJqIuE4bg5ja6N4WERHSu4HTkYEJpPvVZ4SwtA,206
 accrete/contrib/ui/filter.py,sha256=xTziJ7ySfbpwtaWAusJSkNUtaZbEeX9UKES2AKIuAak,11897
-accrete/contrib/ui/helper.py,sha256=i2-LGhqXDK3vPZ8eYkeliduGQG5o5vcvQXlxivx0h7k,13274
+accrete/contrib/ui/helper.py,sha256=tQzUnBreoQcxv8t8a27Zmh6I7EewqmKZ7HzDO9gty0A,13235
 accrete/contrib/ui/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 accrete/contrib/ui/urls.py,sha256=TUBlz_CGs9InTZoxM78GSnucA73I8knoh_obt12RUHM,186
-accrete/contrib/ui/views.py,sha256=vAktHp5a3E6qKX-7qbvRQGepQgN-_qUkLfeRP_pf9RA,187
+accrete/contrib/ui/views.py,sha256=WpBKMsxFFG8eG4IN7TW_TPE6i3OFF7gnLDTK7JMKti8,191
 accrete/contrib/ui/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-accrete/contrib/ui/static/css/accrete.css,sha256=Bl23ue2-iCeqx1S8MCbxUMOB6kwdQoD_3vPySTEcslM,3301
+accrete/contrib/ui/static/css/accrete.css,sha256=nvU-3R0LJSclJMJ61pvQCRg1tWs07MpBRQIBNPPYBPg,2392
 accrete/contrib/ui/static/css/icons.css,sha256=-a9BJHrH5P02cfL5qZLZHZkyupqigWmbc5wAa0UEDrE,3035
 accrete/contrib/ui/static/icons/Logo.svg,sha256=hGZuxrAa-LRpFavFiF8Lnc7X9OQcqmb6Xl_dxx-27hM,1861
 accrete/contrib/ui/static/icons/accrete.svg,sha256=CWHJKIgk3hxL7xIaFSz2j1cK-eF1TroCbjcF58bgOIs,1024
@@ -57,21 +56,20 @@ accrete/contrib/ui/templates/django/forms/widgets/input.html,sha256=CRu81kTsbPwi
 accrete/contrib/ui/templates/django/forms/widgets/select.html,sha256=jT_UnHizHfdWTdJoSxjcIqTiR7NbVBA4bBSvkuDPRtw,394
 accrete/contrib/ui/templates/django/forms/widgets/text.html,sha256=MSmLlQc7PsPoDLVtTOOiWNprrsPriNr712yFxaHyDIo,47
 accrete/contrib/ui/templates/django/forms/widgets/textarea.html,sha256=c9BTedqb3IkXLyVYd0p9pR8DFnsXCNGoxVBWZTk_Fic,278
-accrete/contrib/ui/templates/ui/detail.html,sha256=Ae4RD61IO4Jx57aG05Ht6XBnVyPck8xnlsQ4Uv-Nz4w,562
-accrete/contrib/ui/templates/ui/form.html,sha256=HDR--6bLa6l9xFpcdX4NYnbI0jCk4u4bm-qg-2AgMXQ,457
-accrete/contrib/ui/templates/ui/layout.html,sha256=idzB2kP76grNeHhaeVkbO_rdYXv6ThGSHtEQp8fs7j4,6805
-accrete/contrib/ui/templates/ui/list.html,sha256=VbgzkeZyprbU7JnpyP31m9eL4G8MZpzKdAVe6BTmcik,1270
-accrete/contrib/ui/templates/ui/table.html,sha256=quvTy99RmX8uPGVCMdZa_w54bwmogNxBGy7sMnJPTxU,1386
-accrete/contrib/ui/templates/ui/partials/actions.html,sha256=urRu07sWxUBjdp9WgOpJnmf44ZHQDQXRae2QTdzV0lc,1342
+accrete/contrib/ui/templates/ui/detail.html,sha256=m-CpLcoK-dL5jPlIY6Hzyq2EyEqcFZ5Bn-kB-T0Oqao,510
+accrete/contrib/ui/templates/ui/form.html,sha256=HpcZCDU_ur_Zf5gpnH_F8OV6qfOYPl6Ecqg6w5RIayQ,405
+accrete/contrib/ui/templates/ui/layout.html,sha256=aRC5-_co9EQiyGbtYFQ8mFDded7G-C2YnldAW4VOvQ8,7745
+accrete/contrib/ui/templates/ui/list.html,sha256=HsmJAWDZU-qCPh4mrc8vGzkULbViG5fnLcmmp-NO2-4,671
+accrete/contrib/ui/templates/ui/table.html,sha256=tbtccA6cbhF_ONis7Qm7S7_VK-rClddQl7fgxcO8VbU,1469
 accrete/contrib/ui/templates/ui/partials/filter.html,sha256=l_Vi3ZRepF5lpX_KENU4AyIELSeichsVr0g2KGHcjIQ,1844
 accrete/contrib/ui/templates/ui/partials/form_errors.html,sha256=1_TQvTdiejsn-43YSyp2YfnP52P-MFYb-HGY0DLm4oA,991
 accrete/contrib/ui/templates/ui/partials/form_modal.html,sha256=FFDfI5qjOCUBSGqDjBXa8tcqN2q94wOOCNFDaiyplHQ,1032
-accrete/contrib/ui/templates/ui/partials/header.html,sha256=L33nbExJduDQP8J8K0qQsoD4Y8qjQUOuwbJdrCBBf_w,3047
+accrete/contrib/ui/templates/ui/partials/header.html,sha256=OhEINbE8ioFVEYZMFyqjfGTXCiFpse_gW6lvSL2amYk,2550
 accrete/contrib/ui/templates/ui/partials/onchange_form.html,sha256=K5twTGqRUW1iM2dGtdWntjsJvJVo5EIzKxX2HK-H1yw,160
-accrete/contrib/ui/templates/ui/partials/pagination_detail.html,sha256=9rQEaE31gU8sUFLireZ9iju78HucADBK1TQOb9nqw2I,1003
-accrete/contrib/ui/templates/ui/partials/pagination_list.html,sha256=MkIRMnCCUnK7Ksoy4SqXdMtnpqgHeCv5GyMN3tzNfCc,1232
+accrete/contrib/ui/templates/ui/partials/pagination_detail.html,sha256=Mbqg8mOApBMnU-64lW-Z_H4v_PWd0UmuEiCWho5vUus,882
+accrete/contrib/ui/templates/ui/partials/pagination_list.html,sha256=e4DOGaPa9fBrTFCwoW-UphNoJFlzrxFrU050bM1Cnbw,1146
 accrete/contrib/ui/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-accrete/contrib/ui/templatetags/accrete_ui.py,sha256=mytEnz-a-Mw7EjhqybvTdRYQAi6RUBnzuoLjRT-T478,2113
+accrete/contrib/ui/templatetags/accrete_ui.py,sha256=otBEHrMM4JuYtx9DuK52OE1YM5vwS8KGs8CGevGwBpE,2478
 accrete/contrib/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/user/admin.py,sha256=YS4iApli7XUaIl9GsEJxys2j8sepX0by88omYHjff-E,85
 accrete/contrib/user/apps.py,sha256=oHDrAiHf-G57mZLyxqGJzRY2DbPprGFD-QgyVJG_ruI,156
@@ -103,7 +101,7 @@ accrete/migrations/0002_initial.py,sha256=dFOM7kdHlx7pVAh8cTDlZMtciN4O9Z547HAzEK
 accrete/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/utils/dates.py,sha256=XI58CqabLCC-Sg6qo5TPWh-pHuuZfDdGDU6KQeAMlGo,1066
-accrete-0.0.9.dist-info/METADATA,sha256=IL15guJBxntsuaxTZcq4onFXqzQH8hoYcRjG1wsroBw,4845
-accrete-0.0.9.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
-accrete-0.0.9.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
-accrete-0.0.9.dist-info/RECORD,,
+accrete-0.0.11.dist-info/METADATA,sha256=eAKqMGGLjjOGsbVzWBbIn9mS3ke6FEh7JsvTDIhaJEc,4846
+accrete-0.0.11.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
+accrete-0.0.11.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
+accrete-0.0.11.dist-info/RECORD,,

accrete/contrib/ui/config.py

@@ -1,10 +0,0 @@
-import logging
-from django.conf import settings
-
-_logger = logging.getLogger(__name__)
-
-
-ACCRETE_UI_ACTIONS_TEMPLATE = getattr(
-    settings, 'ACCRETE_UI_ACTIONS_TEMPLATE',
-    'ui/partials/actions.html'
-)

accrete/contrib/ui/templates/ui/partials/actions.html

@@ -1,30 +0,0 @@
-{% load i18n %}
-
-{% for action in actions %}
-    {% if all or tablet and action.tablet or mobile and action.mobile %}
-        <div class="panel-block">
-            {% if action.template %}
-                {% include action.template %}
-            {% else %}
-                {% if action.submit %}
-                    <input class="button is-fullwidth {{ action.class_list|join:' ' }}"
-                           type="submit" form={{ action.form_id }} value="{{ action.name }}"
-                           style="white-space: normal; height: auto"
-                           {{ action.attrs|join:' ' }}>
-                {% else %}
-                <a class="button is-fullwidth {{ action.class|join:' ' }}"
-                   href="{{ action.url }}{{ querystring|default_if_none:'?' }}{% if page %}&page={{ page.number }}{% endif %}{{ action.query_params }}"
-                   {% for attr in action.attrs %}{{ attr }}{% endfor %}
-                   style="word-break: break-word">{{ action.name }}
-                </a>
-                {% endif %}
-            {% endif %}
-        </div>
-    {% endif %}
-{% endfor %}
-
-{% if tablet and action_button.tablet or mobile and action_button.mobile %}
-    <div class="panel-block">
-        <button class="button panel-block action-modal-button">{% translate 'Actions' %}</button>
-    </div>
-{% endif %}