Paginated legislation listing

africanlii/templates/africanlii/au_detail_page.html

@@ -9,7 +9,7 @@
       {% block breadcrumbs %}{% endblock %}
       {% block page-heading %}
         <h1 class="my-4">{% trans 'African Union (AU)' %}</h1>
-        {% include "peachjam/_help_button.html" with link="african-union-documents-au" %}
+        {% include "peachjam/_help_button.html" with help_link="african-union-documents-au" %}
       {% endblock %}
       <p>
         {% blocktrans trimmed %}

africanlii/templates/africanlii/au_institution_detail.html

@@ -25,15 +25,11 @@
     {% endif %}
   {% endwith %}
 {% endblock %}
+{% block page-title %}<h1 class="mt-4">{{ obj }}</h1>{% endblock %}
 {% block page-header %}
-  <h1 class="mt-4">{{ obj }}</h1>
-  {% include 'peachjam/_document_count.html' %}
+  {{ block.super }}
   {% include 'peachjam/_years_list.html' with showallyears=True %}
 {% endblock %}
 {% block content %}
-  {% if documents %}
-    {% include 'peachjam/_document_table.html' %}
-  {% else %}
-    <p>{% trans 'No documents found.' %}</p>
-  {% endif %}
+  {% include 'peachjam/_document_table.html' %}
 {% endblock %}

africanlii/templates/africanlii/au_organ_detail.html

@@ -1,6 +1,5 @@
-{% extends 'peachjam/layouts/document_list.html' %}
+{% extends 'africanlii/au_institution_detail.html' %}
 {% load i18n %}
-{% block title %}{{ author }}{% endblock %}
 {% block breadcrumbs %}
   <div class="container">
     <nav aria-label="breadcrumb">
@@ -25,15 +24,3 @@
     {% endif %}
   {% endwith %}
 {% endblock %}
-{% block page-header %}
-  <h1 class="mt-4">{{ obj }}</h1>
-  {% include 'peachjam/_document_count.html' %}
-  {% include 'peachjam/_years_list.html' with showallyears=True %}
-{% endblock %}
-{% block content %}
-  {% if documents %}
-    {% include 'peachjam/_document_table.html' %}
-  {% else %}
-    <p>{% trans 'No documents found.' %}</p>
-  {% endif %}
-{% endblock %}

africanlii/templates/africanlii/member_state_detail.html

@@ -1,4 +1,4 @@
-{% extends 'peachjam/layouts/document_list.html' %}
+{% extends 'africanlii/au_institution_detail.html' %}
 {% load i18n %}
 {% block title %}{{ member_state }}{% endblock %}
 {% block breadcrumbs %}
@@ -25,10 +25,10 @@
     {% endif %}
   {% endwith %}
 {% endblock %}
+{% block page-title %}<h1 class="mt-4">{{ member_state }}</h1>{% endblock %}
 {% block page-header %}
-  <h1 class="mt-4">{{ member_state }}</h1>
-  {% include 'africanlii/_lii_info.html' %}
-  {% include 'peachjam/_document_count.html' %}
+  {{ block.super }}
+  <div class="mb-3">{% include 'africanlii/_lii_info.html' %}</div>
 {% endblock %}
 {% block page-list-facets %}{% endblock %}
 {% block content %}

africanlii/templates/africanlii/regional_economic_community_detail.html

@@ -1,4 +1,4 @@
-{% extends 'peachjam/layouts/document_list.html' %}
+{% extends 'africanlii/au_institution_detail.html' %}
 {% load i18n %}
 {% block title %}{{ rec }}{% endblock %}
 {% block breadcrumbs %}
@@ -25,16 +25,8 @@
     {% endif %}
   {% endwith %}
 {% endblock %}
+{% block page-title %}<h1 class="mt-4">{{ rec }}</h1>{% endblock %}
 {% block page-header %}
-  <h1 class="mt-4">{{ rec }}</h1>
-  {% include 'peachjam/_document_count.html' %}
+  {{ block.super }}
   {% include 'peachjam/_years_list.html' with showallyears=True %}
 {% endblock %}
-{% block content %}
-  {% if documents %}
-    {% include 'peachjam/_judgment_table.html' %}
-    {% include 'peachjam/_pagination.html' %}
-  {% else %}
-    <p>{% trans 'No documents found.' %}</p>
-  {% endif %}
-{% endblock %}

africanlii/templates/peachjam/reports_guides_list.html

@@ -5,5 +5,4 @@
 {% endblock %}
 {% block page-title %}
   <h1 class="mt-4">{% trans 'Reports and Guides' %}</h1>
-  {% include 'peachjam/_document_count.html' %}
 {% endblock %}

africanlii/views/au.py

@@ -46,6 +46,7 @@ class RegionalEconomicCommunityDetailView(PlaceDetailView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
+        context["doc_table_show_jurisdiction"] = False
         context["rec"] = get_object_or_404(
             RegionalEconomicCommunity, locality=self.locality
         )

lawlibrary/templates/liiweb/legislation_list.html

@@ -1,9 +1,9 @@
 {% extends "liiweb/legislation_list.html" %}
 {% load i18n %}
-{% block page-heading %}
+{% block page-title %}
   <h1 class="my-4">{% trans 'National Legislation' %}</h1>
 {% endblock %}
-{% block legislation-nav %}
+{% block nav-tabs %}
   {% include 'lawlibrary/_legislation_alert.html' %}
   {{ block.super }}
 {% endblock %}

lawlibrary/views/legislation.py

@@ -10,8 +10,8 @@
 
 
 class LegislationListView(BaseLegislationListView):
-    def get_queryset(self):
-        return super().get_queryset().filter(locality=None)
+    def get_base_queryset(self):
+        return super().get_base_queryset().filter(locality=None)
 
 
 class LocalityLegislationView(BaseLocalityLegislationView):

liiweb/templates/liiweb/home.html

@@ -43,7 +43,7 @@
             </form>
             <div class="d-flex">
               <a class="me-4" href="{% url 'search:search' %}?show-advanced-tab=1">{% trans 'Advanced search' %}</a>
-              {% include "peachjam/_help_button.html" with link="search" %}
+              {% include "peachjam/_help_button.html" with help_link="search" %}
             </div>
           </div>
         </div>

liiweb/templates/liiweb/legislation_list.html

@@ -1,97 +1,56 @@
-{% extends "peachjam/layouts/main.html" %}
+{% extends 'peachjam/layouts/document_list.html' %}
 {% load i18n %}
 {% block title %}
   {% trans 'Legislation' %}
 {% endblock %}
-{% block page-content %}
-  {% block breadcrumbs %}{% endblock %}
-  {% block entity-profile %}
-    {% if entity_profile %}
-      <div class="mt-3">{% include 'peachjam/_entity_profile.html' %}</div>
-    {% endif %}
-  {% endblock %}
-  <section class="pb-5">
-    <div class="container">
-      {% block page-heading %}
-        <h1 class="my-4">{% trans 'Legislation' %}</h1>
-        {% include "peachjam/_help_button.html" with link="legislation/" %}
-      {% endblock %}
-      {% block legislation-nav %}
-        <nav class="nav nav-tabs scroll-xs mb-3 border-bottom">
-          <li class="nav-item">
-            <a class="nav-link {% if view.variant == 'current' %}active{% endif %}"
-               href="{% url 'legislation_list' %}">
-              {% block current_tab_title %}
-                {% trans 'Current legislation' %}
-              {% endblock %}
-            </a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link {% if view.variant == 'recent' %}active{% endif %}"
-               href="{% url 'legislation_list_recent' %}">
-              {% block recent_tab_title %}
-                {% trans 'Recent legislation' %}
-              {% endblock %}
-            </a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link {% if view.variant == 'subleg' %}active{% endif %}"
-               href="{% url 'legislation_list_subsidiary' %}">
-              {% block sublegislation_tab_title %}{{ PEACHJAM_SETTINGS.subleg_label }}{% endblock %}
-            </a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link {% if view.variant == 'uncommenced' %}active{% endif %}"
-               href="{% url 'legislation_list_uncommenced' %}">
-              {% block uncommenced_tab_title %}
-                {% trans 'Uncommenced legislation' %}
-              {% endblock %}
-            </a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link {% if view.variant == 'repealed' %}active{% endif %}"
-               href="{% url 'legislation_list_repealed' %}">
-              {% block repealed_tab_title %}
-                {% trans 'Repealed legislation' %}
-              {% endblock %}
-            </a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link {% if view.variant == 'all' %}active{% endif %}"
-               href="{% url 'legislation_list_all' %}">
-              {% trans 'All legislation' %}
-            </a>
-          </li>
-        </nav>
-      {% endblock %}
-      {% if view.variant == 'repealed' %}
-        <div class="alert alert-danger">{% trans 'You are viewing repealed legislation which is no longer in force.' %}</div>
-      {% endif %}
-      <div data-vue-component="LegislationTable"
-           data-initial-sort="{{ legislation_list_sort }}"
-           {% if not doc_table_citations %}data-hide-citations="true"{% endif %}>
-        {% comment %}
-        This ensures that peachjam has links to scrape. This content is replaced when the javacript LegislationTable
-        component runs.
-        {% endcomment %}
-        <ul>
-          {% for item in legislation_table %}
-            <li>
-              <a href="{{ item.work_frbr_uri }}">{{ item.title }}</a>
-              {% if item.children %}
-                <ul>
-                  {% for kid in item.children %}
-                    <li>
-                      <a href="{{ kid.work_frbr_uri }}">{{ kid.title }}</a>
-                    </li>
-                  {% endfor %}
-                </ul>
-              {% endif %}
-            </li>
-          {% endfor %}
-        </ul>
-      </div>
-      {{ legislation_table|json_script:"legislation-table" }}
-    </div>
-  </section>
+{% block page-title %}
+  <h1 class="my-4">{% trans 'Legislation' %}</h1>
+{% endblock %}
+{% block nav-tabs %}
+  <nav class="nav nav-tabs scroll-xs mb-3 border-bottom">
+    <li class="nav-item">
+      <a class="nav-link {% if view.variant == 'current' %}active{% endif %}"
+         href="{% url 'legislation_list' %}">
+        {% block current_tab_title %}
+          {% trans 'Current legislation' %}
+        {% endblock %}
+      </a>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link {% if view.variant == 'recent' %}active{% endif %}"
+         href="{% url 'legislation_list_recent' %}">
+        {% block recent_tab_title %}
+          {% trans 'Recent legislation' %}
+        {% endblock %}
+      </a>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link {% if view.variant == 'subleg' %}active{% endif %}"
+         href="{% url 'legislation_list_subsidiary' %}">
+        {% block sublegislation_tab_title %}{{ PEACHJAM_SETTINGS.subleg_label }}{% endblock %}
+      </a>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link {% if view.variant == 'uncommenced' %}active{% endif %}"
+         href="{% url 'legislation_list_uncommenced' %}">
+        {% block uncommenced_tab_title %}
+          {% trans 'Uncommenced legislation' %}
+        {% endblock %}
+      </a>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link {% if view.variant == 'repealed' %}active{% endif %}"
+         href="{% url 'legislation_list_repealed' %}">
+        {% block repealed_tab_title %}
+          {% trans 'Repealed legislation' %}
+        {% endblock %}
+      </a>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link {% if view.variant == 'all' %}active{% endif %}"
+         href="{% url 'legislation_list_all' %}">
+        {% trans 'All legislation' %}
+      </a>
+    </li>
+  </nav>
 {% endblock %}

liiweb/templates/liiweb/pocketlaw.html

@@ -22,7 +22,7 @@ <h2 class="display-5">Your offline {{ APP_NAME }} companion.</h2>
         <div class="row">
           <div class="col-md-6 mb-3">
             <h3>Get started with Pocket Law</h3>
-            {% include "peachjam/_help_button.html" with link="pocket-law" %}
+            {% include "peachjam/_help_button.html" with help_link="pocket-law" %}
             <ol class="lead">
               <li>Download Pocket Law {{ APP_NAME }}.</li>
               <li>Double-click the application to start the installation.</li>