diff --git a/templates/flows/flow_list.html b/templates/flows/flow_list.html index a63b69fa43..194516361f 100644 --- a/templates/flows/flow_list.html +++ b/templates/flows/flow_list.html @@ -1,112 +1,102 @@ -{% extends "smartmin/list.html" %} +{% extends "orgs/base/list.html" %} {% load smartmin temba i18n humanize %} -{% block content %} - {% if org_perms.flows.flow_results %} - - - {% endif %} - {% if org_perms.flows.flowlabel_create %} - - - {% endif %} -
- - - -
-
{% include "includes/short_pagination.html" %}
-
- - {% if object_list %} - - - {% if org_perms.flows.flow_update %}{% endif %} - - - - - {% endif %} - - {% for object in object_list %} - - {% if org_perms.flows.flow_update %} - - {% endif %} - + + + {% empty %} + + + + {% endfor %} + +
Runs / Completion
- - - -
-
-
-
- {% if object.flow_type == 'V' %} - - - {% elif object.flow_type == 'S' %} - - - {% elif object.flow_type == 'B' %} - - - {% endif %} -
-
{{ object.name }}
+{% block pre-table %} + + + + +{% endblock pre-table %} +{% block table %} + + {% if object_list %} + + + {% if org_perms.flows.flow_update %}{% endif %} + + + + + {% endif %} + + {% for object in object_list %} + + {% if org_perms.flows.flow_update %} + + {% endif %} + - - - {% empty %} - - - - {% endfor %} - -
Runs / Completion
+ + + +
+
+
+
+ {% if object.flow_type == 'V' %} + + + {% elif object.flow_type == 'S' %} + + + {% elif object.flow_type == 'B' %} + + + {% endif %}
-
-
- {% for label in object.labels.all %} - - - {{ label.name }} - - - {% endfor %} +
{{ object.name }}
-
- {% if not object.is_archived %} -
- {% if object.has_issues %} -
- - - - -
- {% endif %} - {% if object.run_stats.total %} -
{{ object.run_stats.total|intcomma }}
- / -
{{ object.run_stats.completion }}%
- {% endif %} -
- {% endif %} -
{% trans "No flows" %}
-
-{% endblock content %} +
+ {% for label in object.labels.all %} + + + {{ label.name }} + + + {% endfor %} +
+
+
+ {% if not object.is_archived %} +
+ {% if object.has_issues %} +
+ + + + +
+ {% endif %} + {% if object.run_stats.total %} +
{{ object.run_stats.total|intcomma }}
+ / +
{{ object.run_stats.completion }}%
+ {% endif %} +
+ {% endif %} +
{% trans "No flows" %}
+{% endblock table %} {% block extra-script %} {{ block.super }} {% endblock extra-script %} -{% block extra-style %} - {{ block.super }} - -{% endblock extra-style %} diff --git a/templates/orgs/user_list.html b/templates/orgs/user_list.html index 992ad3971c..4831d7c63c 100644 --- a/templates/orgs/user_list.html +++ b/templates/orgs/user_list.html @@ -1,7 +1,11 @@ -{% extends "smartmin/list.html" %} +{% extends "orgs/base/list.html" %} {% load smartmin temba i18n %} -{% block content %} +{% block pre-table %} + + + + {% if has_viewers %} {% blocktrans trimmed with cutoff="2024-12-31"|day %} @@ -10,54 +14,42 @@ {% endblocktrans %} {% endif %} - {% block pre-table %} - - - - - {% endblock pre-table %} -
- - - -
-
{% include "includes/short_pagination.html" %}
-
- - - - - - - +{% endblock pre-table %} +{% block table %} +
{% trans "Email" %}{% trans "Name" %}{% trans "Role" %}
+ + + + + + + + + + {% for obj in object_list %} + + + + + - - - {% for obj in object_list %} - - - - - - - {% empty %} - - - - {% endfor %} - -
{% trans "Email" %}{% trans "Name" %}{% trans "Role" %}
{{ obj.email }}{{ obj.name }}{{ obj.role.display }} + {% if obj.role.code != "A" or admin_count > 1 %} + + {% endif %} +
{{ obj.email }}{{ obj.name }}{{ obj.role.display }} - {% if obj.role.code != "A" or admin_count > 1 %} - - {% endif %} -
{% trans "No users" %}
-
-{% endblock content %} + {% empty %} + + {% trans "No users" %} + + {% endfor %} + + +{% endblock table %} {% block extra-script %} {{ block.super }} {% endblock extra-script %} -{% block extra-style %} - {{ block.super }} - -{% endblock extra-style %} diff --git a/templates/tickets/shortcut_list.html b/templates/tickets/shortcut_list.html index 65d2c9d938..3dec455018 100644 --- a/templates/tickets/shortcut_list.html +++ b/templates/tickets/shortcut_list.html @@ -1,58 +1,55 @@ -{% extends "smartmin/list.html" %} -{% load smartmin temba i18n humanize %} +{% extends "orgs/base/list.html" %} +{% load smartmin temba i18n %} -{% block content %} +{% block pre-table %} + + + +
{% blocktrans trimmed %} These are canned responses that agents can use to quickly reply to tickets. {% endblocktrans %}
- {% block pre-table %} - - - - - {% endblock pre-table %} -
{% include "includes/short_pagination.html" %}
-
- - - {% for obj in object_list %} - - - - - - {% empty %} - - - - {% endfor %} - -
{{ obj.name }} -
{{ obj.text }}
-
- {% if org_perms.tickets.shortcut_delete %} - - {% endif %} -
{% trans "No shortcuts" %}
-
-{% endblock content %} +{% endblock pre-table %} +{% block table %} + + + {% for obj in object_list %} + + + + + + {% empty %} + + + + {% endfor %} + +
{{ obj.name }} +
{{ obj.text }}
+
+ {% if org_perms.tickets.shortcut_delete %} + + {% endif %} +
{% trans "No shortcuts" %}
+{% endblock table %} {% block extra-script %} {{ block.super }} {% endblock extra-script %} -{% block extra-style %} - {{ block.super }} - -{% endblock extra-style %}