Skip to content

Commit

Permalink
By-laws on LawLibrary
Browse files Browse the repository at this point in the history
  • Loading branch information
nickmwangemi committed Aug 11, 2023
1 parent 004ce8c commit aef75d1
Show file tree
Hide file tree
Showing 6 changed files with 110 additions and 0 deletions.
23 changes: 23 additions & 0 deletions lawlibrary/templates/liiweb/municipal_legislation.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{% extends "peachjam/layouts/main.html" %}
{% load i18n %}
{% block title %}{{ locality_legislation_title }}{% endblock %}
{% block page-content %}
<section class="pb-5">
<div class="container">
<h1 class="my-4">{{ locality_legislation_title }}</h1>
<div class="row">
{% for group in municipality_groups %}
<div class="col-lg">
<ul class="list-unstyled mb-0">
{% for municipality in group %}
<li>
<a href="{% url 'municipal_by_laws' municipality.code %}">{{ municipality.name }}</a>
</li>
{% endfor %}
</ul>
</div>
{% endfor %}
</div>
</div>
</section>
{% endblock %}
34 changes: 34 additions & 0 deletions lawlibrary/templates/open_by_laws/municipal_by_laws_list.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{% extends "liiweb/legislation_list.html" %}
{% load i18n %}
{% block title %}
{% blocktrans with locality=locality.name %}{{ locality }} By-laws{% endblocktrans %}
{% endblock %}
{% block breadcrumbs %}
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item">
<a href="{% url 'municipal_legislation' %}">{% trans 'Municipal By-laws' %}</a>
</li>
<li class="breadcrumb-item active" aria-current="page">{{ locality }}</li>
</ol>
</nav>
{% endblock %}
{% block page-heading %}
<h1 class="my-4">{% blocktrans with locality=locality.name %}{{ locality }} By-laws{% endblocktrans %}</h1>
{% endblock %}
{% block legislation-nav %}
<nav class="nav nav-tabs mb-3 border-bottom">
<li class="nav-item">
<a class="nav-link {% if view.variant == 'current' %}active{% endif %}"
href="{% url 'municipal_by_laws' locality.code %}">Current legislation</a>
</li>
<li class="nav-item">
<a class="nav-link {% if view.variant == 'repealed' %}active{% endif %}"
href="{% url 'municipal_by_laws_legislation_list_repealed' locality.code %}">Repealed legislation</a>
</li>
<li class="nav-item">
<a class="nav-link {% if view.variant == 'all' %}active{% endif %}"
href="{% url 'municipal_by_laws_legislation_list_all' locality.code %}">All legislation</a>
</li>
</nav>
{% endblock %}
6 changes: 6 additions & 0 deletions lawlibrary/templates/peachjam/_header.html
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}">
Expand Down
21 changes: 21 additions & 0 deletions lawlibrary/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from lawlibrary import views
from liiweb.views import LocalityLegislationListView
from open_by_laws.views import MunicipalByLawsView

urlpatterns = [
path("", views.HomePageView.as_view(), name="home_page"),
Expand Down Expand Up @@ -41,5 +42,25 @@
LocalityLegislationListView.as_view(variant="all"),
name="locality_legislation_list_all",
),
path(
"legislation/municipal",
views.MunicipalLegislationView.as_view(),
name="municipal_legislation",
),
path(
"bylaws/<str:code>",
MunicipalByLawsView.as_view(),
name="municipal_by_laws",
),
path(
"bylaws/<str:code>/repealed",
MunicipalByLawsView.as_view(variant="repealed"),
name="municipal_by_laws_legislation_list_repealed",
),
path(
"bylaws/<str:code>/all",
MunicipalByLawsView.as_view(variant="all"),
name="municipal_by_laws_legislation_list_all",
),
path("", include("liiweb.urls")),
]
15 changes: 15 additions & 0 deletions lawlibrary/views/legislation.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from liiweb.views import LegislationListView as BaseLegislationListView
from liiweb.views import LocalityLegislationView as BaseLocalityLegislationView
from peachjam.helpers import chunks
from peachjam.models import Locality


class LegislationListView(BaseLegislationListView):
Expand All @@ -12,3 +14,16 @@ def get_context_data(self, **kwargs):
return super().get_context_data(
locality_legislation_title="Provincial Legislation", **kwargs
)


class MunicipalLegislationView(BaseLocalityLegislationView):
navbar_link = "legislation/municipal"
template_name = "liiweb/municipal_legislation.html"

def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["locality_legislation_title"] = "Municipal By-laws"
codes = "cpt eth jhb wc015 wc041 wc023 wc013 wc033 wc012 ec443 wc011".split()
municipalities = Locality.objects.filter(code__in=codes)
context["municipality_groups"] = list(chunks(municipalities, 2))
return context
11 changes: 11 additions & 0 deletions open_by_laws/views/by_laws.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
from django.shortcuts import get_object_or_404

from liiweb.views.legislation import LocalityLegislationListView
from peachjam.models import Locality


class MunicipalByLawsView(LocalityLegislationListView):
template_name = "open_by_laws/municipal_by_laws_list.html"
navbar_link = "legislation/municipal"

def get(self, *args, **kwargs):
self.municipality = get_object_or_404(Locality, code=kwargs["code"])
return super().get(*args, **kwargs)

def get_context_data(self, **kwargs):
return super().get_context_data(municipality=self.municipality, **kwargs)

0 comments on commit aef75d1

Please sign in to comment.