Merge pull request #2321 from laws-africa/breadcrumbs

tweaks to provision chooser page
laws-africa · Jan 10, 2025 · abd96e3 · abd96e3
2 parents aac2c66 + 4281146
commit abd96e3
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 33 deletions.
diff --git a/indigo_app/templates/indigo_api/document/_provisions.html b/indigo_app/templates/indigo_api/document/_provisions.html
@@ -3,14 +3,24 @@
 
 {% block title %}{% trans 'Choose provision' %} – {{ block.super }}{% endblock %}
 
+{% block main-header-title %}
+  <h5 class="main-header-title">
+    {{ document.title }} @ {{ document.expression_date|date:'Y-m-d' }} · {{ document.language.code }}
+    {% include 'indigo_api/_work_info_badges.html' %}
+  </h5>
+  {% if work.numbered_title %}<h6>{{ work.numbered_title }}</h6>{% endif %}
+{% endblock %}
+
+{% block work-header-nav-tabs %}{% endblock %}
+
 {% block work-content %}
-  <div class="col-8">
-    <la-table-of-contents-controller
-      items="{{ toc_json }}"
-      collapse-all-btn-classes="btn btn-sm btn-secondary"
-      expand-all-btn-classes="btn btn-sm btn-secondary"
-      title-filter-clear-btn-classes="btn btn-sm btn-secondary"
-      title-filter-input-classes="form-field"
-    ></la-table-of-contents-controller>
-  </div>
+  <h3 class="mb-3">{% trans "Choose a provision to edit" %}</h3>
+
+  <la-table-of-contents-controller
+    items="{{ toc_json }}"
+    collapse-all-btn-classes="btn btn-sm btn-secondary"
+    expand-all-btn-classes="btn btn-sm btn-secondary"
+    title-filter-clear-btn-classes="btn btn-sm btn-secondary"
+    title-filter-input-classes="form-field"
+  ></la-table-of-contents-controller>
 {% endblock %}
diff --git a/indigo_app/templates/indigo_api/document/show.html b/indigo_app/templates/indigo_api/document/show.html
@@ -162,7 +162,7 @@ <h5 class="main-header-title">
       <div class="dropdown-menu">
         {{#each expressions}}
         {{#each documents}}
-        <a class="dropdown-item {{#if current}}disabled{{/if}}" href="/documents/{{ id }}">
+        <a class="dropdown-item {{#if current}}disabled{{/if}}" href="/documents/{{ id }}{% endverbatim %}{% if provision_eid %}/{{ provision_eid }}{% endif %}{% verbatim %}">
           {{ ../date }}
           · {{ language }}
           {{#if current}} – {% endverbatim %}{% trans 'this document' %}{% verbatim %}{{/if}}
@@ -174,5 +174,8 @@ <h5 class="main-header-title">
       </div>
     </li>
     {% endverbatim %}
+    {% if provision_eid %}
+      <li class="breadcrumb-item"><a href="{% url 'choose_document_provision' document.pk %}">{{ provision_eid }}</a></li>
+    {% endif %}
   </script>
 {% endblock %}
diff --git a/indigo_app/templates/indigo_api/work_layout.html b/indigo_app/templates/indigo_api/work_layout.html
@@ -30,29 +30,31 @@ <h5 class="main-header-title">
       {% endblock %}
 
       {% if work.pk %}
-        <nav class="nav nav-tabs mt-4">
-          {% block work-header-tabs %}
-            <a class="nav-item nav-link {% if view.tab == 'overview' %}active{% endif %}" href="{% url 'work' frbr_uri=work.frbr_uri %}">
-              <i class="fas fa-fw fa-book"></i> {% trans 'Overview' %}
-            </a>
-            <a class="nav-item nav-link {% if view.tab == 'amendments' %}active{% endif %}" href="{% url 'work_amendments' frbr_uri=work.frbr_uri %}">
-              <i class="fas fa-fw fa-clock"></i> {% trans 'Points in time' %}
-            </a>
-            <a class="nav-item nav-link {% if view.tab == 'commencements' %}active{% endif %}" href="{% url 'work_commencements' frbr_uri=work.frbr_uri %}">
-              <i class="fas fa-fw fa-rocket fa-rotate-315"></i> {% trans 'Commencements' %}
-            </a>
-            <a class="nav-item nav-link {% if view.tab == 'tasks' %}active{% endif %}" href="{% url 'work_tasks' frbr_uri=work.frbr_uri %}">
-              <i class="fas fa-fw fa-thumbtack"></i> {% trans 'Tasks' %}
-              <span class="badge text-bg-light">{{ work.tasks.unclosed.count }}</span>
-            </a>
-            <a class="nav-item nav-link {% if view.tab == 'related' %}active{% endif %}" href="{% url 'work_related' frbr_uri=work.frbr_uri %}">
-              <i class="fas fa-fw fa-sitemap"></i> {% trans 'Related works' %}
-            </a>
-            <a class="nav-item nav-link {% if view.tab == 'versions' %}active{% endif %}" href="{% url 'work_versions' frbr_uri=work.frbr_uri %}">
-              <i class="fas fa-fw fa-history"></i> {% trans 'Changes' %}
-            </a>
-          {% endblock %}
-        </nav>
+        {% block work-header-nav-tabs %}
+          <nav class="nav nav-tabs mt-4">
+            {% block work-header-tabs %}
+              <a class="nav-item nav-link {% if view.tab == 'overview' %}active{% endif %}" href="{% url 'work' frbr_uri=work.frbr_uri %}">
+                <i class="fas fa-fw fa-book"></i> {% trans 'Overview' %}
+              </a>
+              <a class="nav-item nav-link {% if view.tab == 'amendments' %}active{% endif %}" href="{% url 'work_amendments' frbr_uri=work.frbr_uri %}">
+                <i class="fas fa-fw fa-clock"></i> {% trans 'Points in time' %}
+              </a>
+              <a class="nav-item nav-link {% if view.tab == 'commencements' %}active{% endif %}" href="{% url 'work_commencements' frbr_uri=work.frbr_uri %}">
+                <i class="fas fa-fw fa-rocket fa-rotate-315"></i> {% trans 'Commencements' %}
+              </a>
+              <a class="nav-item nav-link {% if view.tab == 'tasks' %}active{% endif %}" href="{% url 'work_tasks' frbr_uri=work.frbr_uri %}">
+                <i class="fas fa-fw fa-thumbtack"></i> {% trans 'Tasks' %}
+                <span class="badge text-bg-light">{{ work.tasks.unclosed.count }}</span>
+              </a>
+              <a class="nav-item nav-link {% if view.tab == 'related' %}active{% endif %}" href="{% url 'work_related' frbr_uri=work.frbr_uri %}">
+                <i class="fas fa-fw fa-sitemap"></i> {% trans 'Related works' %}
+              </a>
+              <a class="nav-item nav-link {% if view.tab == 'versions' %}active{% endif %}" href="{% url 'work_versions' frbr_uri=work.frbr_uri %}">
+                <i class="fas fa-fw fa-history"></i> {% trans 'Changes' %}
+              </a>
+            {% endblock %}
+          </nav>
+        {% endblock %}
       {% endif %}
     </div>
   </header>