Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace org breadcrumbs #3348

Merged
merged 2 commits into from
Aug 1, 2023
Merged

Replace org breadcrumbs #3348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fd0310
Remove Org from breadcrumbs
ghickman Jul 31, 2023
aac725f
Remove unused template
ghickman Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion templates/interactive/analysis_request_create.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
1 change: 0 additions & 1 deletion templates/interactive/analysis_request_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
1 change: 0 additions & 1 deletion templates/interactive/publish_request_create.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
1 change: 0 additions & 1 deletion templates/interactive/publish_request_create_locked.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
1 change: 0 additions & 1 deletion templates/interactive/report_edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
1 change: 0 additions & 1 deletion templates/interactive/report_edit_locked.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
1 change: 0 additions & 1 deletion templates/job_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
10 changes: 7 additions & 3 deletions templates/job_request_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand All @@ -32,10 +31,15 @@
<div class="flex flex-col text-center items-center gap-y-2 lg:text-left lg:items-start lg:col-span-full">
<div class="flex flex-col items-center gap-y-2 w-full lg:flex-row lg:justify-between lg:items-start">
<div class="order-2 w-full lg:mr-auto lg:order-1">
<h1 class="text-3xl tracking-tight break-words font-bold text-slate-900 sm:text-4xl">
<h1 class="text-3xl tracking-tight break-words font-bold text-slate-900 sm:text-4xl !leading-snug">
Job request: {{ job_request.pk }}
</h1>
<dl class="flex flex-col gap-2 text-sm text-slate-600 items-center sm:flex-row sm:gap-x-6 sm:justify-center lg:justify-start">
<dl class="flex flex-col gap-2 text-sm text-slate-600 items-center sm:flex-row sm:gap-x-6 sm:justify-center lg:justify-start mt-1">
<dt class="sr-only">Organisation:</dt>
<dd class="flex flex-row items-start overflow-hidden">
{% icon_building_library_outline class="mr-1.5 h-5 w-5 flex-shrink-0 text-slate-400" %}
<span class="truncate">{{ job_request.workspace.project.org.name }}</span>
</dd>
<dt class="sr-only">Workspace:</dt>
<dd class="flex flex-row items-start overflow-hidden">
{% icon_folder_open_outline class="mr-1.5 h-5 w-5 flex-shrink-0 text-slate-400" %}
Expand Down
67 changes: 0 additions & 67 deletions templates/job_request_pick_ref.html
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion templates/project_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
1 change: 0 additions & 1 deletion templates/project_edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
1 change: 0 additions & 1 deletion templates/project_release_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
1 change: 0 additions & 1 deletion templates/project_report_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
1 change: 0 additions & 1 deletion templates/workspace_analysis_request_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
1 change: 0 additions & 1 deletion templates/workspace_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
1 change: 0 additions & 1 deletion templates/workspace_edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
1 change: 0 additions & 1 deletion templates/workspace_file_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
1 change: 0 additions & 1 deletion templates/workspace_output_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
1 change: 0 additions & 1 deletion templates/workspace_release_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down