- {% if context == "request" %}
+ {% fragment as action_button %}
+
+ {% endfragment %}
-{% #card title=title custom_button=action_button %}
-{% if context == "request" %}
-{% #description_item title="Status:" %}{{ release_request.status.name }}{% /description_item %}
-{% endif %}
-{% /card %}
+ {% #card title=title custom_button=action_button %}
+ {% if context == "request" %}
+ {% #description_item title="Status:" %}{{ release_request.status.name }}{% /description_item %}
+ {% endif %}
+ {% /card %}
-{% #breadcrumbs %}
+ {% #breadcrumbs %}
{% for crumb in path_item.breadcrumbs %}
- {% breadcrumb title=crumb.name url=crumb.url active=forloop.last %}
+ {% breadcrumb title=crumb.name url=crumb.url active=forloop.last %}
{% endfor %}
-{% /breadcrumbs %}
-
-
+ {% if context == "request" %}
{% if is_author %}
- {% if release_request.status.name == "PENDING" %}
+ {% if release_request.status.name == "PENDING" %}
- {% endif %}
+ {% endif %}
{% elif is_output_checker %}
- {% if release_request.status.name == "SUBMITTED" %}
+ {% if release_request.status.name == "SUBMITTED" %}
- {% endif %}
+ {% endif %}
{% endif %}
{% #button type="link" href=workspace.get_url variant="success" id="workspace-home-button" %}Workspace Home{% /button %}
- {% elif current_request %}
- {% #button variant="success" type="link" href=current_request.get_url id="current-request-button" %}Current release request{% /button %}
- {% endif %}
-
-{% endfragment %}
+ {% elif current_request %}
+ {% #button variant="success" type="link" href=current_request.get_url id="current-request-button" %}Current release request{% /button %}
+ {% endif %}
+
+ {% /breadcrumbs %}
-
- {% if child.is_directory %}
-
+
{% endfor %}
diff --git a/airlock/templates/index.html b/airlock/templates/index.html
index 5583345b..1f8624bd 100644
--- a/airlock/templates/index.html
+++ b/airlock/templates/index.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{% block content %}
-Job Server error
-
- {% #card %}
-
+ -
- {% include "file_browser/tree.html" with path=root %}
-
-
{% endblock full_width_content %}
@@ -209,21 +209,21 @@
{% endblock %}
diff --git a/airlock/templates/file_browser/tree.html b/airlock/templates/file_browser/tree.html
index 531acc69..8cf19d72 100644
--- a/airlock/templates/file_browser/tree.html
+++ b/airlock/templates/file_browser/tree.html
@@ -1,18 +1,18 @@
{% for child in path.children %}
-
-
-
-
- {% if path_item.is_directory %}
-
- {% #card title=path_item.name %}
- {% #list_group %}
- {% if not path_item.children %}
- {% list_group_empty icon=True title="Empty Directory" %}
- {% else %}
- {% for entry in path_item.children %}
- {% #list_group_item href=entry.url %}
- {{ entry.name}}
- {% if entry.is_directory %}
- {% icon_folder_outline class="h-6 w-6 text-slate-600 inline" %}
- {% endif %}
- {% /list_group_item %}
- {% endfor %}
- {% endif %}
- {% /list_group %}
+
-
+ {% #card %}
+
+
+ -
+ {% include "file_browser/tree.html" with path=root %}
+
+
+
+ {% if path_item.is_directory %}
+
+ {% #card title=path_item.name %}
+ {% #list_group %}
+ {% if not path_item.children %}
+ {% list_group_empty icon=True title="Empty Directory" %}
+ {% else %}
+ {% for entry in path_item.children %}
+ {% #list_group_item href=entry.url %}
+ {{ entry.name}}
+ {% if entry.is_directory %}
+ {% icon_folder_outline class="h-6 w-6 text-slate-600 inline" %}
+ {% endif %}
+ {% /list_group_item %}
+ {% endfor %}
+ {% endif %}
+ {% /list_group %}
+ {% /card %}
+
+ {% else %}
+ {% fragment as add_button %}
+ {% if context == "workspace" %}
+ {% if form %}
+ {% #modal id="addRequestFile" button_text="Add File to Request" variant="success" %}
+ {% #card container=True title="Add a file" %}
+
+ {% /card %}
+ {% /modal %}
+ {% else %}
+ {% #button type="button" disabled=True tooltip="This file has already been added to the current request" id="add-file-modal-button-disabled" %}
+ Add File to Request
+ {% /button %}
+ {% endif %}
+ {% elif is_author %}
+
- {% else %}
- {% fragment as add_button %}
- {% if context == "workspace" %}
- {% if form %}
- {% #modal id="addRequestFile" button_text="Add File to Request" variant="success" %}
- {% #card container=True title="Add a file" %}
-
- {% /card %}
- {% /modal %}
- {% else %}
- {% #button type="button" disabled=True tooltip="This file has already been added to the current request" id="add-file-modal-button-disabled" %}
- Add File to Request
- {% /button %}
- {% endif %}
- {% elif is_author %}
-
-
- {% endif %}
- {% endfragment %}
-
- {% #card title=path_item.name container=True custom_button=add_button %}
-
-
+
- {% if path_item.suffix == '.html' %}
-
- {% elif path_item.suffix == '.csv' %}
- {% include "file_browser/csv.html" with contents=path_item.contents %}
- {% else %}
-
- {% /card %}
+ {% endfragment %}
+
+ {% #card title=path_item.name container=True custom_button=add_button %}
+
+ {{ path_item.contents }}
{% endif %}
-
+ {% if path_item.suffix == '.html' %}
+
+ {% elif path_item.suffix == '.csv' %}
+ {% include "file_browser/csv.html" with contents=path_item.contents %}
+ {% else %}
+
+ {% /card %}
- {% endif %}
+ {% endif %}
+ {{ path_item.contents }}
+ {% endif %}
+
-
+ {% if child.is_directory %}
+
- {% else %}
- {{ child.display }}
- {% endif %}
-- {{ child.display }} -
- {% if child.children %} --
- {% include "file_browser/tree.html" with path=child %}
-
+
+ {% else %}
+ {{ child.display }}
{% endif %}
- + {{ child.display }} +
+ {% if child.children %} +-
+ {% include "file_browser/tree.html" with path=child %}
+
Airlock
-Hello World
+Airlock
+Hello World
{% endblock content %} diff --git a/airlock/templates/jobserver-error.html b/airlock/templates/jobserver-error.html index d0906123..02f9efda 100644 --- a/airlock/templates/jobserver-error.html +++ b/airlock/templates/jobserver-error.html @@ -1,21 +1,21 @@ {% extends "base.html" %} {% block content %} -Job Server error
-
-
-Response Headers:
-
+ Job Server error
+
+
+ Response Headers:
+
{% for header, value in response.headers.items %}
- {{ header }}: {{ value }}{{ header }}: {{ value }}
-
-
-Response Body:
-{% if type == "text/html" %}
-
-{% else %}
+
+
+
+ Response Body:
+ {% if type == "text/html" %}
+
+ {% else %}
{{ response.text }}
{% endif %}
diff --git a/airlock/templates/login.html b/airlock/templates/login.html
index 9f07b551..5aec049e 100644
--- a/airlock/templates/login.html
+++ b/airlock/templates/login.html
@@ -3,42 +3,42 @@
{% block metatitle %}Login | OpenSAFELY Airlock{% endblock metatitle %}
{% block content %}
-
-
- Login
-
+
+
+ Login
+
- {% #card title="Login with Single Use Token" subtitle="Log in from Level 4 environments with a Single Use Token" container=True class="md:col-span-2" %}
- {% if dev_users_file %}
- {% #alert variant="warning" title="Development login mode" class="mb-6" dismissible=True %}
- Use credentials specified in:
- {{ dev_users_file }}
- {% /alert %}
- {% endif %}
-
-
-
- You cannot access Github to login from Level 4. Instead, you
- must generate a single user token to log in with.
-
-
- To do so, you will need to login with Github on your usual
- browser, outside Level 4. Then click on the Account drop down
- on the top right, and click Settings. Then click the button
- "Generate Single User Token". You can then use that token to
- login on Level 4.
-
-
+ {% #button type="submit" variant="primary-outline" %}
+ Log in with token
+ {% /button %}
+
+
+
+ You cannot access Github to login from Level 4. Instead, you
+ must generate a single user token to log in with.
+
+
+ To do so, you will need to login with Github on your usual
+ browser, outside Level 4. Then click on the Account drop down
+ on the top right, and click Settings. Then click the button
+ "Generate Single User Token". You can then use that token to
+ login on Level 4.
+
+
{% /card %}
{% endblock content %}
diff --git a/airlock/templates/requests.html b/airlock/templates/requests.html
index 36503570..c6e741bb 100644
--- a/airlock/templates/requests.html
+++ b/airlock/templates/requests.html
@@ -2,22 +2,22 @@
{% block content %}
-{% #card title="Requests by "|add:request.user.username %}
- {% #list_group id="authored-requests" %}
- {% for request in authored_requests %}
- {% #list_group_item href=request.get_url %}{{ request.workspace }}: {{ request.status.name }}{% /list_group_item %}
- {% endfor %}
- {% /list_group %}
-{% /card %}
+ {% #card title="Requests by "|add:request.user.username %}
+ {% #list_group id="authored-requests" %}
+ {% for request in authored_requests %}
+ {% #list_group_item href=request.get_url %}{{ request.workspace }}: {{ request.status.name }}{% /list_group_item %}
+ {% endfor %}
+ {% /list_group %}
+ {% /card %}
-{% if request.user.output_checker %}
-{% #card title="Outstanding requests awaiting review" %}
- {% #list_group id="outstanding-requests" %}
- {% for request in outstanding_requests %}
- {% #list_group_item href=request.get_url %}{{ request.workspace }} by {{ request.author }}{% /list_group_item %}
- {% endfor %}
- {% /list_group %}
-{% /card %}
-{% endif %}
+ {% if request.user.output_checker %}
+ {% #card title="Outstanding requests awaiting review" %}
+ {% #list_group id="outstanding-requests" %}
+ {% for request in outstanding_requests %}
+ {% #list_group_item href=request.get_url %}{{ request.workspace }} by {{ request.author }}{% /list_group_item %}
+ {% endfor %}
+ {% /list_group %}
+ {% /card %}
+ {% endif %}
{% endblock content %}
diff --git a/airlock/templates/workspaces.html b/airlock/templates/workspaces.html
index 10490425..95a5a26f 100644
--- a/airlock/templates/workspaces.html
+++ b/airlock/templates/workspaces.html
@@ -1,11 +1,11 @@
{% extends "base.html" %}
{% block content %}
-{% #card title="Workspaces for "|add:request.user.username %}
- {% #list_group id="workspaces" %}
- {% for workspace in workspaces %}
- {% #list_group_item href=workspace.get_url %}{{ workspace.name }}{% /list_group_item %}
- {% endfor %}
- {% /list_group %}
-{% /card %}
+ {% #card title="Workspaces for "|add:request.user.username %}
+ {% #list_group id="workspaces" %}
+ {% for workspace in workspaces %}
+ {% #list_group_item href=workspace.get_url %}{{ workspace.name }}{% /list_group_item %}
+ {% endfor %}
+ {% /list_group %}
+ {% /card %}
{% endblock content %}
Job Server error
+
+
+ Response Headers:
+
{% for header, value in response.headers.items %}
- {{ header }}: {{ value }}{{ header }}: {{ value }}
-
-
-Response Body:
-{% if type == "text/html" %}
-
-{% else %}
+
{{ header }}: {{ value }}{{ header }}: {{ value }}- Login -
++ Login +
- {% #card title="Login with Single Use Token" subtitle="Log in from Level 4 environments with a Single Use Token" container=True class="md:col-span-2" %} - {% if dev_users_file %} - {% #alert variant="warning" title="Development login mode" class="mb-6" dismissible=True %} - Use credentials specified in:-
{{ dev_users_file }}
- {% /alert %}
- {% endif %}
-
-
-
+ {% #button type="submit" variant="primary-outline" %}
+ Log in with token
+ {% /button %}
+
+ - You cannot access Github to login from Level 4. Instead, you - must generate a single user token to log in with. -
-- To do so, you will need to login with Github on your usual - browser, outside Level 4. Then click on the Account drop down - on the top right, and click Settings. Then click the button - "Generate Single User Token". You can then use that token to - login on Level 4. -
-
+
{% /card %}
{% endblock content %}
diff --git a/airlock/templates/requests.html b/airlock/templates/requests.html
index 36503570..c6e741bb 100644
--- a/airlock/templates/requests.html
+++ b/airlock/templates/requests.html
@@ -2,22 +2,22 @@
{% block content %}
-{% #card title="Requests by "|add:request.user.username %}
- {% #list_group id="authored-requests" %}
- {% for request in authored_requests %}
- {% #list_group_item href=request.get_url %}{{ request.workspace }}: {{ request.status.name }}{% /list_group_item %}
- {% endfor %}
- {% /list_group %}
-{% /card %}
+ {% #card title="Requests by "|add:request.user.username %}
+ {% #list_group id="authored-requests" %}
+ {% for request in authored_requests %}
+ {% #list_group_item href=request.get_url %}{{ request.workspace }}: {{ request.status.name }}{% /list_group_item %}
+ {% endfor %}
+ {% /list_group %}
+ {% /card %}
-{% if request.user.output_checker %}
-{% #card title="Outstanding requests awaiting review" %}
- {% #list_group id="outstanding-requests" %}
- {% for request in outstanding_requests %}
- {% #list_group_item href=request.get_url %}{{ request.workspace }} by {{ request.author }}{% /list_group_item %}
- {% endfor %}
- {% /list_group %}
-{% /card %}
-{% endif %}
+ {% if request.user.output_checker %}
+ {% #card title="Outstanding requests awaiting review" %}
+ {% #list_group id="outstanding-requests" %}
+ {% for request in outstanding_requests %}
+ {% #list_group_item href=request.get_url %}{{ request.workspace }} by {{ request.author }}{% /list_group_item %}
+ {% endfor %}
+ {% /list_group %}
+ {% /card %}
+ {% endif %}
{% endblock content %}
diff --git a/airlock/templates/workspaces.html b/airlock/templates/workspaces.html
index 10490425..95a5a26f 100644
--- a/airlock/templates/workspaces.html
+++ b/airlock/templates/workspaces.html
@@ -1,11 +1,11 @@
{% extends "base.html" %}
{% block content %}
-{% #card title="Workspaces for "|add:request.user.username %}
- {% #list_group id="workspaces" %}
- {% for workspace in workspaces %}
- {% #list_group_item href=workspace.get_url %}{{ workspace.name }}{% /list_group_item %}
- {% endfor %}
- {% /list_group %}
-{% /card %}
+ {% #card title="Workspaces for "|add:request.user.username %}
+ {% #list_group id="workspaces" %}
+ {% for workspace in workspaces %}
+ {% #list_group_item href=workspace.get_url %}{{ workspace.name }}{% /list_group_item %}
+ {% endfor %}
+ {% /list_group %}
+ {% /card %}
{% endblock content %}
+ You cannot access Github to login from Level 4. Instead, you + must generate a single user token to log in with. +
++ To do so, you will need to login with Github on your usual + browser, outside Level 4. Then click on the Account drop down + on the top right, and click Settings. Then click the button + "Generate Single User Token". You can then use that token to + login on Level 4. +
+