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

Jump to bottom

Correct html titles for archives app #3625

Merged
merged 2 commits into from
Oct 21, 2024
Merged

Correct html titles for archives app #3625

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
17c447e
Update titles
ammar257ammar Oct 16, 2024
5eb909f
Update archive form template title
ammar257ammar Oct 16, 2024
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
4 changes: 2 additions & 2 deletions app/grandchallenge/archives/templates/archives/archive_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand All @@ -14,7 +14,7 @@
<li class="breadcrumb-item"><a href="{{ object.get_absolute_url }}">{{ object.title }}</a></li>
{% endif %}
<li class="breadcrumb-item active"
aria-current="page">{% if object %}Update{% else %}New{% endif %} Archive
aria-current="page">{{ object|yesno:"Update,Create Archive" }}
</li>
</ol>
{% endblock %}
Expand Down
4 changes: 2 additions & 2 deletions app/grandchallenge/archives/templates/archives/archive_item_job_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% load meta_attr %}

{% block title %}
Jobs - {{ object.pk }} - {{ block.super }}
Results - {{ object.pk }} - {{ block.super }}
{% endblock %}

{% block breadcrumbs %}
Expand All @@ -11,7 +11,7 @@
<li class="breadcrumb-item"><a href="{{ object.base_object.get_absolute_url }}">{{ object.base_object }}</a></li>
<li class="breadcrumb-item"><a href="{{ object.base_object.civ_sets_list_url }}">{{ object.base_object.civ_set_model|verbose_name_plural|title }}</a></li>
<li class="breadcrumb-item"><a href="{{ object.get_absolute_url}}">{{ object.pk }}</a></li>
<li class="breadcrumb-item active" aria-current="page">Jobs</li>
<li class="breadcrumb-item active" aria-current="page">Results</li>
</ol>
{% endblock %}

Expand Down
4 changes: 2 additions & 2 deletions app/grandchallenge/archives/templates/archives/archive_user_groups_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
{% load url %}

{% block title %}
Add user - {{ object.title }} - {{ block.super }}
Add User - {{ object.title }} - {{ block.super }}
{% endblock %}

{% block breadcrumbs %}
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'archives:list' %}">Archives</a></li>
<li class="breadcrumb-item"><a href="{{ object.get_absolute_url }}">{{ object.title }}</a></li>
<li class="breadcrumb-item active" aria-current="page">Add user</li>
<li class="breadcrumb-item active" aria-current="page">Add User</li>
</ol>
{% endblock %}
10 changes: 2 additions & 8 deletions app/grandchallenge/archives/templates/archives/archivepermissionrequest_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" %}
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'archives:list' %}">Archives</a>
</li>
Expand All @@ -18,11 +16,7 @@
</a></li>
<li class="breadcrumb-item active"
aria-current="page">
{% if "change_archive" in archive_perms %}
Review access request
{% else %}
Request access
{% endif %}
{{ permission_request|yesno:"Access Request,Request Access" }}
</li>
</ol>
{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion app/grandchallenge/archives/templates/archives/archivepermissionrequest_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<li class="breadcrumb-item"><a
href="{{ archive.get_absolute_url }}">{{ archive.title }}</a></li>
<li class="breadcrumb-item active"
aria-current="page">Permission requests
aria-current="page">Permission Requests
</li>
</ol>
{% endblock %}
Expand Down