finetune Form presentation

Ease the development of future forms
Adapt tenant and user forms

eveai_app/templates/user/edit_tenant.html

@@ -0,0 +1,21 @@
+{% extends 'base.html' %}
+{% from "macros.html" import render_field %}
+
+{% block title %}Update Tenant{% endblock %}
+
+{% block content_title %}Update Tenant{% endblock %}
+{% block content_description %}Update given tenant{% endblock %}
+
+{% block content %}
+    <form method="post">
+        {{ form.hidden_tag() }}
+        {%  set disabled_fields = ['name'] %}
+        {%  set exclude_fields = [] %}
+        {% for field in form %}
+            {{ render_field(field, disabled_fields, exclude_fields) }}
+        {% endfor %}
+        <button type="submit" class="btn btn-primary">Update Tenant</button>
+    </form>
+{% endblock %}
+
+{% block content_footer %} {% endblock %}

eveai_app/templates/user/edit_user.html

@@ -1,25 +1,18 @@
 {% extends "base.html" %}
+{% from "macros.html" import render_field %}
 {% block title %}Update User{% endblock %}
 
 {% block content_title %}Update User{% endblock %}
 {% block content_description %}Update given user account{% endblock %}
 
 {% block content %}
-<form method="post">
-    {{ form.hidden_tag() }}
-    {% for field in form %}
-        <div class="form-group">
-            {{ field.label }}
-            {{ field(class="form-control", disabled=true) if field.name in ['email', 'user_name'] else field(class="form-control") }}
-            {% if field.errors %}
-                <div class="alert alert-danger">
-                    {% for error in field.errors %}
-                        <p>{{ error }}</p>
-                    {% endfor %}
-                </div>
-            {% endif %}
-        </div>
-    {% endfor %}
-    <button type="submit" class="btn btn-primary">Update User</button>
-</form>
+    <form method="post">
+        {{ form.hidden_tag() }}
+        {%  set disabled_fields = ['email', 'user_name'] %}
+        {%  set exclude_fields = ['password', 'confirm_password'] %}
+        {% for field in form %}
+            {{ render_field(field, disabled_fields, exclude_fields) }}
+        {% endfor %}
+        <button type="submit" class="btn btn-primary">Update User</button>
+    </form>
 {% endblock %}

eveai_app/templates/user/tenant.html

@@ -1,29 +1,21 @@
 {% extends 'base.html' %}
+{% from "macros.html" import render_field %}
 
-{% block title %}Tenant Details{% endblock %}
+{% block title %}Tenant Registration{% endblock %}
+
+{% block content_title %}Register Tenant{% endblock %}
+{% block content_description %}Add a new tenant to EveAI{% endblock %}
 
 {% block content %}
-    <form action="" method="post" novalidate>
-        <p>
-            {{ form.name.label }}<br>
-            {{ form.name(size=80) }}
-        </p>
-        <p>
-            {{ form.website.label }}<br>
-            {{ form.website(size=80) }}
-        </p>
-        <p>
-            {{ form.license_start_date.label }}<br>
-            {{ form.license_start_date(size=20) }}
-        </p>
-        <p>
-            {{ form.license_end_date.label }}<br>
-            {{ form.license_end_date(size=20) }}
-        </p>
-        <p>
-            {{ form.allowed_monthly_interactions.label }}<br>
-            {{ form.allowed_monthly_interactions(size=20) }}
-        </p>
-        <p>{{ form.submit() }}</p>
+    <form method="post">
+        {{ form.hidden_tag() }}
+        {%  set disabled_fields = [] %}
+        {%  set exclude_fields = [] %}
+        {% for field in form %}
+            {{ render_field(field, disabled_fields, exclude_fields) }}
+        {% endfor %}
+        <button type="submit" class="btn btn-primary">Register Tenant</button>
     </form>
 {% endblock %}
+
+{% block content_footer %} {% endblock %}

eveai_app/templates/user/user.html

@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% from "macros.html" import render_field %}
 
 {% block title %}User Registration{% endblock %}
 
@@ -6,45 +7,14 @@
 {% block content_description %}Make a new user account{% endblock %}
 
 {% block content %}
-    <form action="" method="post">
+    <form method="post">
         {{ form.hidden_tag() }}
-        <p>
-            {{ form.user_name.label }}<br>
-            {{ form.user_name(size=80) }}
-        </p>
-        <p>
-            {{ form.email.label }}<br>
-            {{ form.email(size=80) }}
-        </p>
-        <p>
-            {{ form.password.label }}<br>
-            {{ form.password(size=80) }}
-        </p>
-        <p>
-            {{ form.confirm_password.label }}<br>
-            {{ form.confirm_password(size=80) }}
-        </p>
-        <p>
-            {{ form.first_name.label }}<br>
-            {{ form.first_name(size=80) }}
-        </p>
-        <p>
-            {{ form.last_name.label }}<br>
-            {{ form.last_name(size=80) }}
-        </p>
-        <p>
-            {{ form.is_active.label }}<br>
-            {{ form.is_active() }}
-        </p>
-        <p>
-            {{ form.valid_to.label }}<br>
-            {{ form.valid_to() }}
-        </p>
-        <p>
-            {{ form.tenant_id.label }}<br>
-            {{ form.tenant_id() }}
-        </p>
-        <p>{{ form.submit() }}</p>
+        {%  set disabled_fields = [] %}
+        {%  set exclude_fields = [] %}
+        {% for field in form %}
+            {{ render_field(field, disabled_fields, exclude_fields) }}
+        {% endfor %}
+        <button type="submit" class="btn btn-primary">Register User</button>
     </form>
 {% endblock %}