diff --git a/templates/interactive/analysis_request_create.html b/templates/interactive/analysis_request_create.html index 9ca45b18d..a8933915d 100644 --- a/templates/interactive/analysis_request_create.html +++ b/templates/interactive/analysis_request_create.html @@ -13,7 +13,6 @@ {% #breadcrumbs %} {% breadcrumb title="Home" url=home_url %} - {% breadcrumb title=project.org.name url=project.org.get_absolute_url location="Organisation" %} {% breadcrumb title=project.name url=project.get_absolute_url location="Project" %} {% breadcrumb title="Request an analysis" active=True %} {% /breadcrumbs %} diff --git a/templates/interactive/analysis_request_detail.html b/templates/interactive/analysis_request_detail.html index a8f15721d..f5c1617ff 100644 --- a/templates/interactive/analysis_request_detail.html +++ b/templates/interactive/analysis_request_detail.html @@ -19,7 +19,6 @@ {% #breadcrumbs %} {% breadcrumb title="Home" url=home_url %} - {% breadcrumb title=analysis_request.project.org.name url=analysis_request.project.org.get_absolute_url location="Organisation" %} {% breadcrumb title=analysis_request.project.name url=analysis_request.project.get_absolute_url location="Project" %} {% breadcrumb title=analysis_request.title location="Analysis Request" active=True %} {% /breadcrumbs %} diff --git a/templates/interactive/publish_request_create.html b/templates/interactive/publish_request_create.html index d91d480d7..64625145e 100644 --- a/templates/interactive/publish_request_create.html +++ b/templates/interactive/publish_request_create.html @@ -7,7 +7,6 @@ {% #breadcrumbs %} {% breadcrumb title="Home" url=home_url %} - {% breadcrumb title=analysis_request.project.org.name url=analysis_request.project.org.get_absolute_url location="Organisation" %} {% breadcrumb title=analysis_request.project.name url=analysis_request.project.get_absolute_url location="Project" %} {% breadcrumb title=analysis_request.title url=analysis_request.get_absolute_url location="Analysis" %} {% breadcrumb title="Publish analysis report" active=True %} diff --git a/templates/interactive/publish_request_create_locked.html b/templates/interactive/publish_request_create_locked.html index 7d0bd0838..962bc3a15 100644 --- a/templates/interactive/publish_request_create_locked.html +++ b/templates/interactive/publish_request_create_locked.html @@ -18,7 +18,6 @@ {% #breadcrumbs %} {% breadcrumb title="Home" url=home_url %} - {% breadcrumb title=analysis_request.project.org.name url=analysis_request.project.org.get_absolute_url location="Organisation" %} {% breadcrumb title=analysis_request.project.name url=analysis_request.project.get_absolute_url location="Project" %} {% breadcrumb title=analysis_request.title url=analysis_request.get_absolute_url location="Analysis Request" %} {% breadcrumb title="This report is locked" active=True %} diff --git a/templates/interactive/report_edit.html b/templates/interactive/report_edit.html index 14bae22b8..9ede3cfdf 100644 --- a/templates/interactive/report_edit.html +++ b/templates/interactive/report_edit.html @@ -19,7 +19,6 @@ {% #breadcrumbs %} {% breadcrumb title="Home" url=home_url %} - {% breadcrumb title=analysis_request.project.org.name url=analysis_request.project.org.get_absolute_url location="Organisation" %} {% breadcrumb title=analysis_request.project.name url=analysis_request.project.get_absolute_url location="Project" %} {% breadcrumb title=analysis_request.title url=analysis_request.get_absolute_url location="Analysis Request" %} {% breadcrumb title="Edit analysis title and summary" active=True %} diff --git a/templates/interactive/report_edit_locked.html b/templates/interactive/report_edit_locked.html index 7c2f06443..a2fdb3513 100644 --- a/templates/interactive/report_edit_locked.html +++ b/templates/interactive/report_edit_locked.html @@ -18,7 +18,6 @@ {% #breadcrumbs %} {% breadcrumb title="Home" url=home_url %} - {% breadcrumb title=analysis_request.project.org.name url=analysis_request.project.org.get_absolute_url location="Organisation" %} {% breadcrumb title=analysis_request.project.name url=analysis_request.project.get_absolute_url location="Project" %} {% breadcrumb title=analysis_request.title url=analysis_request.get_absolute_url location="Analysis Request" %} {% breadcrumb title="Editing is currently locked" active=True %} diff --git a/templates/job_detail.html b/templates/job_detail.html index d722b51fa..3011bc4d9 100644 --- a/templates/job_detail.html +++ b/templates/job_detail.html @@ -15,7 +15,6 @@ {% #breadcrumbs %} {% url 'home' as home_url %} {% breadcrumb title="Home" url=home_url %} - {% breadcrumb location="Organisation" title=job.job_request.workspace.project.org.name url=job.job_request.workspace.project.org.get_absolute_url %} {% breadcrumb location="Project" title=job.job_request.workspace.project.name url=job.job_request.workspace.project.get_absolute_url %} {% breadcrumb location="Workspace" title=job.job_request.workspace.name url=job.job_request.workspace.get_absolute_url %} {% breadcrumb location="Job request" title=job.job_request.id url=job.job_request.get_absolute_url %} diff --git a/templates/job_request_detail.html b/templates/job_request_detail.html index 18015ae48..861c36d73 100644 --- a/templates/job_request_detail.html +++ b/templates/job_request_detail.html @@ -20,7 +20,6 @@ {% #breadcrumbs %} {% url 'home' as home_url %} {% breadcrumb title="Home" url=home_url %} - {% breadcrumb location="Organisation" title=job_request.workspace.project.org.name url=job_request.workspace.project.org.get_absolute_url %} {% breadcrumb location="Project" title=job_request.workspace.project.name url=job_request.workspace.project.get_absolute_url %} {% breadcrumb location="Workspace" title=job_request.workspace.name url=job_request.workspace.get_absolute_url %} {% breadcrumb location="Job request" title=job_request.id active=True %} @@ -32,10 +31,15 @@
-

+

Job request: {{ job_request.pk }}

-
+
+
Organisation:
+
+ {% icon_building_library_outline class="mr-1.5 h-5 w-5 flex-shrink-0 text-slate-400" %} + {{ job_request.workspace.project.org.name }} +
Workspace:
{% icon_folder_open_outline class="mr-1.5 h-5 w-5 flex-shrink-0 text-slate-400" %} diff --git a/templates/job_request_pick_ref.html b/templates/job_request_pick_ref.html deleted file mode 100644 index 37e52cde2..000000000 --- a/templates/job_request_pick_ref.html +++ /dev/null @@ -1,67 +0,0 @@ -{% extends "base-tw.html" %} - -{% load humanize %} - -{% block metatitle %}{{ workspace.name }}: Pick commit | OpenSAFELY Jobs{% endblock metatitle %} - -{% block breadcrumbs %} - {% #breadcrumbs %} - {% url 'home' as home_url %} - {% breadcrumb title="Home" url=home_url %} - {% breadcrumb location="Organisation" title=workspace.project.org.name url=workspace.project.org.get_absolute_url %} - {% breadcrumb location="Project" title=workspace.project.name url=workspace.project.get_absolute_url %} - {% breadcrumb location="Workspace" title=workspace.name url=workspace.get_absolute_url %} - {% breadcrumb title="Pick commit" active=True %} - {% /breadcrumbs %} -{% endblock breadcrumbs %} - -{% block content %} -
- {% if workspace.project.org.logo_file %} - {{ workspace.project.org.name }} logo - {% endif %} -
-

- {{ workspace.name }} -

-

- Click on a commit below to run jobs with the project.yaml - from that commit. -

-
-
- -{% if error %} -{% #alert title="An error occurred" class="max-w-3xl mb-6" variant="warning" %} -

An error occurred while trying to get commits for this workspace:

- {% #code %}{{ error }}{% /code %} -{% /alert %} -{% endif %} - -{% if commits %} -{% #card title="Commits" class="max-w-3xl" %} - {% #list_group %} - {% for commit in commits %} - {% url 'job-request-create' project_slug=workspace.project.slug workspace_slug=workspace.name ref=commit.sha as commit_url %} - {% #list_group_item href=commit_url %} - {{ commit.message }} - - SHA: {{ commit.sha }} - - {% /list_group_item %} - {% endfor %} - {% /list_group %} -{% /card %} -{% endif %} -{% endblock content %} diff --git a/templates/project_detail.html b/templates/project_detail.html index 356bcedb4..2d98514ff 100644 --- a/templates/project_detail.html +++ b/templates/project_detail.html @@ -12,7 +12,6 @@ {% #breadcrumbs %} {% breadcrumb title="Home" url=home_url %} - {% breadcrumb title=project.org.name url=project.org.get_absolute_url location="Organisation" %} {% breadcrumb title=project.name active=True location="Project" %} {% /breadcrumbs %} {% endblock breadcrumbs %} diff --git a/templates/project_edit.html b/templates/project_edit.html index 2b728e141..a94315391 100644 --- a/templates/project_edit.html +++ b/templates/project_edit.html @@ -9,7 +9,6 @@ {% #breadcrumbs %} {% breadcrumb title="Home" url=home_url %} - {% breadcrumb title=project.org.name url=project.org.get_absolute_url location="Organisation" %} {% breadcrumb title=project.name url=project.get_absolute_url location="Project" %} {% breadcrumb title="Edit" active=True %} {% /breadcrumbs %} diff --git a/templates/project_release_list.html b/templates/project_release_list.html index 10bba0919..59a30f04e 100644 --- a/templates/project_release_list.html +++ b/templates/project_release_list.html @@ -9,7 +9,6 @@ {% #breadcrumbs %} {% breadcrumb title="Home" url=home_url %} - {% breadcrumb title=project.org.name url=project.org.get_absolute_url location="Organisation" %} {% breadcrumb title=project.name url=project.get_absolute_url location="Project" %} {% breadcrumb title="Releases" active=True %} {% /breadcrumbs %} diff --git a/templates/project_report_list.html b/templates/project_report_list.html index 247f4f0bd..7fbf9d24a 100644 --- a/templates/project_report_list.html +++ b/templates/project_report_list.html @@ -6,7 +6,6 @@ {% #breadcrumbs %} {% url 'home' as home_url %} {% breadcrumb title="Home" url=home_url %} - {% breadcrumb location="Organisation" title=project.org.name url=project.org.get_absolute_url %} {% breadcrumb location="Project" title=project.name url=project.get_absolute_url %} {% breadcrumb title="Reports" active=True %} {% /breadcrumbs %} diff --git a/templates/workspace_analysis_request_list.html b/templates/workspace_analysis_request_list.html index 40827c5bb..36fc25024 100644 --- a/templates/workspace_analysis_request_list.html +++ b/templates/workspace_analysis_request_list.html @@ -7,7 +7,6 @@ {% #breadcrumbs %} {% breadcrumb title="Home" url=home_url %} - {% breadcrumb title=workspace.project.org.name url=workspace.project.org.get_absolute_url location="Organisation" %} {% breadcrumb title=workspace.project.name url=workspace.project.get_absolute_url location="Project" %} {% breadcrumb title=workspace.name url=workspace.get_absolute_url location="Workspace" %} {% breadcrumb title="Analyses" active=True %} diff --git a/templates/workspace_detail.html b/templates/workspace_detail.html index 00b6b04c6..b30f14d8f 100644 --- a/templates/workspace_detail.html +++ b/templates/workspace_detail.html @@ -15,7 +15,6 @@ {% #breadcrumbs %} {% url 'home' as home_url %} {% breadcrumb title="Home" url=home_url %} - {% breadcrumb location="Organisation" title=workspace.project.org.name url=workspace.project.org.get_absolute_url %} {% breadcrumb location="Project" title=workspace.project.name url=workspace.project.get_absolute_url %} {% breadcrumb location="Workspace" title=workspace.name active=True %} {% /breadcrumbs %} diff --git a/templates/workspace_edit.html b/templates/workspace_edit.html index 8eb9f3d88..2afd4aeda 100644 --- a/templates/workspace_edit.html +++ b/templates/workspace_edit.html @@ -9,7 +9,6 @@ {% #breadcrumbs %} {% breadcrumb title="Home" url=home_url %} - {% breadcrumb title=workspace.project.org.name url=workspace.project.org.get_absolute_url location="Organisation" %} {% breadcrumb title=workspace.project.name url=workspace.project.get_absolute_url location="Project" %} {% breadcrumb title=workspace.name url=workspace.get_absolute_url location="Workspace" %} {% breadcrumb title="Edit" active=True %} diff --git a/templates/workspace_file_list.html b/templates/workspace_file_list.html index 219883c28..f5e08702e 100644 --- a/templates/workspace_file_list.html +++ b/templates/workspace_file_list.html @@ -7,7 +7,6 @@ {% #breadcrumbs %} {% breadcrumb title="Home" url=home_url %} - {% breadcrumb title=workspace.project.org.name url=workspace.project.org.get_absolute_url location="Organisation" %} {% breadcrumb title=workspace.project.name url=workspace.project.get_absolute_url location="Project" %} {% breadcrumb title=workspace.name url=workspace.get_absolute_url location="Workspace" %} {% breadcrumb title="Files" active=True %} diff --git a/templates/workspace_output_list.html b/templates/workspace_output_list.html index 2f94358d7..3621c3ba3 100644 --- a/templates/workspace_output_list.html +++ b/templates/workspace_output_list.html @@ -7,7 +7,6 @@ {% #breadcrumbs %} {% breadcrumb title="Home" url=home_url %} - {% breadcrumb title=workspace.project.org.name url=workspace.project.org.get_absolute_url location="Organisation" %} {% breadcrumb title=workspace.project.name url=workspace.project.get_absolute_url location="Project" %} {% breadcrumb title=workspace.name url=workspace.get_absolute_url location="Workspace" %} {% breadcrumb title="Published outputs" active=True %} diff --git a/templates/workspace_release_list.html b/templates/workspace_release_list.html index 95e02ca54..08504904a 100644 --- a/templates/workspace_release_list.html +++ b/templates/workspace_release_list.html @@ -8,7 +8,6 @@ {% #breadcrumbs %} {% url 'home' as home_url %} {% breadcrumb title="Home" url=home_url %} - {% breadcrumb location="Organisation" title=workspace.project.org.name url=workspace.project.org.get_absolute_url %} {% breadcrumb location="Project" title=workspace.project.name url=workspace.project.get_absolute_url %} {% breadcrumb location="Workspace" title=workspace.name url=workspace.get_absolute_url %} {% breadcrumb title="Releases" active=True %}