By-laws on LawLibrary

lawlibrary/constants.py

@@ -0,0 +1 @@
+PROVINCIAL_CODES = ["ec", "fs", "gp", "lp", "mp", "nc", "nw", "wc", "kzn", "transvaal"]

lawlibrary/context_processors.py

@@ -0,0 +1,10 @@
+from lawlibrary.constants import PROVINCIAL_CODES
+
+
+def lawlibrary(request):
+    """
+    Add some useful context to templates.
+    """
+    return {
+        "PROVINCIAL_CODES": PROVINCIAL_CODES,
+    }

lawlibrary/settings.py

@@ -7,3 +7,8 @@
 JAZZMIN_SETTINGS["site_title"] = "Lawlibrary"  # noqa
 JAZZMIN_SETTINGS["site_header"] = "Lawlibrary"  # noqa
 JAZZMIN_SETTINGS["site_brand"] = "Lawlibrary.org.za"  # noqa
+
+
+TEMPLATES[0]["OPTIONS"]["context_processors"].append(  # noqa
+    "lawlibrary.context_processors.lawlibrary"
+)

lawlibrary/templates/peachjam/_header.html

@@ -27,6 +27,12 @@
       {% trans 'Provincial Legislation' %}
     </a>
   </li>
+  <li class="nav-item">
+    <a class="nav-link {% if view.navbar_link == 'legislation/municipal' %}active{% endif %}"
+       href="{% url 'municipal_legislation' %}">
+      {% trans 'Municipal By-laws' %}
+    </a>
+  </li>
   <li class="nav-item">
     <a class="nav-link {% if view.navbar_link == 'gazettes' %}active{% endif %}"
        href="{% url 'gazettes' %}">

lawlibrary/templates/peachjam/legislation_detail.html

@@ -4,9 +4,15 @@
   <nav aria-label="breadcrumb">
     {% if document.locality %}
       <ol class="breadcrumb">
-        <li class="breadcrumb-item">
-          <a href="{% url 'locality_legislation' %}">{% trans 'Provincial Legislation' %}</a>
-        </li>
+        {% if document.locality.code in PROVINCIAL_CODES %}
+          <li class="breadcrumb-item">
+            <a href="{% url 'locality_legislation' %}">{% trans 'Provincial Legislation' %}</a>
+          </li>
+        {% else %}
+          <li class="breadcrumb-item">
+            <a href="{% url 'municipal_legislation' %}">{% trans 'Municipal By-laws' %}</a>
+          </li>
+        {% endif %}
         <li class="breadcrumb-item">
           <a href="{% url 'locality_legislation_list' document.locality.code %}">{{ document.locality.name }}</a>
         </li>

lawlibrary/urls.py

@@ -1,14 +1,13 @@
 from django.urls import include, path
 
 from lawlibrary import views
-from liiweb.views import LocalityLegislationListView
 
 urlpatterns = [
     path("", views.HomePageView.as_view(), name="home_page"),
     path("legislation/", views.LegislationListView.as_view(), name="legislation_list"),
     path(
         "legislation/provincial",
-        views.LocalityLegislationView.as_view(),
+        views.LocalityLegislationView.as_view(variant="provincial"),
         name="locality_legislation",
     ),
     path(
@@ -23,23 +22,28 @@
     ),
     path(
         "legislation/<str:code>/",
-        LocalityLegislationListView.as_view(),
+        views.LocalityLegislationListView.as_view(),
         name="locality_legislation_list",
     ),
     path(
         "legislation/<str:code>/repealed",
-        LocalityLegislationListView.as_view(variant="repealed"),
+        views.LocalityLegislationListView.as_view(variant="repealed"),
         name="locality_legislation_list_repealed",
     ),
     path(
         "legislation/<str:code>/subsidiary",
-        LocalityLegislationListView.as_view(variant="subleg"),
+        views.LocalityLegislationListView.as_view(variant="subleg"),
         name="locality_legislation_list_subsidiary",
     ),
     path(
         "legislation/<str:code>/all",
-        LocalityLegislationListView.as_view(variant="all"),
+        views.LocalityLegislationListView.as_view(variant="all"),
         name="locality_legislation_list_all",
     ),
+    path(
+        "legislation/municipal",
+        views.LocalityLegislationView.as_view(variant="municipal"),
+        name="municipal_legislation",
+    ),
     path("", include("liiweb.urls")),
 ]

lawlibrary/views/legislation.py

@@ -1,5 +1,11 @@
+from django.utils.translation import gettext_lazy as _
+
+from lawlibrary.constants import PROVINCIAL_CODES
 from liiweb.views import LegislationListView as BaseLegislationListView
+from liiweb.views import LocalityLegislationListView as BaseLocalityLegislationListView
 from liiweb.views import LocalityLegislationView as BaseLocalityLegislationView
+from peachjam.helpers import chunks
+from peachjam.models import Locality
 
 
 class LegislationListView(BaseLegislationListView):
@@ -8,7 +14,42 @@ def get_queryset(self):
 
 
 class LocalityLegislationView(BaseLocalityLegislationView):
+    variant = None
+
     def get_context_data(self, **kwargs):
-        return super().get_context_data(
-            locality_legislation_title="Provincial Legislation", **kwargs
-        )
+        context = super().get_context_data(**kwargs)
+
+        if self.variant == "provincial":
+            context["locality_legislation_title"] = "Provincial Legislation"
+            localities = Locality.objects.filter(code__in=PROVINCIAL_CODES)
+            context["locality_groups"] = list(chunks(localities, 2))
+
+        if self.variant == "municipal":
+            context["locality_legislation_title"] = "Municipal By-laws"
+            localities = Locality.objects.exclude(code__in=PROVINCIAL_CODES)
+            context["locality_groups"] = list(chunks(localities, 2))
+            self.navbar_link = "legislation/municipal"
+
+        return context
+
+
+class LocalityLegislationListView(BaseLocalityLegislationListView):
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        context["locality"] = self.locality
+
+        if self.locality.code in PROVINCIAL_CODES:
+            context["locality_legislation_title"] = "Provincial Legislation"
+            context["page_heading"] = _(
+                "%(locality)s Legislation" % {"locality": self.locality}
+            )
+            context["show_subleg"] = True
+        else:
+            context["locality_legislation_title"] = "Municipal By-laws"
+            context["page_heading"] = _(
+                "%(locality)s By-laws" % {"locality": self.locality}
+            )
+            self.navbar_link = "legislation/municipal"
+
+        return context

liiweb/templates/liiweb/locality_legislation.html

@@ -6,7 +6,7 @@
     <div class="container">
       <h1 class="my-4">{{ locality_legislation_title }}</h1>
       <div class="row">
-        {% for group in province_groups %}
+        {% for group in locality_groups %}
           <div class="col-lg">
             <ul class="list-unstyled mb-0">
               {% for locality in group %}

liiweb/templates/liiweb/locality_legislation_list.html

@@ -7,11 +7,12 @@
       <li class="breadcrumb-item">
         <a href="{% url 'locality_legislation' %}">{{ locality_legislation_title }}</a>
       </li>
+      <li class="breadcrumb-item active" aria-current="page">{{ locality.name }}</li>
     </ol>
   </nav>
 {% endblock %}
 {% block page-heading %}
-  <h1 class="my-4">{% blocktrans with locality=locality.name %}{{ locality }} Legislation{% endblocktrans %}</h1>
+  <h1 class="my-4">{{ page_heading }}</h1>
   {% include 'lawlibrary/_legislation_alert.html' %}
 {% endblock %}
 {% block legislation-nav %}
@@ -24,10 +25,12 @@ <h1 class="my-4">{% blocktrans with locality=locality.name %}{{ locality }} Legi
       <a class="nav-link {% if view.variant == 'repealed' %}active{% endif %}"
          href="{% url 'locality_legislation_list_repealed' locality.code %}">Repealed legislation</a>
     </li>
-    <li class="nav-item">
-      <a class="nav-link {% if view.variant == 'subleg' %}active{% endif %}"
-         href="{% url 'locality_legislation_list_subsidiary' locality.code %}">{{ PEACHJAM_SETTINGS.subleg_label }}</a>
-    </li>
+    {% if show_subleg %}
+      <li class="nav-item">
+        <a class="nav-link {% if view.variant == 'subleg' %}active{% endif %}"
+           href="{% url 'locality_legislation_list_subsidiary' locality.code %}">{{ PEACHJAM_SETTINGS.subleg_label }}</a>
+      </li>
+    {% endif %}
     <li class="nav-item">
       <a class="nav-link {% if view.variant == 'all' %}active{% endif %}"
          href="{% url 'locality_legislation_list_all' locality.code %}">All legislation</a>

liiweb/views/legislation.py

@@ -1,6 +1,7 @@
 from collections import defaultdict
 
 from django.shortcuts import get_object_or_404
+from django.utils.translation import gettext_lazy as _
 from django.views.generic import TemplateView
 
 from peachjam.helpers import chunks, get_language
@@ -76,7 +77,7 @@ class LocalityLegislationView(TemplateView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         localities = Locality.objects.all()
-        context["province_groups"] = list(chunks(localities, 2))
+        context["locality_groups"] = list(chunks(localities, 2))
         return context
 
 
@@ -95,5 +96,6 @@ def get_context_data(self, **kwargs):
         return super().get_context_data(
             locality=self.locality,
             locality_legislation_title="Provincial Legislation",
-            **kwargs
+            page_heading=_("%(locality)s Legislation" % {"locality": self.locality}),
+            **kwargs,
         )