From 6bdcbfbf0e9201bf2ea35511e57ef1abd0c61c23 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sat, 21 Nov 2020 16:16:34 +0100 Subject: [PATCH] admin: update lists to use modal button --- .../certificatekeypair/list.html | 36 ++++++++++--- .../templates/administration/flow/list.html | 48 ++++++++++++++--- .../templates/administration/group/list.html | 33 +++++++++--- .../administration/outpost/list.html | 31 +++++++++-- .../outpost_service_connection/list.html | 47 ++++++++++++----- .../templates/administration/policy/list.html | 52 +++++++++++++------ .../templates/administration/policy/test.html | 21 -------- .../administration/policy_binding/list.html | 34 +++++++++--- .../administration/property_mapping/list.html | 49 +++++++++++------ .../administration/provider/list.html | 47 ++++++++++++----- .../templates/administration/source/list.html | 47 ++++++++++++----- .../templates/administration/stage/list.html | 50 ++++++++++++------ .../administration/stage_binding/list.html | 32 ++++++++++-- .../administration/stage_invitation/list.html | 25 +++++++-- .../administration/stage_prompt/list.html | 26 ++++++++-- .../templates/administration/token/list.html | 7 ++- .../templates/administration/user/list.html | 38 ++++++++++++-- 17 files changed, 462 insertions(+), 161 deletions(-) diff --git a/passbook/admin/templates/administration/certificatekeypair/list.html b/passbook/admin/templates/administration/certificatekeypair/list.html index ec93338ef..9ffa6378e 100644 --- a/passbook/admin/templates/administration/certificatekeypair/list.html +++ b/passbook/admin/templates/administration/certificatekeypair/list.html @@ -20,7 +20,15 @@
{% include 'partials/toolbar_search.html' %}
- {% trans 'Create' %} + + +
+
+
{% include 'partials/pagination.html' %}
@@ -31,7 +39,6 @@ {% trans 'Name' %} {% trans 'Private Key available' %} {% trans 'Fingerprint' %} - {% trans 'Provider Type' %} @@ -53,13 +60,21 @@ - - {{ kp.fingerprint }} - + {{ kp.fingerprint }} - {% trans 'Edit' %} - {% trans 'Delete' %} + + +
+
+ + +
+
{% endfor %} @@ -87,7 +102,12 @@ {% trans 'Currently no certificates exist. Click the button below to create one.' %} {% endif %} - {% trans 'Create' %} + + +
+
{% endif %} diff --git a/passbook/admin/templates/administration/flow/list.html b/passbook/admin/templates/administration/flow/list.html index 8d72955af..f309209d5 100644 --- a/passbook/admin/templates/administration/flow/list.html +++ b/passbook/admin/templates/administration/flow/list.html @@ -20,8 +20,21 @@
{% include 'partials/toolbar_search.html' %}
- {% trans 'Create' %} - {% trans 'Import' %} + + +
+
+ + +
+
+
{% include 'partials/pagination.html' %}
@@ -41,7 +54,7 @@
-
{{ flow.slug }}
+
{{ flow.slug }}
{{ flow.name }}
@@ -61,8 +74,19 @@ - {% trans 'Edit' %} - {% trans 'Delete' %} + + +
+
+ + +
+
+ {# TODO: Fix execute link being modified #} {% trans 'Execute' %} {% trans 'Export' %} @@ -92,8 +116,18 @@ {% trans 'Currently no flows exist. Click the button below to create one.' %} {% endif %} - {% trans 'Create' %} - {% trans 'Import' %} + + +
+
+ + +
+
{% endif %} diff --git a/passbook/admin/templates/administration/group/list.html b/passbook/admin/templates/administration/group/list.html index 893391b82..65b44231e 100644 --- a/passbook/admin/templates/administration/group/list.html +++ b/passbook/admin/templates/administration/group/list.html @@ -1,7 +1,6 @@ {% extends "administration/base.html" %} {% load i18n %} -{% load passbook_utils %} {% block content %}
@@ -21,8 +20,15 @@
{% include 'partials/toolbar_search.html' %}
- {% trans 'Create' %} + + +
+
+
{% include 'partials/pagination.html' %}
@@ -55,8 +61,18 @@ - {% trans 'Edit' %} - {% trans 'Delete' %} + + +
+
+ + +
+
{% endfor %} @@ -84,7 +100,12 @@ {% trans 'Currently no group exist. Click the button below to create one.' %} {% endif %} - {% trans 'Create' %} + + +
+
{% endif %} diff --git a/passbook/admin/templates/administration/outpost/list.html b/passbook/admin/templates/administration/outpost/list.html index e4c8efbd1..62c7e3afc 100644 --- a/passbook/admin/templates/administration/outpost/list.html +++ b/passbook/admin/templates/administration/outpost/list.html @@ -22,7 +22,15 @@
{% include 'partials/toolbar_search.html' %}
- {% trans 'Create' %} + + +
+
+
{% include 'partials/pagination.html' %}
@@ -84,8 +92,18 @@ {% endif %} {% endwith %} - {% trans 'Edit' %} - {% trans 'Delete' %} + + +
+
+ + +
+
{% get_htmls outpost as htmls %} {% for html in htmls %} {{ html|safe }} @@ -117,7 +135,12 @@ {% trans 'Currently no outposts exist. Click the button below to create one.' %} {% endif %} - {% trans 'Create' %} + + +
+
{% endif %} diff --git a/passbook/admin/templates/administration/outpost_service_connection/list.html b/passbook/admin/templates/administration/outpost_service_connection/list.html index 1cd293dcc..9752c683c 100644 --- a/passbook/admin/templates/administration/outpost_service_connection/list.html +++ b/passbook/admin/templates/administration/outpost_service_connection/list.html @@ -30,16 +30,22 @@ + {% include 'partials/pagination.html' %} @@ -80,8 +86,18 @@ - {% trans 'Edit' %} - {% trans 'Delete' %} + + +
+
+ + +
+
{% endfor %} @@ -117,12 +133,15 @@ diff --git a/passbook/admin/templates/administration/policy/list.html b/passbook/admin/templates/administration/policy/list.html index 5bd443a0d..b5361e659 100644 --- a/passbook/admin/templates/administration/policy/list.html +++ b/passbook/admin/templates/administration/policy/list.html @@ -28,12 +28,15 @@ @@ -71,9 +74,24 @@ - {% trans 'Edit' %} - {% trans 'Test' %} - {% trans 'Delete' %} + + +
+
+ + +
+
+ + +
+
{% endfor %} @@ -109,13 +127,15 @@ diff --git a/passbook/admin/templates/administration/policy/test.html b/passbook/admin/templates/administration/policy/test.html index 0c8e21169..ae4ebf84c 100644 --- a/passbook/admin/templates/administration/policy/test.html +++ b/passbook/admin/templates/administration/policy/test.html @@ -9,24 +9,3 @@ {% block action %} {% trans 'Test' %} {% endblock %} - -{% block beneath_form %} - -{% endblock %} - -{% block scripts %} -{{ block.super }} - -{% endblock %} diff --git a/passbook/admin/templates/administration/policy_binding/list.html b/passbook/admin/templates/administration/policy_binding/list.html index 0e852e6bf..332a4d3c7 100644 --- a/passbook/admin/templates/administration/policy_binding/list.html +++ b/passbook/admin/templates/administration/policy_binding/list.html @@ -19,8 +19,15 @@
- {% trans 'Create' %} + + +
+
+
{% include 'partials/pagination.html' %}
@@ -66,9 +73,19 @@
{{ binding.timeout }}
- - {% trans 'Edit' %} - {% trans 'Delete' %} + + + +
+
+ + +
+
{% endfor %} @@ -88,7 +105,12 @@
{% trans 'Currently no policy bindings exist. Click the button below to create one.' %}
- {% trans 'Create' %} + + +
+
{% endif %} diff --git a/passbook/admin/templates/administration/property_mapping/list.html b/passbook/admin/templates/administration/property_mapping/list.html index cd720c592..bc281eb2e 100644 --- a/passbook/admin/templates/administration/property_mapping/list.html +++ b/passbook/admin/templates/administration/property_mapping/list.html @@ -29,17 +29,22 @@ + {% include 'partials/pagination.html' %} @@ -66,8 +71,18 @@ - {% trans 'Edit' %} - {% trans 'Delete' %} + + +
+
+ + +
+
{% endfor %} @@ -103,13 +118,15 @@ diff --git a/passbook/admin/templates/administration/provider/list.html b/passbook/admin/templates/administration/provider/list.html index 363ddef29..c7a99d1da 100644 --- a/passbook/admin/templates/administration/provider/list.html +++ b/passbook/admin/templates/administration/provider/list.html @@ -30,16 +30,22 @@ + {% include 'partials/pagination.html' %} @@ -77,8 +83,18 @@ - {% trans 'Edit' %} - {% trans 'Delete' %} + + +
+
+ + +
+
{% get_links provider as links %} {% for name, href in links.items %} {% trans name %} @@ -122,12 +138,15 @@ diff --git a/passbook/admin/templates/administration/source/list.html b/passbook/admin/templates/administration/source/list.html index af87da48f..38ee8a78d 100644 --- a/passbook/admin/templates/administration/source/list.html +++ b/passbook/admin/templates/administration/source/list.html @@ -30,16 +30,22 @@ + {% include 'partials/pagination.html' %} @@ -75,8 +81,18 @@ - {% trans 'Edit' %} - {% trans 'Delete' %} + + +
+
+ + +
+
{% get_links source as links %} {% for name, href in links %} {% trans name %} @@ -116,12 +132,15 @@ diff --git a/passbook/admin/templates/administration/stage/list.html b/passbook/admin/templates/administration/stage/list.html index 2bea8be3a..abf9c36f6 100644 --- a/passbook/admin/templates/administration/stage/list.html +++ b/passbook/admin/templates/administration/stage/list.html @@ -29,16 +29,22 @@ + {% include 'partials/pagination.html' %} @@ -63,15 +69,25 @@ - {% trans 'Edit' %} - {% trans 'Delete' %} + + +
+
+ + +
+
{% get_links stage as links %} {% for name, href in links.items %} {% trans name %} @@ -111,13 +127,15 @@ diff --git a/passbook/admin/templates/administration/stage_binding/list.html b/passbook/admin/templates/administration/stage_binding/list.html index 2f2c058e0..1fa1c777c 100644 --- a/passbook/admin/templates/administration/stage_binding/list.html +++ b/passbook/admin/templates/administration/stage_binding/list.html @@ -19,8 +19,15 @@
- {% trans 'Create' %} + + +
+
+
{% include 'partials/pagination.html' %}
@@ -73,8 +80,18 @@
- {% trans 'Edit' %} - {% trans 'Delete' %} + + +
+
+ + +
+
{% endfor %} @@ -94,7 +111,12 @@
{% trans 'Currently no flow-stage bindings exist. Click the button below to create one.' %}
- {% trans 'Create' %} + + +
+
{% endif %} diff --git a/passbook/admin/templates/administration/stage_invitation/list.html b/passbook/admin/templates/administration/stage_invitation/list.html index 1e420f597..752fb81fc 100644 --- a/passbook/admin/templates/administration/stage_invitation/list.html +++ b/passbook/admin/templates/administration/stage_invitation/list.html @@ -21,8 +21,15 @@
{% include 'partials/toolbar_search.html' %}
- {% trans 'Create' %} + + +
+
+
{% include 'partials/pagination.html' %}
@@ -49,7 +56,12 @@ - {% trans 'Delete' %} + + +
+
{% endfor %} @@ -77,7 +89,12 @@ {% trans 'Currently no invitations exist. Click the button below to create one.' %} {% endif %} - {% trans 'Create' %} + + +
+
{% endif %} diff --git a/passbook/admin/templates/administration/stage_prompt/list.html b/passbook/admin/templates/administration/stage_prompt/list.html index ca5ff289f..332f2af0d 100644 --- a/passbook/admin/templates/administration/stage_prompt/list.html +++ b/passbook/admin/templates/administration/stage_prompt/list.html @@ -21,7 +21,15 @@
{% include 'partials/toolbar_search.html' %}
- {% trans 'Create' %} + + +
+
+
{% include 'partials/pagination.html' %}
@@ -63,15 +71,25 @@ - {% trans 'Edit' %} - {% trans 'Delete' %} + + +
+
+ + +
+
{% get_links prompt as links %} {% for name, href in links.items %} {% trans name %} diff --git a/passbook/admin/templates/administration/token/list.html b/passbook/admin/templates/administration/token/list.html index e2a43e4d5..a24cd3567 100644 --- a/passbook/admin/templates/administration/token/list.html +++ b/passbook/admin/templates/administration/token/list.html @@ -58,7 +58,12 @@ - {% trans 'Delete' %} + + +
+
{% endfor %} diff --git a/passbook/admin/templates/administration/user/list.html b/passbook/admin/templates/administration/user/list.html index 7868b95b9..45ae6745f 100644 --- a/passbook/admin/templates/administration/user/list.html +++ b/passbook/admin/templates/administration/user/list.html @@ -19,7 +19,15 @@
{% include 'partials/toolbar_search.html' %}
- {% trans 'Create' %} + + +
+
+
{% include 'partials/pagination.html' %}
@@ -53,11 +61,26 @@ - {% trans 'Edit' %} + + +
+
{% if user.is_active %} - {% trans 'Disable' %} + + +
+
{% else %} - {% trans 'Enable' %} + + +
+
{% endif %} {% trans 'Reset Password' %} {% trans 'Impersonate' %} @@ -88,7 +111,12 @@ {% trans 'Currently no users exist. How did you even get here.' %} {% endif %} - {% trans 'Create' %} + + +
+
{% endif %}