Skip to content

Commit abd96e3

Browse files
longhotsummerlonghotsummer
authored
Merge pull request #2321 from laws-africa/breadcrumbs
tweaks to provision chooser page
2 parents aac2c66 + 4281146 commit abd96e3

File tree

3 files changed

+48
-33
lines changed

3 files changed

+48
-33
lines changed

‎indigo_app/templates/indigo_api/document/_provisions.html

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,24 @@
33

44
{% block title %}{% trans 'Choose provision' %} – {{ block.super }}{% endblock %}
55

6+
{% block main-header-title %}
7+
<h5 class="main-header-title">
8+
{{ document.title }} @ {{ document.expression_date|date:'Y-m-d' }} · {{ document.language.code }}
9+
{% include 'indigo_api/_work_info_badges.html' %}
10+
</h5>
11+
{% if work.numbered_title %}<h6>{{ work.numbered_title }}</h6>{% endif %}
12+
{% endblock %}
13+
14+
{% block work-header-nav-tabs %}{% endblock %}
15+
616
{% block work-content %}
7-
<div class="col-8">
8-
<la-table-of-contents-controller
9-
items="{{ toc_json }}"
10-
collapse-all-btn-classes="btn btn-sm btn-secondary"
11-
expand-all-btn-classes="btn btn-sm btn-secondary"
12-
title-filter-clear-btn-classes="btn btn-sm btn-secondary"
13-
title-filter-input-classes="form-field"
14-
></la-table-of-contents-controller>
15-
</div>
17+
<h3 class="mb-3">{% trans "Choose a provision to edit" %}</h3>
18+
19+
<la-table-of-contents-controller
20+
items="{{ toc_json }}"
21+
collapse-all-btn-classes="btn btn-sm btn-secondary"
22+
expand-all-btn-classes="btn btn-sm btn-secondary"
23+
title-filter-clear-btn-classes="btn btn-sm btn-secondary"
24+
title-filter-input-classes="form-field"
25+
></la-table-of-contents-controller>
1626
{% endblock %}

‎indigo_app/templates/indigo_api/document/show.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ <h5 class="main-header-title">
162162
<div class="dropdown-menu">
163163
{{#each expressions}}
164164
{{#each documents}}
165-
<a class="dropdown-item {{#if current}}disabled{{/if}}" href="/documents/{{ id }}">
165+
<a class="dropdown-item {{#if current}}disabled{{/if}}" href="/documents/{{ id }}{% endverbatim %}{% if provision_eid %}/{{ provision_eid }}{% endif %}{% verbatim %}">
166166
{{ ../date }}
167167
· {{ language }}
168168
{{#if current}} – {% endverbatim %}{% trans 'this document' %}{% verbatim %}{{/if}}
@@ -174,5 +174,8 @@ <h5 class="main-header-title">
174174
</div>
175175
</li>
176176
{% endverbatim %}
177+
{% if provision_eid %}
178+
<li class="breadcrumb-item"><a href="{% url 'choose_document_provision' document.pk %}">{{ provision_eid }}</a></li>
179+
{% endif %}
177180
</script>
178181
{% endblock %}

‎indigo_app/templates/indigo_api/work_layout.html

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,31 @@ <h5 class="main-header-title">
3030
{% endblock %}
3131

3232
{% if work.pk %}
33-
<nav class="nav nav-tabs mt-4">
34-
{% block work-header-tabs %}
35-
<a class="nav-item nav-link {% if view.tab == 'overview' %}active{% endif %}" href="{% url 'work' frbr_uri=work.frbr_uri %}">
36-
<i class="fas fa-fw fa-book"></i> {% trans 'Overview' %}
37-
</a>
38-
<a class="nav-item nav-link {% if view.tab == 'amendments' %}active{% endif %}" href="{% url 'work_amendments' frbr_uri=work.frbr_uri %}">
39-
<i class="fas fa-fw fa-clock"></i> {% trans 'Points in time' %}
40-
</a>
41-
<a class="nav-item nav-link {% if view.tab == 'commencements' %}active{% endif %}" href="{% url 'work_commencements' frbr_uri=work.frbr_uri %}">
42-
<i class="fas fa-fw fa-rocket fa-rotate-315"></i> {% trans 'Commencements' %}
43-
</a>
44-
<a class="nav-item nav-link {% if view.tab == 'tasks' %}active{% endif %}" href="{% url 'work_tasks' frbr_uri=work.frbr_uri %}">
45-
<i class="fas fa-fw fa-thumbtack"></i> {% trans 'Tasks' %}
46-
<span class="badge text-bg-light">{{ work.tasks.unclosed.count }}</span>
47-
</a>
48-
<a class="nav-item nav-link {% if view.tab == 'related' %}active{% endif %}" href="{% url 'work_related' frbr_uri=work.frbr_uri %}">
49-
<i class="fas fa-fw fa-sitemap"></i> {% trans 'Related works' %}
50-
</a>
51-
<a class="nav-item nav-link {% if view.tab == 'versions' %}active{% endif %}" href="{% url 'work_versions' frbr_uri=work.frbr_uri %}">
52-
<i class="fas fa-fw fa-history"></i> {% trans 'Changes' %}
53-
</a>
54-
{% endblock %}
55-
</nav>
33+
{% block work-header-nav-tabs %}
34+
<nav class="nav nav-tabs mt-4">
35+
{% block work-header-tabs %}
36+
<a class="nav-item nav-link {% if view.tab == 'overview' %}active{% endif %}" href="{% url 'work' frbr_uri=work.frbr_uri %}">
37+
<i class="fas fa-fw fa-book"></i> {% trans 'Overview' %}
38+
</a>
39+
<a class="nav-item nav-link {% if view.tab == 'amendments' %}active{% endif %}" href="{% url 'work_amendments' frbr_uri=work.frbr_uri %}">
40+
<i class="fas fa-fw fa-clock"></i> {% trans 'Points in time' %}
41+
</a>
42+
<a class="nav-item nav-link {% if view.tab == 'commencements' %}active{% endif %}" href="{% url 'work_commencements' frbr_uri=work.frbr_uri %}">
43+
<i class="fas fa-fw fa-rocket fa-rotate-315"></i> {% trans 'Commencements' %}
44+
</a>
45+
<a class="nav-item nav-link {% if view.tab == 'tasks' %}active{% endif %}" href="{% url 'work_tasks' frbr_uri=work.frbr_uri %}">
46+
<i class="fas fa-fw fa-thumbtack"></i> {% trans 'Tasks' %}
47+
<span class="badge text-bg-light">{{ work.tasks.unclosed.count }}</span>
48+
</a>
49+
<a class="nav-item nav-link {% if view.tab == 'related' %}active{% endif %}" href="{% url 'work_related' frbr_uri=work.frbr_uri %}">
50+
<i class="fas fa-fw fa-sitemap"></i> {% trans 'Related works' %}
51+
</a>
52+
<a class="nav-item nav-link {% if view.tab == 'versions' %}active{% endif %}" href="{% url 'work_versions' frbr_uri=work.frbr_uri %}">
53+
<i class="fas fa-fw fa-history"></i> {% trans 'Changes' %}
54+
</a>
55+
{% endblock %}
56+
</nav>
57+
{% endblock %}
5658
{% endif %}
5759
</div>
5860
</header>

0 commit comments

Comments
 (0)