accrete 0.0.103__py3-none-any.whl → 0.0.105__py3-none-any.whl

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

@@ -1,81 +1,77 @@
 {% extends 'ui/layout.html' %}
-{% load static %}
 {% load i18n %}
-{% load accrete_ui %}
+{% load ui %}
+{% load partials %}
 
-{% block tenant_switch_url %}{% endblock %}
-
-{% block content %}
-    <table id="content-table" class="table is-fullwidth is-hoverable has-box" hx-indicator=".htmx-indicator">
-        <thead style="position: sticky; top: 0; z-index: 10">
-            {% block table_header_row %}
-                <tr>
-                    {% block table_header %}
-                        <th>{{ object_label }}</th>
-                        {% for field in fields %}
-                            <th data-name="{{ field.name }}" style="text-align: {% firstof field.header_alignment.value field.alignment.value %}">{{ field.label }}</th>
-                        {% endfor %}
-                        {% if unselect_button %}
-                            <th></th>
-                        {% endif %}
-                    {% endblock %}
-                </tr>
-            {% endblock %}
+{% block content_left %}
+    <table id="content-table" class="table can-compact is-fullwidth is-hoverable is-narrow mb-1" 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">
-            {% for obj in list_page %}
-                {% block table_data_row %}
-                    <tr>
-                        {% block table_data %}
-                            <td>
-                                <a class="is-underlined" href="{{ obj.get_absolute_url }}{{ object_param_str }}">{{ obj }}</a>
-                            </td>
+        <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 detail_enabled %}
+                        style="cursor: pointer;"
+                        hx-get="{{ object.get_absolute_url }}{% querystring %}"  hx-target="#content-right-header" hx-select="#content-right-header" hx-select-oob="#content-right" hx-swap="outerHTML"
+                        x-data="{selected: false}" @unselect-tr.window="selected = false"
+                        x-on:click="$dispatch('unselect-tr'); showContentRight = true; 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 %}
-                                {% if field.template %}
-                                    {% include field.template %}
-                                {% else %}
-                                    {% with val=obj|field_attr:field is_relation=field.is_relation %}
-                                        <td style="text-align: {{ field.alignment.value }}" {% if val|length > field.truncate_after %}title="{{ val }}"{% endif %}>
-                                            <span>
-                                                <span class="responsive-heading has-text-weight-light" style="margin-right: .2rem">{{ field.label }}:</span>
-                                                {% if is_relation and val.get_absolute_url %}<a href="{{ obj|related_obj_url:field.name }}" class="is-underlined">{% endif %}
-                                                    {{ field.prefix }}
-                                                    {% block td_content %}
-                                                        {% if field.truncate_after > 0 %}
-                                                            {{ val|default_if_none:'---'|truncatechars:field.truncate_after }}
-                                                        {% else %}
-                                                            {{ val|default_if_none:'---' }}
-                                                        {% endif %}
-                                                    {% endblock %}
-                                                    {{ field.suffix }}
-                                                {% if is_relation %}</a>{% endif %}
-                                            </span>
-                                        </td>
-                                    {% endwith %}
-                                {% endif %}
+                                <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 %}
-                            {% if unselect_button %}
-                                <td><button class="button is-small has-icon p-0 is-pulled-right" onclick="unselectSingleObject({{ obj.pk }})"><i class="icon-delete-filter"></i></button></td>
-                            {% endif %}
-                        {% endblock %}
+                        {% endpartialdef %}
                     </tr>
-                {% endblock %}
+                {% 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></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></td>
+                        {% endif %}
+                    {% endfor %}
+                {% endpartialdef %}
+            </tr>
+        </tfoot>
     </table>
-    {% if endless_scroll %}
-        <div id="endless-scroller"
-             {% if list_page.has_next %}
-                 hx-get="{{ pagination_param_str }}&page={{ list_page.next_page_number }}"
-                 hx-trigger="intersect once"
-                 hx-select="tbody > tr"
-                 hx-target="#content-table-body"
-                 hx-swap="beforeend"
-                 hx-select-oob="#list-pagination-end-index,#list-pagination-next-button,#list-pagination-prev-button,#endless-scroller"
-                hx-indicator="#endless-scroll-indicator"
-             {% endif %}
-        >
-        </div>
-        <progress id="endless-scroll-indicator" class="htmx-indicator progress is-small is-success" max="100">15%</progress>
-    {% endif %}
-{% endblock %}
+    
+    <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/contrib/ui/templates/ui/table_row_update.html

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

accrete/contrib/ui/templates/ui/widgets/model_search_select.html

@@ -3,14 +3,14 @@
 
 
 <div class="field select" x-data="{open: false, shouldClose(event) {return event.relatedTarget == $refs.dropdownContent || $refs.dropdownContent.contains(event.relatedTarget);} }" 
-     @click.outside="open = false"
+     @click.outside="open = false" hx-disinherit="*"
 >
     <input id="id_{{ widget.name }}_value" hidden="hidden" type="{{ widget.type }}" name="{{ widget.name }}" x-ref="inputValue" aria-label="inputValue"
            value="{{ widget.value }}"
     >
     <input id="id_{{ widget.name }}_display" class="input" type="text" readonly x-ref="inputDisplay" value="{{ widget.value_display }}" aria-label="inputDisplay"
            style="padding-right: 30px"
-           x-on:focus="open = true;"
+           x-on:focus="open = !open;"
            x-on:keydown="if ($event.keyCode == 27) {document.activeElement.blur()} else if ($event.keyCode != 9) {$refs.searchInput.focus();}"
            x-on:focusout="open = shouldClose($event)"
     >

accrete/contrib/ui/templates/ui/widgets/model_search_select_multi.html

@@ -1,10 +1,13 @@
 {% load i18n %}
+{% load ui %}
 
 <div class="" x-data="{open: false, shouldClose(event) {return event.relatedTarget == $refs.dropdownContent || $refs.dropdownContent.contains(event.relatedTarget);} }"
-     @click.outside="open = false" style="width: 100%"
+     @click.outside="open = false" style="width: 100%;" hx-disinherit="*"
 >
     <select multiple id="{{ widget.attrs.id }}" hidden="hidden" name="{{ widget.name }}" aria-label="{{ widget.name }}" x-ref="inputValue">
-        {% include 'ui/widgets/model_search_select_multi_selected_options.html' %}
+        {% for obj in selected %}
+            <option selected value="{{ obj.pk }}"></option>
+        {% endfor %}
     </select>
     <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%"
@@ -18,23 +21,32 @@
                     let val = $event.target.getAttribute('data-value');
                     $refs.inputValue.querySelector(`option[value=${CSS.escape(val)}]`).remove(); 
                     $event.target.parentElement.remove();
+                    $dispatch('change');
                 }
-             ">
-            {% include 'ui/widgets/model_search_select_multi_tags.html' %}
+             "
+        >
+            {% for obj in selected %}
+                <span class="tag has-text-weight-normal is-medium">
+                    {{ obj }}
+                    <button class="delete" type="button" data-value="{{ obj.pk }}"></button>
+                </span>
+            {% endfor %}
         </div>
     </div>
-    <div style="position: relative; z-index: 90;">
-        <div x-show="open" class="box pt-1 mb-2" x-ref="dropdownContent" tabindex="-1" x-transition style="position: absolute; width: 100%;">
-            <input id="{{ widget.attrs.id }}_search" type="search" autocomplete="off" class="input" x-ref="searchInput" aria-label="search"
+    <div style="position: relative; top: 10px; z-index: 9">
+        <div x-show="open" class="box pt-1 mb-2" x-ref="dropdownContent" x-cloak="" tabindex="-1" x-transition style="position: absolute; width: 100%;">
+            <input id="id_{{ widget.uuid }}_search" type="search" autocomplete="off" class="input" x-ref="searchInput" aria-label="search"
                    name="{{ widget.search_parameter }}"
                    placeholder="{% translate 'Type to search' %}"
                    x-on:keydown="if ($event.keyCode == 27) {document.activeElement.blur()}"
                    x-on:focusout="open = shouldClose($event)"
                    hx-get="{{ widget.search_url }}"
-                   hx-trigger="input changed delay:500ms, search"
-                   hx-target="#{{ widget.attrs.id }}_dropdown_items"
+                   hx-trigger="input changed delay:300ms, search"
+                   hx-target="#id_{{ widget.uuid }}_dropdown_items"
+                   hx-swap="innerHTML"
+                   @change.stop=""
             >
-            <div id="{{ widget.attrs.id }}_dropdown_items" class="hoverable" style="max-height: 200px; width: 100%; overflow-y: auto;"
+            <div id="id_{{ widget.uuid }}_dropdown_items" class="hoverable" style="max-height: 200px; width: 100%; overflow-y: auto;"
                  x-on:click="
                     if (! $refs.inputValue.querySelectorAll(`option[value=${CSS.escape($event.target.value)}]`).length) {
                         let option = document.createElement('option');
@@ -42,16 +54,15 @@
                         let delButton = document.createElement('button');
                         option.setAttribute('selected', '');
                         option.value = $event.target.value;
-                        tag.classList.add('tag');
+                        tag.classList.add('tag', 'has-text-weight-normal', 'is-medium');
                         tag.innerText = $event.target.innerText;
-                        tag.style.whiteSpace = 'normal';
-                        tag.style.height = 'fit-content';
-                        delButton.classList.add('delete', 'is-small');
+                        delButton.classList.add('delete');
                         delButton.type = 'button';
                         delButton.setAttribute('data-value', $event.target.value);
                         tag.appendChild(delButton);
                         $refs.inputValue.appendChild(option);
                         $refs.inputDisplayTags.appendChild(tag);
+                        $dispatch('change');
                     };
                     {% if widget.hx_trigger_on_change %}htmx.trigger('#{{ widget.attrs.id }}_value', 'change');{% endif %}
                  "

accrete/contrib/ui/templates/ui/widgets/model_search_select_options.html

@@ -1,3 +1,3 @@
 {% for option in options %}
     <button type="button" class="dropdown-item px-1" value="{{ option.pk }}" style="word-wrap: break-word; width: 100%; white-space: normal">{{ option }}</button>
-{% endfor %}
+{% endfor %}

accrete/contrib/ui/templatetags/{accrete_ui.py → ui.py}

@@ -1,15 +1,14 @@
 import logging
+import re
 from datetime import datetime, date, timedelta
+
 from django.utils.translation import gettext_lazy as _
 from django import template
-from django.db.models import Manager
-from django.forms import Form, ModelForm
+from django.db.models import Manager, DecimalField, IntegerField, FloatField, Model
 from django.conf import settings
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
 
-from accrete.contrib.ui import TableField, TableFieldType
-
 _logger = logging.getLogger(__name__)
 register = template.Library()
 
@@ -27,34 +26,19 @@ def combine_templates(template_name, request=None):
     return mark_safe(html)
 
 
-@register.filter(name='field_attr')
-def get_attr_from_field(obj: object, field: TableField):
-
-    def return_save(attr):
-        if isinstance(attr, Manager):
-            return attr.related_model
-        if attr is None:
-            return None
-        if isinstance(attr, str):
-            return attr
-        return attr
-    f_name = field.name
-    if field.field_type == TableFieldType.CHOICE_DISPLAY:
-        f_name = f'get_{f_name}_display'
-
-    try:
-        attribute = getattr(obj, f_name, False)
-    except (AttributeError,):
-        _logger.warning(f'Object {obj} has no attribute {f_name}')
-        attribute = None
-    return return_save(attribute)
+@register.filter(name='related_obj_url')
+def related_obj_url(param: object, value: str):
+    attr = getattr(param, value, False)
+    if attr and hasattr(attr, 'get_absolute_url'):
+        return attr.get_absolute_url()
+    return '#'
 
 
 @register.filter(name='get_attr')
 def get_attr_from_string(param: object, value: str):
 
     def return_save(attr):
-        if isinstance(attr, Manager):
+        if isinstance(attr, Manager) and hasattr(attr, 'related_model'):
             return attr.related_model
         if attr is None:
             return None
@@ -70,43 +54,67 @@ def get_attr_from_string(param: object, value: str):
     return return_save(attribute)
 
 
-@register.filter(name='related_obj_url')
-def related_obj_url(param: object, value: str):
-    attr = getattr(param, value, False)
-    if attr and hasattr(attr, 'get_absolute_url'):
-        return attr.get_absolute_url()
-    return '#'
+@register.filter(name='has_attr')
+def has_attr(param: object, value:str):
+    return hasattr(param, value)
 
 
-@register.filter(name='message_class')
-def message_class(param):
-    if param.level == 25:
-        return 'is-success'
-    if param.level == 30:
-        return 'is-warning'
-    if param.level == 40:
-        return 'is-danger'
+@register.filter(name='get_item')
+def get_item(param, value):
+    return param[value]
 
 
-@register.filter(name='non_field_error_code')
-def non_field_error_code(form: [Form|ModelForm], code: str) -> bool:
-    if not form:
-        return False
-    for error in form.non_field_errors().as_data():
-        if error.code and error.code == code:
-            return True
-    return False
+@register.filter(name='get_model')
+def get_model(instance):
+    return instance._meta.model
 
 
-@register.filter(name='extract_non_field_error')
-def extract_non_field_error(form: [Form|ModelForm], code: str) -> str:
-    if not form:
+@register.filter(name='verbose_field_name')
+def verbose_field_name(param: object, value: str):
+    if not param:
         return ''
-    errors = []
-    for error in form.non_field_errors().as_data():
-        if error.code and error.code == code:
-            errors.append(str(error.message))
-    return mark_safe('<br>'.join(errors))
+    if isinstance(param, Model):
+        name = param._meta.get_field(value).verbose_name
+    else:
+        name = getattr(param.model, value).field.verbose_name
+    return name
+
+
+@register.filter(name='table_display')
+def table_display(param: object, value: str):
+    field = getattr(param, value)
+    if isinstance(field, Manager):
+        return mark_safe(f"""
+            <span>            
+                <div class="tags">
+                    {''.join(['<span class="tag">{}</span>'.format(o) for o in field.all()])}
+                </div>
+            </span>
+        """)
+    return get_attr_from_string(param, value)
+
+
+@register.filter(name='table_alignment')
+def table_alignment(param, value):
+    if isinstance(param, str):
+        return 'left'
+    if isinstance(param, Model):
+        field = param._meta.get_field(value)
+    else:
+        field = getattr(param.model, value).field
+    if isinstance(field, (DecimalField, IntegerField, FloatField)):
+        return 'right'
+    return 'left'
+
+
+@register.filter(name='message_class')
+def message_class(message):
+    if message.level == 25:
+        return 'is-success'
+    if message.level == 30:
+        return 'is-warning'
+    if message.level == 40:
+        return 'is-danger'
 
 
 @register.filter(name='timedelta_cast')
@@ -133,3 +141,7 @@ def datetime_to_weekday(dt: datetime|date, default=None) -> str:
         7: _('Sun')
     }
     return mapping[dt.isoweekday()]
+
+@register.filter(name='xrefsave')
+def x_ref_save(param: str):
+    return re.sub(r'[^A-Za-z]+','', param)

accrete/contrib/ui/urls.py

@@ -5,5 +5,7 @@ from . import views
 app_name = 'ui'
 
 urlpatterns = [
-    path('', views.home, name='home')
+    path('filter/<str:model>/params/', views.params, name='filter_params'),
+    path('filter/<str:model>/input/', views.set_filter_input, name='filter_input'),
+    path('filter/<str:model>/query/add/', views.filter_add_query, name='filter_add_query')
 ]

accrete/contrib/ui/views.py

@@ -1,5 +1,35 @@
-from django.shortcuts import render
+import json
 
+from django.contrib.auth.decorators import login_required
+from django.apps import apps
+from django.http import HttpResponse
+from .filter import Filter
 
-def home(request):
-    return render(request, 'ui/layout.html', {})
+
+@login_required
+def params(request, model: str):
+    app_label, model_name = model.split('.')
+    Model = apps.get_model(app_label, model_name)
+    return HttpResponse(Filter(Model, request.GET).query_params())
+
+
+@login_required
+def set_filter_input(request, model: str):
+    app_label, model_name = model.split('.')
+    Model = apps.get_model(app_label, model_name)
+    lookup = request.GET.get('lookup')
+    return HttpResponse(Filter(Model, request.GET).query_input(lookup))
+
+
+@login_required
+def filter_add_query(request, model: str):
+    app_label, model_name = model.split('.')
+    Model = apps.get_model(app_label, model_name)
+    query = json.loads(request.GET.get('q', '[]'))
+    lookup = request.GET.get('filter_lookup')
+    value = request.GET.get('filter_input')
+    query.append({lookup: value})
+    query = json.dumps(query)
+    query_dict = request.GET.copy()
+    query_dict.update(q=query)
+    return HttpResponse(Filter(Model, query_dict).query_tags())

accrete/contrib/ui/widgets/__init__.py

@@ -0,0 +1 @@
+from .search_select import ModelSearchSelect, ModelSearchSelectMulti

accrete/contrib/ui/{forms/widgets.py → widgets/search_select.py}

@@ -1,3 +1,4 @@
+from uuid import uuid4
 from django.forms import widgets
 from django.shortcuts import resolve_url
 
@@ -26,6 +27,7 @@ class ModelSearchSelect(widgets.NumberInput):
         qs = self.choices.queryset
         if self.limit:
             qs = qs[:self.limit]
+        uuid = str(uuid4())
 
         context = {
             "widget": {
@@ -38,7 +40,8 @@ class ModelSearchSelect(widgets.NumberInput):
                 "template_name": self.template_name,
                 'search_url': self.search_url,
                 'search_parameter': self.search_parameter,
-                'hx_trigger_on_change': self.hx_trigger_on_change
+                'hx_trigger_on_change': self.hx_trigger_on_change,
+                'uuid': uuid
             },
             'options': qs
         }
@@ -82,6 +85,7 @@ class ModelSearchSelectMulti(widgets.SelectMultiple):
         qs = self.choices.queryset
         if self.limit:
             qs = qs[:self.limit]
+        uuid = uuid4()
 
         context = {
             "widget": {
@@ -93,7 +97,8 @@ class ModelSearchSelectMulti(widgets.SelectMultiple):
                 "template_name": self.template_name,
                 'search_url': resolve_url(self.search_url),
                 'search_parameter': self.search_parameter,
-                'hx_trigger_on_change': self.hx_trigger_on_change
+                'hx_trigger_on_change': self.hx_trigger_on_change,
+                'uuid': uuid
             },
             'options': qs,
             'selected': self.choices.queryset.filter(pk__in=value) if value else qs.none()

accrete/contrib/user/templates/user/login.html

@@ -2,33 +2,81 @@
 {% load static %}
 {% load i18n %}
 
-{% block title %}Login | Accrete{% endblock %}
+{% block title %}Login{% endblock %}
 
 {% block body %}
-    <section class="hero is-primary is-medium is-bold is-fullheight">
-    <div class="hero-body">
-        <div class="container">
-            <div class="columns">
-                <div class="column box is-8-tablet is-offset-2-tablet is-6-desktop is-offset-3-desktop is-4-fullhd is-offset-4-fullhd p-3">
-                    <form method="POST" action="" hx-boost="false">
-                        {% csrf_token %}
-                        <span class="has-text-danger is-size-7">{{ form.non_field_errors }}</span>
-
-                        <label class="label">{{ form.username.label_tag }}
-                            {{ form.username }}
-                            <span class="has-text-danger is-size-7">{{ form.username.errors }}</span>
-                        </label>
-
-                        <label class="label">{{ form.password.label_tag }}
-                            {{form.password}}
-                            <span class="has-text-danger is-size-7">{{ form.password.errors }}</span>
-                        </label>
+    <section class="hero is-success is-fullheight">
+        <!-- Hero head: will stick at the top -->
+        <div class="hero-head">
+            <header class="navbar">
+                <div class="container">
+                    <div class="navbar-brand">
+                        <p class="title navbar-item">HRP</p>
+                        <span class="navbar-burger" data-target="navbarMenuHeroC">
+                            <span></span>
+                            <span></span>
+                            <span></span>
+                            <span></span>
+                        </span>
+                    </div>
+{#                    <div id="navbarMenuHeroC" class="navbar-menu">#}
+{#                        <div class="navbar-end">#}
+{#                            <a class="navbar-item is-active"> Home </a>#}
+{#                            <a class="navbar-item"> Examples </a>#}
+{#                            <a class="navbar-item"> Documentation </a>#}
+{#                            <span class="navbar-item">#}
+{#                                <a class="button is-success is-inverted">#}
+{#                                    <span class="icon">#}
+{#                                        <i class="fab fa-github"></i>#}
+{#                                    </span>#}
+{#                                    <span>Download</span>#}
+{#                                </a>#}
+{#                            </span>#}
+{#                        </div>#}
+{#                    </div>#}
+                </div>
+            </header>
+        </div>
 
-                        <input type="submit" class="button is-fullwidth is-success is-medium" value="{% translate 'Login' %}">
-                    </form>
+        <!-- Hero content: will be in the middle -->
+        <div class="hero-body">
+            <div class="container">
+                <div class="columns">
+                    <div class="column box is-8-tablet is-offset-2-tablet is-6-desktop is-offset-3-desktop is-4-fullhd is-offset-4-fullhd p-3">
+                        <form method="POST" action="" hx-boost="false">
+                            {% csrf_token %}
+                            <span class="has-text-danger is-size-7">{{ form.non_field_errors }}</span>
+                            <label class="label">
+                                {{ form.username.label_tag }}
+                                {{ form.username }}
+                                <span class="has-text-danger is-size-7">{{ form.username.errors }}</span>
+                            </label>
+                            <label class="label">{{ form.password.label_tag }}
+                                {{ form.password }}
+                                <span class="has-text-danger is-size-7">{{ form.password.errors }}</span>
+                            </label>
+                            <input type="submit" class="button is-fullwidth is-success is-medium"
+                                   value="{% translate 'Login' %}">
+                        </form>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
-</section>
+
+        <!-- Hero footer: will stick at the bottom -->
+        <div class="hero-foot">
+            <nav class="tabs is-boxed is-fullwidth">
+                <div class="container">
+                    <ul>
+{#                        <li class="is-active"><a>Overview</a></li>#}
+{#                        <li><a>Modifiers</a></li>#}
+{#                        <li><a>Grid</a></li>#}
+{#                        <li><a>Elements</a></li>#}
+{#                        <li><a>Components</a></li>#}
+{#                        <li><a>Layout</a></li>#}
+                    </ul>
+                </div>
+            </nav>
+        </div>
+    </section>
 {% endblock %}

accrete/forms.py

@@ -1,10 +1,8 @@
 import logging
 from django import forms
-from django.contrib.auth import get_user_model
 from accrete.tenant import get_tenant
 
 _logger = logging.getLogger(__name__)
-User = get_user_model()
 
 
 class TenantForm(forms.Form):