diff --git a/app/grandchallenge/archives/templates/archives/archive_form.html b/app/grandchallenge/archives/templates/archives/archive_form.html
index 363d6357b..6c217818b 100644
--- a/app/grandchallenge/archives/templates/archives/archive_form.html
+++ b/app/grandchallenge/archives/templates/archives/archive_form.html
@@ -3,7 +3,7 @@
{% load url %}
{% block title %}
- {% if object %}Update{% else %}New{% endif %} Archive -{% if object %} {{ object.title }} -{% endif %} {{ block.super }}
+ {{ object|yesno:"Update,Create Archive" }} {% if object %} - {{ object.title }} {% else %} - Archives {% endif %} - {{ block.super }}
{% endblock %}
{% block breadcrumbs %}
@@ -14,7 +14,7 @@
{{ object.title }}
{% endif %}
{% if object %}Update{% else %}New{% endif %} Archive
+ aria-current="page">{{ object|yesno:"Update,Create Archive" }}
{% endblock %}
diff --git a/app/grandchallenge/archives/templates/archives/archive_item_job_list.html b/app/grandchallenge/archives/templates/archives/archive_item_job_list.html
index dbd9ccfd4..f1f49d5d3 100644
--- a/app/grandchallenge/archives/templates/archives/archive_item_job_list.html
+++ b/app/grandchallenge/archives/templates/archives/archive_item_job_list.html
@@ -2,7 +2,7 @@
{% load meta_attr %}
{% block title %}
- Jobs - {{ object.pk }} - {{ block.super }}
+ Results - {{ object.pk }} - {{ block.super }}
{% endblock %}
{% block breadcrumbs %}
@@ -11,7 +11,7 @@
{{ object.base_object }}
{{ object.base_object.civ_set_model|verbose_name_plural|title }}
{{ object.pk }}
- Jobs
+ Results
{% endblock %}
diff --git a/app/grandchallenge/archives/templates/archives/archive_user_groups_form.html b/app/grandchallenge/archives/templates/archives/archive_user_groups_form.html
index ca4b2aeb6..9c3b28281 100644
--- a/app/grandchallenge/archives/templates/archives/archive_user_groups_form.html
+++ b/app/grandchallenge/archives/templates/archives/archive_user_groups_form.html
@@ -2,13 +2,13 @@
{% load url %}
{% block title %}
- Add user - {{ object.title }} - {{ block.super }}
+ Add User - {{ object.title }} - {{ block.super }}
{% endblock %}
{% block breadcrumbs %}
- Archives
- {{ object.title }}
- - Add user
+ - Add User
{% endblock %}
diff --git a/app/grandchallenge/archives/templates/archives/archivepermissionrequest_form.html b/app/grandchallenge/archives/templates/archives/archivepermissionrequest_form.html
index 1d72cc732..9c5af98c6 100644
--- a/app/grandchallenge/archives/templates/archives/archivepermissionrequest_form.html
+++ b/app/grandchallenge/archives/templates/archives/archivepermissionrequest_form.html
@@ -4,12 +4,10 @@
{% load guardian_tags %}
{% block title %}
- {% get_obj_perms request.user for archive as "archive_perms" %}
- {% if "change_archive" in archive_perms %}Review access request{% else %}Request access{% endif %} - {{ archive.title }} - {{ block.super }}
+ {{ permission_request|yesno:"Access Request,Request Access" }} - {{ archive.title }} - {{ block.super }}
{% endblock %}
{% block breadcrumbs %}
- {% get_obj_perms request.user for archive as "archive_perms" %}
- Archives
@@ -18,11 +16,7 @@
-
- {% if "change_archive" in archive_perms %}
- Review access request
- {% else %}
- Request access
- {% endif %}
+ {{ permission_request|yesno:"Access Request,Request Access" }}
{% endblock %}
diff --git a/app/grandchallenge/archives/templates/archives/archivepermissionrequest_list.html b/app/grandchallenge/archives/templates/archives/archivepermissionrequest_list.html
index a96b8a0c3..2f42d7d97 100644
--- a/app/grandchallenge/archives/templates/archives/archivepermissionrequest_list.html
+++ b/app/grandchallenge/archives/templates/archives/archivepermissionrequest_list.html
@@ -16,7 +16,7 @@
{{ archive.title }}
Permission requests
+ aria-current="page">Permission Requests
{% endblock %}