diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b47ed918f..802def464 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -12,7 +12,7 @@ jobs: name: Deploy to africanlii.org runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -27,7 +27,7 @@ jobs: name: Deploy to lawlibrary runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -38,30 +38,13 @@ jobs: git_remote_url: 'ssh://dokku@liiweb2.africanlii.org:22/lawlibrary-peachjam' git_push_flags: '--force' - deploy-senlii: - if: ${{ always() }} - needs: deploy-eswatinilii - name: Deploy to senlii - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: git push to senlii.org - uses: dokku/github-action@master - with: - ssh_private_key: ${{ secrets.SSH_DEPLOYMENT_KEY }} - git_remote_url: 'ssh://dokku@liiweb2.africanlii.org:22/senlii-peachjam' - git_push_flags: '--force' - deploy-ulii: if: ${{ always() }} needs: deploy-agp name: Deploy to ulii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -78,7 +61,7 @@ jobs: name: Deploy to zanzibarlii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -93,7 +76,7 @@ jobs: name: Deploy to malawilii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -110,7 +93,7 @@ jobs: name: Deploy to ghalii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -127,7 +110,7 @@ jobs: name: Deploy to zambialii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -146,7 +129,7 @@ jobs: name: Deploy to namiblii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -164,7 +147,7 @@ jobs: name: Deploy to seylii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -182,7 +165,7 @@ jobs: name: Deploy to lesotholii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -200,7 +183,7 @@ jobs: name: Deploy to sierralii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -219,7 +202,7 @@ jobs: name: Deploy to zimlii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -237,7 +220,7 @@ jobs: name: Deploy to tcilii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -254,7 +237,7 @@ jobs: name: Deploy to tanzlii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -271,7 +254,7 @@ jobs: name: Deploy to eswatinilii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -288,7 +271,7 @@ jobs: name: Deploy to nigerialii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -305,7 +288,7 @@ jobs: name: Deploy to open-by-laws runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -316,13 +299,30 @@ jobs: git_remote_url: 'ssh://dokku@liiweb2.africanlii.org:22/open-by-laws' git_push_flags: '--force' + deploy-obl-microsites: + if: ${{ always() }} + needs: deploy-open-by-laws + name: Deploy to open by-laws microsites + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: git push to openbylaws.org.za + uses: dokku/github-action@master + with: + ssh_private_key: ${{ secrets.SSH_DEPLOYMENT_KEY }} + git_remote_url: 'ssh://dokku@liiweb2.africanlii.org:22/obl-microsites' + git_push_flags: '--force' + deploy-lii: if: ${{ always() }} - needs: deploy-senlii + needs: deploy-eswatinilii name: Deploy to lii runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 diff --git a/africanlii/settings.py b/africanlii/settings.py index dc0f66a6a..942678e70 100644 --- a/africanlii/settings.py +++ b/africanlii/settings.py @@ -15,7 +15,6 @@ "lesotholii", "malawilii", "namiblii", - "senlii", "seylii", "sierralii", "tanzlii", diff --git a/peachjam/views/documents.py b/peachjam/views/documents.py index 55c053e1f..42e9c3d60 100644 --- a/peachjam/views/documents.py +++ b/peachjam/views/documents.py @@ -50,10 +50,6 @@ class RedirectResolver: "place_code": [], "domain": "openbylaws.org.za", }, - "senlii": { - "country_code": "sn", - "domain": "senlii.org", - }, "seylii": { "country_code": "sc", "domain": "seylii.org", diff --git a/senlii/__init__.py b/senlii/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/senlii/apps.py b/senlii/apps.py deleted file mode 100644 index 8ae3f22a0..000000000 --- a/senlii/apps.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.apps import AppConfig - - -class SenLIIConfig(AppConfig): - default_auto_field = "django.db.models.BigAutoField" - name = "senlii" diff --git a/senlii/locale/en/LC_MESSAGES/django.mo b/senlii/locale/en/LC_MESSAGES/django.mo deleted file mode 100644 index 71cbdf3e9..000000000 Binary files a/senlii/locale/en/LC_MESSAGES/django.mo and /dev/null differ diff --git a/senlii/locale/en/LC_MESSAGES/django.po b/senlii/locale/en/LC_MESSAGES/django.po deleted file mode 100644 index 7671f3bb2..000000000 --- a/senlii/locale/en/LC_MESSAGES/django.po +++ /dev/null @@ -1,75 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-11 14:05+0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: settings.py:12 -msgid "French" -msgstr "" - -#: settings.py:13 -msgid "English" -msgstr "" - -#: templates/liiweb/home.html:6 -msgid "Recent Judgments" -msgstr "" - -#: templates/liiweb/home.html:7 -msgid "View more judgments" -msgstr "" - -#: templates/liiweb/home.html:11 -msgid "Recent Legislation" -msgstr "" - -#: templates/liiweb/home.html:12 -msgid "View more legislation" -msgstr "" - -#: templates/liiweb/home.html:16 -msgid "Recent Articles" -msgstr "" - -#: templates/liiweb/home.html:18 -msgid "View more articles" -msgstr "" - -#: templates/peachjam/_header.html:9 -msgid "Judgments" -msgstr "" - -#: templates/peachjam/_header.html:15 -msgid "Legislation" -msgstr "" - -#: templates/peachjam/_header.html:21 -msgid "Taxonomy" -msgstr "" - -#: templates/peachjam/_header.html:27 -msgid "Articles" -msgstr "" - -#: templates/peachjam/_header.html:33 -msgid "About" -msgstr "" - -#: templates/senlii/home.html:4 -msgid "Home" -msgstr "" diff --git a/senlii/locale/fr/LC_MESSAGES/django.mo b/senlii/locale/fr/LC_MESSAGES/django.mo deleted file mode 100644 index 238932407..000000000 Binary files a/senlii/locale/fr/LC_MESSAGES/django.mo and /dev/null differ diff --git a/senlii/locale/fr/LC_MESSAGES/django.po b/senlii/locale/fr/LC_MESSAGES/django.po deleted file mode 100644 index 6ea9013d5..000000000 --- a/senlii/locale/fr/LC_MESSAGES/django.po +++ /dev/null @@ -1,75 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: 39b2fd8e1f2e7f60a21a2ff40372741a\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-11 14:05+0300\n" -"PO-Revision-Date: 2023-05-16 07:12\n" -"Last-Translator: \n" -"Language-Team: French\n" -"Language: fr_FR\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Crowdin-Project: 39b2fd8e1f2e7f60a21a2ff40372741a\n" -"X-Crowdin-Project-ID: 4\n" -"X-Crowdin-Language: fr\n" -"X-Crowdin-File: /main/senlii/locale/en/LC_MESSAGES/django.po\n" -"X-Crowdin-File-ID: 112\n" - -#: settings.py:12 -msgid "French" -msgstr "Français" - -#: settings.py:13 -msgid "English" -msgstr "Anglais" - -#: templates/liiweb/home.html:6 -msgid "Recent Judgments" -msgstr "Jugements récents" - -#: templates/liiweb/home.html:7 -msgid "View more judgments" -msgstr "Voir plus de jugements" - -#: templates/liiweb/home.html:11 -msgid "Recent Legislation" -msgstr "Législation récente" - -#: templates/liiweb/home.html:12 -msgid "View more legislation" -msgstr "Voir plus de législation" - -#: templates/liiweb/home.html:16 -msgid "Recent Articles" -msgstr "Articles récents" - -#: templates/liiweb/home.html:18 -msgid "View more articles" -msgstr "Voir plus d'articles" - -#: templates/peachjam/_header.html:9 -msgid "Judgments" -msgstr "Jugements" - -#: templates/peachjam/_header.html:15 -msgid "Legislation" -msgstr "Législation" - -#: templates/peachjam/_header.html:21 -msgid "Taxonomy" -msgstr "Taxonomie" - -#: templates/peachjam/_header.html:27 -msgid "Articles" -msgstr "Articles" - -#: templates/peachjam/_header.html:33 -msgid "About" -msgstr "À propos" - -#: templates/senlii/home.html:4 -msgid "Home" -msgstr "Accueil" - diff --git a/senlii/locale/pt/LC_MESSAGES/django.mo b/senlii/locale/pt/LC_MESSAGES/django.mo deleted file mode 100644 index 6ef626898..000000000 Binary files a/senlii/locale/pt/LC_MESSAGES/django.mo and /dev/null differ diff --git a/senlii/locale/pt/LC_MESSAGES/django.po b/senlii/locale/pt/LC_MESSAGES/django.po deleted file mode 100644 index 704aa6692..000000000 --- a/senlii/locale/pt/LC_MESSAGES/django.po +++ /dev/null @@ -1,75 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: 39b2fd8e1f2e7f60a21a2ff40372741a\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-11 14:05+0300\n" -"PO-Revision-Date: 2023-05-16 07:12\n" -"Last-Translator: \n" -"Language-Team: Portuguese\n" -"Language: pt_PT\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Crowdin-Project: 39b2fd8e1f2e7f60a21a2ff40372741a\n" -"X-Crowdin-Project-ID: 4\n" -"X-Crowdin-Language: pt\n" -"X-Crowdin-File: /main/senlii/locale/en/LC_MESSAGES/django.po\n" -"X-Crowdin-File-ID: 112\n" - -#: settings.py:12 -msgid "French" -msgstr "Francês" - -#: settings.py:13 -msgid "English" -msgstr "Inglês" - -#: templates/liiweb/home.html:6 -msgid "Recent Judgments" -msgstr "Julgamentos Recentes" - -#: templates/liiweb/home.html:7 -msgid "View more judgments" -msgstr "Ver mais julgamentos" - -#: templates/liiweb/home.html:11 -msgid "Recent Legislation" -msgstr "Legislação recente" - -#: templates/liiweb/home.html:12 -msgid "View more legislation" -msgstr "Ver mais legislação" - -#: templates/liiweb/home.html:16 -msgid "Recent Articles" -msgstr "Artigos Recentes" - -#: templates/liiweb/home.html:18 -msgid "View more articles" -msgstr "Ver mais artigos" - -#: templates/peachjam/_header.html:9 -msgid "Judgments" -msgstr "Julgamentos" - -#: templates/peachjam/_header.html:15 -msgid "Legislation" -msgstr "Legislação" - -#: templates/peachjam/_header.html:21 -msgid "Taxonomy" -msgstr "Taxonomia" - -#: templates/peachjam/_header.html:27 -msgid "Articles" -msgstr "Artigos" - -#: templates/peachjam/_header.html:33 -msgid "About" -msgstr "Sobre" - -#: templates/senlii/home.html:4 -msgid "Home" -msgstr "Página inicial" - diff --git a/senlii/locale/sw/LC_MESSAGES/django.mo b/senlii/locale/sw/LC_MESSAGES/django.mo deleted file mode 100644 index 95665f3be..000000000 Binary files a/senlii/locale/sw/LC_MESSAGES/django.mo and /dev/null differ diff --git a/senlii/locale/sw/LC_MESSAGES/django.po b/senlii/locale/sw/LC_MESSAGES/django.po deleted file mode 100644 index 7db364d7e..000000000 --- a/senlii/locale/sw/LC_MESSAGES/django.po +++ /dev/null @@ -1,75 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: 39b2fd8e1f2e7f60a21a2ff40372741a\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-11 14:05+0300\n" -"PO-Revision-Date: 2023-05-16 07:12\n" -"Last-Translator: \n" -"Language-Team: Swahili\n" -"Language: sw_KE\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Crowdin-Project: 39b2fd8e1f2e7f60a21a2ff40372741a\n" -"X-Crowdin-Project-ID: 4\n" -"X-Crowdin-Language: sw\n" -"X-Crowdin-File: /main/senlii/locale/en/LC_MESSAGES/django.po\n" -"X-Crowdin-File-ID: 112\n" - -#: settings.py:12 -msgid "French" -msgstr "Kifaransa" - -#: settings.py:13 -msgid "English" -msgstr "Kiingereza" - -#: templates/liiweb/home.html:6 -msgid "Recent Judgments" -msgstr "Hukumu za Hivi Karibuni" - -#: templates/liiweb/home.html:7 -msgid "View more judgments" -msgstr "Tazama hukumu zaidi" - -#: templates/liiweb/home.html:11 -msgid "Recent Legislation" -msgstr "Sheria ya Hivi Karibuni" - -#: templates/liiweb/home.html:12 -msgid "View more legislation" -msgstr "Tazama sheria zaidi" - -#: templates/liiweb/home.html:16 -msgid "Recent Articles" -msgstr "Makala za Hivi Karibuni" - -#: templates/liiweb/home.html:18 -msgid "View more articles" -msgstr "Tazama makala zaidi" - -#: templates/peachjam/_header.html:9 -msgid "Judgments" -msgstr "Hukumu" - -#: templates/peachjam/_header.html:15 -msgid "Legislation" -msgstr "Sheria" - -#: templates/peachjam/_header.html:21 -msgid "Taxonomy" -msgstr "Taksonomia" - -#: templates/peachjam/_header.html:27 -msgid "Articles" -msgstr "Makala" - -#: templates/peachjam/_header.html:33 -msgid "About" -msgstr "Kuhusu" - -#: templates/senlii/home.html:4 -msgid "Home" -msgstr "Nyumbani" - diff --git a/senlii/settings.py b/senlii/settings.py deleted file mode 100644 index 3f0740639..000000000 --- a/senlii/settings.py +++ /dev/null @@ -1,21 +0,0 @@ -from django.utils.translation import gettext_lazy as _ - -from liiweb.settings import * # noqa - -INSTALLED_APPS = ["senlii.apps.SenLIIConfig"] + INSTALLED_APPS # noqa - -ROOT_URLCONF = "senlii.urls" - -LANGUAGE_CODE = "fr" - -LANGUAGES = [ - ("fr", _("French")), - ("en", _("English")), -] - - -JAZZMIN_SETTINGS["site_title"] = "SenLII" # noqa -JAZZMIN_SETTINGS["site_header"] = "SenLII" # noqa -JAZZMIN_SETTINGS["site_brand"] = "senlii.org" # noqa - -COURT_CODE_MAPPINGS = {} diff --git a/senlii/static/stylesheets/_variables.scss b/senlii/static/stylesheets/_variables.scss deleted file mode 100644 index b9f22433f..000000000 --- a/senlii/static/stylesheets/_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$primary: red; diff --git a/senlii/static/stylesheets/senlii.scss b/senlii/static/stylesheets/senlii.scss deleted file mode 100644 index 3bda1445e..000000000 --- a/senlii/static/stylesheets/senlii.scss +++ /dev/null @@ -1,10 +0,0 @@ -@import "variables"; -@import "stylesheets/liiweb"; - -footer { - background-color: $gray-100; -} - -.btn.btn-primary { - color: #fff; -} diff --git a/senlii/templates/liiweb/home.html b/senlii/templates/liiweb/home.html deleted file mode 100644 index 7233025b1..000000000 --- a/senlii/templates/liiweb/home.html +++ /dev/null @@ -1,21 +0,0 @@ -{% extends "liiweb/home.html" %} -{% load i18n static %} -{% block title %}Home{% endblock %} -{% block first-column-content %} -
-

{% trans 'Recent Judgments' %}

- {% trans 'View more judgments' as text %} - {% include 'peachjam/_recent_document_list.html' with documents=recent_judgments view_more_text=text view_more_url_name='judgment_list' %} -
-
-

{% trans 'Recent Legislation' %}

- {% trans 'View more legislation' as text %} - {% include 'peachjam/_recent_document_list.html' with documents=recent_legislation view_more_text=text view_more_url_name='legislation_list' %} -
-
-

{% trans 'Recent Articles' %}

- {% include 'peachjam/_article_list.html' with articles=recent_articles %} - {% trans "View more articles" %} -
-{% endblock %} -{% block second-column-content %}{% endblock %} diff --git a/senlii/templates/peachjam/_header.html b/senlii/templates/peachjam/_header.html deleted file mode 100644 index f064d5b81..000000000 --- a/senlii/templates/peachjam/_header.html +++ /dev/null @@ -1,36 +0,0 @@ -{% extends 'peachjam/_header.html' %} -{% load static i18n %} -{% block top-bar %}{% endblock %} -{% block navbar-logo %}SenLII{% endblock %} -{% block nav-items %} -
  • - - {% trans 'Judgments' %} - -
    • -
  • - - {% trans 'Legislation' %} - -
    • -
  • - - {% trans 'Taxonomy' %} - -
    • -
  • - - {% trans 'Articles' %} - -
    • -
  • - - {% trans 'About' %} - -
    • -{% endblock %} diff --git a/senlii/templates/peachjam/layouts/main.html b/senlii/templates/peachjam/layouts/main.html deleted file mode 100644 index 4ea44bd41..000000000 --- a/senlii/templates/peachjam/layouts/main.html +++ /dev/null @@ -1,7 +0,0 @@ -{% extends "peachjam/layouts/main.html" %} -{% load sass_tags %} -{% block head-css %} - -{% endblock %} diff --git a/senlii/templates/senlii/home.html b/senlii/templates/senlii/home.html deleted file mode 100644 index f2b1b2ff4..000000000 --- a/senlii/templates/senlii/home.html +++ /dev/null @@ -1,5 +0,0 @@ -{% extends "liiweb/home.html" %} -{% load static i18n %} -{% block title %} - {% trans 'Home' %} -{% endblock %} diff --git a/senlii/urls.py b/senlii/urls.py deleted file mode 100644 index 7dcce59a5..000000000 --- a/senlii/urls.py +++ /dev/null @@ -1,8 +0,0 @@ -from django.urls import include, path - -from senlii import views - -urlpatterns = [ - path("", views.HomePageView.as_view(), name="home_page"), - path("", include("liiweb.urls")), -] diff --git a/senlii/views/__init__.py b/senlii/views/__init__.py deleted file mode 100644 index 795f5f87d..000000000 --- a/senlii/views/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .home import * # noqa diff --git a/senlii/views/home.py b/senlii/views/home.py deleted file mode 100644 index eb7717c6a..000000000 --- a/senlii/views/home.py +++ /dev/null @@ -1,14 +0,0 @@ -from liiweb.views import HomePageView as BaseHomePageView -from peachjam.models import Article - - -class HomePageView(BaseHomePageView): - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - context["recent_articles"] = ( - Article.objects.prefetch_related("topics") - .select_related("author") - .order_by("-date")[:5] - ) - - return context