diff --git a/airlock/templates/activity.html b/airlock/templates/activity.html index 4a1e5ff1..8a8bd3ae 100644 --- a/airlock/templates/activity.html +++ b/airlock/templates/activity.html @@ -1,81 +1,63 @@ {% load airlock %} {% load django_vite %} -{% load static %} - - -{% #card title="Recent activity" %} +{% #card title="Recent activity" class="mt-5" %} {% if activity %} -
-

Loading table data...

- - + {% #datatable paging per_page="25" column_filter searchable sortable %} + + + + + + + + + + {% for log in activity %} - - - - + + + + - - - {% for log in activity %} - - - - - - - {% endfor %} - - - - - -
+ {% endfor %} + + {% /datatable %} {% else %} {% #list_group %} {% list_group_empty title="No activity" description="There has been no recent activity on this workspace" %} @@ -83,6 +65,4 @@ {% endif %} {% /card %} -{% vite_asset "assets/src/scripts/components.js" app="job_server" %} - - +{% vite_asset "assets/src/datatable.js" %} diff --git a/airlock/templates/file_browser/file_content/csv.html b/airlock/templates/file_browser/file_content/csv.html index 0c5427ab..ed67a6bb 100644 --- a/airlock/templates/file_browser/file_content/csv.html +++ b/airlock/templates/file_browser/file_content/csv.html @@ -3,52 +3,70 @@ {% load static %} - + + + + + {% vite_hmr_client %} - {% vite_asset "assets/src/scripts/base.js" app="job_server" %} - {% vite_asset "assets/src/scripts/components.js" app="job_server" %} - - + {% vite_asset "assets/src/scripts/main.js" %} + {% vite_asset "assets/src/datatable.js" %}
{% if use_datatables %} -

Loading table data...

- + {% #datatable column_filter searchable sortable %} + + + {% for header in headers %} + + {% endfor %} + + + + {% for row in rows %} + + {% for cell in row %} + + {% endfor %} + + {% endfor %} + + {% /datatable %} {% else %} - {% endif %} - - - {% for header in headers %} - - {% endfor %} - - - - {% for row in rows %} - - {% for cell in row %} - + + + {% for header in headers %} + + {% endfor %} + + + + {% for row in rows %} + + {% for cell in row %} + + {% endfor %} + {% endfor %} - - {% endfor %} - -
-
- {{ header }} - {% if use_datatables %} - {% datatable_sort_icon %} - {% endif %} - -
{{ cell }}
+ {{ header }} +
{{ cell }}
- -
+ + + {% endif %} - - + + diff --git a/airlock/templates/file_browser/repo/dir.html b/airlock/templates/file_browser/repo/dir.html index fdde65c3..16ff986b 100644 --- a/airlock/templates/file_browser/repo/dir.html +++ b/airlock/templates/file_browser/repo/dir.html @@ -2,20 +2,20 @@ {% load static %} {% load airlock %} -{% block extra_styles %} - -{% endblock %} - {% #card title=path_item.name container=True %} - - {% #table class="dir_table" id="customTable" %} - {% #table_head %} + {% #datatable column_filter searchable sortable %} + -
File{% datatable_sort_icon %}
+
+ File + + {% datatable_sort_icon %} + +
- {% /table_head %} + {% for path in path_item.children %} @@ -23,10 +23,9 @@ {% endfor %} - {% /table %} - - {% vite_asset "assets/src/scripts/components.js" app="job_server" %} - - - + {% /datatable %} {% /card %} + +{% vite_hmr_client %} +{% vite_asset "assets/src/datatable.js" %} + diff --git a/airlock/templates/file_browser/request/dir.html b/airlock/templates/file_browser/request/dir.html index a9ad19f4..26cbbffd 100644 --- a/airlock/templates/file_browser/request/dir.html +++ b/airlock/templates/file_browser/request/dir.html @@ -2,10 +2,6 @@ {% load static %} {% load airlock %} -{% block extra_styles %} - -{% endblock %} - {% fragment as buttons %} {% if content_buttons.multiselect_withdraw.show %}
@@ -17,7 +13,6 @@ {% endif %} {% endfragment %} - {% #card title=path_item.name container=False custom_button=buttons %}
- {% #table class="dir_table" id="customTable" %} - {% #table_head %} + {% #datatable column_filter searchable sortable %} + -
File{% datatable_sort_icon %}
+
+ File + + {% datatable_sort_icon %} + +
-
File Type{% datatable_sort_icon %}
+
+ File Type + + {% datatable_sort_icon %} + +
-
Size{% datatable_sort_icon %}
+
+ Size + + {% datatable_sort_icon %} + +
-
Modified{% datatable_sort_icon %}
+
+ Modified + + {% datatable_sort_icon %} + +
{% if content_buttons.multiselect_withdraw.show %} - + {% endif %} - {% /table_head %} + {% for path in path_item.children %} @@ -68,12 +83,10 @@ {% endfor %} - {% /table %} - + {% /datatable %}
- - {% vite_asset "assets/src/scripts/components.js" app="job_server" %} - - - {% /card %} + +{% vite_hmr_client %} +{% vite_asset "assets/src/datatable.js" %} + diff --git a/airlock/templates/file_browser/workspace/dir.html b/airlock/templates/file_browser/workspace/dir.html index 57fadd38..e6fadaff 100644 --- a/airlock/templates/file_browser/workspace/dir.html +++ b/airlock/templates/file_browser/workspace/dir.html @@ -2,12 +2,7 @@ {% load static %} {% load airlock %} -{% block extra_styles %} - -{% endblock %} - {% fragment as buttons %} - {% if content_buttons.multiselect_add.show %} {% if content_buttons.multiselect_add.disabled %} {% #button type="button" disabled=True tooltip=content_buttons.multiselect_add.tooltip id="add-file-modal-button" %} @@ -44,28 +39,48 @@ {% csrf_token %} - {% #table class="dir_table" id="customTable" %} - {% #table_head %} + {% #datatable column_filter searchable sortable %} + -
File{% datatable_sort_icon %}
+
+ File + + {% datatable_sort_icon %} + +
-
Review State{% datatable_sort_icon %}
+
+ Review State + + {% datatable_sort_icon %} + +
-
Size{% datatable_sort_icon %}
+
+ Size + + {% datatable_sort_icon %} + +
-
Modified{% datatable_sort_icon %}
+
+ Modified + + {% datatable_sort_icon %} + +
{% if not content_buttons.multiselect_add.disabled %} - + {% endif %} - {% /table_head %} + {% for path in path_item.children %} @@ -83,14 +98,11 @@ {% endfor %} - {% /table %} - - + {% /datatable %} - - {% vite_asset "assets/src/scripts/components.js" app="job_server" %} - - - {% endif %} {% /card %} + +{% vite_hmr_client %} +{% vite_asset "assets/src/datatable.js" %} +