Merge branch 'main' into judgment-n+1

laws-africa · Sep 12, 2023 · e05c3a4 · e05c3a4
2 parents 11902a1 + 6e110eb
commit e05c3a4
Show file tree

Hide file tree

Showing 22 changed files with 162 additions and 53 deletions.
diff --git a/africanlii/templates/peachjam/_footer.html b/africanlii/templates/peachjam/_footer.html
@@ -8,13 +8,15 @@ <h5>{% trans 'About' %} {{ APP_NAME }}</h5>
       AfricanLII is an open-access research platform for African law jointly operated by the AfricanLII programme of
       the University of Cape Town and Laws.Africa. AfricanLII publishes the law and policy of the African Union and
       federates search across all open access African national law available through the
-      <a class="text-primary" href="https://www.openlawafrica.org/" target="_blank" rel="noreferrer">Open Law Africa</a> community of LIIs.
+      <a class="text-primary" href="https://www.openlawafrica.org/" target="_blank" rel="noreferrer">Open Law Africa</a>
+      community of LIIs.
     {% endblocktrans %}
   </p>
   <p>
     {% blocktrans trimmed %}
       The publication of the African Union material is co-sponsored by the European Union and is part of the
-      <a class="text-primary" href="https://dataforgovernance.africa/" target="_blank" rel="noreferrer">Data for Governance Alliance project</a>.
+      <a class="text-primary" href="https://dataforgovernance.africa/" target="_blank" rel="noreferrer">Data for
+        Governance Alliance project</a>.
     {% endblocktrans %}
   </p>
   <div>
@@ -41,6 +43,11 @@ <h5>{% trans 'About' %} {{ APP_NAME }}</h5>
   <div>
     <a href="https://www.eeas.europa.eu/" target="_blank" rel="noreferrer">{% trans 'European Union' %}</a>
   </div>
+  <div>
+    <a href="https://www.openlawafrica.org/"
+       target="_blank"
+       rel="noreferrer">{% trans 'Open Law Africa' %}</a>
+  </div>
 {% endblock %}
 {% block third-content-column %}
   <div class="mb-2">
@@ -110,23 +117,23 @@ <h5>{% trans 'About' %} {{ APP_NAME }}</h5>
       <img src="{% static 'images/uct-logo.svg' %}"
            alt="{% trans 'University of Cape Town' %}"/>
     </a>
-    <a href="https://laws.africa/"
+    <a class="footer-logos__item"
+       href="https://laws.africa/"
        target="_blank"
-       rel="noreferrer"
-       class="footer-logos__item">
+       rel="noreferrer">
       <img src="{% static 'images/laws-africa-logo-horizontal-white.png' %}"
            alt="Laws.Africa"/>
     </a>
-    <a href="https://www.indigotrust.org.uk/"
+    <a class="footer-logos__item"
+       href="https://www.indigotrust.org.uk/"
        target="_blank"
-       rel="noreferrer"
-       class="footer-logos__item">
+       rel="noreferrer">
       <img src="{% static 'images/indigo-trust-logo.jpg' %}" alt="Indigo Trust"/>
     </a>
-    <a href="https://european-union.europa.eu/select-language?destination=/node/1"
+    <a class="footer-logos__item"
+       href="https://european-union.europa.eu/select-language?destination=/node/1"
        target="_blank"
-       rel="noreferrer"
-       class="footer-logos__item">
+       rel="noreferrer">
       <img src="{% static 'images/eu_logo.jpg' %}"
            alt="{% trans 'European Union' %}"/>
     </a>
@@ -136,5 +143,12 @@ <h5>{% trans 'About' %} {{ APP_NAME }}</h5>
        rel="noreferrer">
       <img src="{% static 'images/srt-logo.jpg' %}" alt="Sigrid Rausing Trust"/>
     </a>
+    <a class="footer-logos__item"
+       href="https://www.openlawafrica.org/"
+       target="_blank"
+       rel="noreferrer">
+      <img src="{% static 'images/open-law-africa-inverted.png' %}"
+           alt="{% trans 'Open Law Africa' %}"/>
+    </a>
   </div>
 {% endblock %}
diff --git a/africanlii/templates/peachjam/_header.html b/africanlii/templates/peachjam/_header.html
@@ -2,15 +2,21 @@
 {% load static %}
 {% load i18n %}
 {% block top-bar %}
-  <div class="bg-dark p-2">
+  <div class="top-bar bg-dark p-2">
     <div class="container d-flex justify-content-between">
       <a href="https://dataforgovernance.africa"
          target="_blank"
          rel="noreferrer">
-        <img class="me-4"
+        <img class="top-bar-logo d4ga-logo"
              src="{% static 'images/cso-agp-logo-horizontal.png' %}"
-             alt="africanlii"
-             height="40"/>
+             alt="Data for Governance Alliance"/>
+      </a>
+      <a href="https://www.openlawafrica.org/"
+         target="_blank"
+         rel="noreferrer">
+        <img class="top-bar-logo ola-logo"
+             src="{% static 'images/open-law-africa-inverted.png' %}"
+             alt="{% trans 'Open Law Africa' %}"/>
       </a>
     </div>
   </div>

diff --git a/eswatinilii/templates/liiweb/home.html b/eswatinilii/templates/liiweb/home.html
@@ -2,17 +2,13 @@
 {% load i18n static %}
 {% block hero-logos %}
   <div class="d-flex justify-content-between">
-    <img height="26"
-         class="me-4"
+    <img class="me-4"
          src="{% static 'images/africanlii-logo.svg' %}"
          alt="africanlii-logo"/>
-    <img height="26"
-         class="me-4"
+    <img class="me-4"
          src="{% static 'images/judiciary_swazi.png' %}"
          alt="judiciary-logo"/>
-    <img height="26"
-         src="{% static 'images/laws-africa-logo.png' %}"
-         alt="laws-logo"/>
+    <img src="{% static 'images/laws-africa-logo.png' %}" alt="laws-logo"/>
   </div>
 {% endblock %}
 {% block hero-headings %}
@@ -35,17 +31,13 @@ <h4 class="mb-4">
 {% endblock %}
 {% block second-col-logos %}
   <div class="d-flex justify-content-between mb-4 mb-lg-4">
-    <img height="26"
-         class="me-4"
+    <img class="me-4"
          src="{% static 'images/africanlii-logo.svg' %}"
          alt="africanlii-logo"/>
-    <img height="26"
-         class="me-4"
+    <img class="me-4"
          src="{% static 'images/judiciary_swazi.png' %}"
          alt="gju-logo"/>
-    <img height="26"
-         src="{% static 'images/laws-africa-logo.png' %}"
-         alt="laws-logo"/>
+    <img src="{% static 'images/laws-africa-logo.png' %}" alt="laws-logo"/>
   </div>
 {% endblock %}
 {% block facebook-url %}

diff --git a/ghalii/templates/peachjam/_footer.html b/ghalii/templates/peachjam/_footer.html
@@ -19,6 +19,11 @@ <h5>{% trans 'Our partners' %}</h5>
   <div>
     <a href="https://ghalii.org/" target="_blank" rel="noreferrer">{% trans 'Ghana Legal Information Institute' %}</a>
   </div>
+  <div>
+    <a href="https://www.openlawafrica.org/"
+       target="_blank"
+       rel="noreferrer">Open Law Africa</a>
+  </div>
 {% endblock %}
 {% block footer-logos %}
   <div class="footer-logos">
@@ -39,13 +44,20 @@ <h5>{% trans 'Our partners' %}</h5>
        href="https://ghalii.org"
        target="_blank"
        rel="noreferrer">
-      <img height="26" src="{% static 'images/logo.png' %}" alt="ghalii logo"/>
+      <img src="{% static 'images/logo.png' %}" alt="ghalii logo"/>
     </a>
     <a class="footer-logos__item"
        href="https://ejudgment.judicial.gov.gh/"
        target="_blank"
        rel="noreferrer">
       <img src="{% static 'images/ejudgment-logo.png' %}" alt="e-judgment logo"/>
     </a>
+    <a class="footer-logos__item"
+       href="https://www.openlawafrica.org/"
+       target="_blank"
+       rel="noreferrer">
+      <img src="{% static 'images/open-law-africa.png' %}"
+           alt="{% trans 'Open Law Africa' %}"/>
+    </a>
   </div>
 {% endblock %}
diff --git a/ghalii/templates/peachjam/_header.html b/ghalii/templates/peachjam/_header.html
@@ -1,15 +1,21 @@
 {% extends 'peachjam/_header.html' %}
 {% load i18n static %}
 {% block top-bar %}
-  <div class="bg-light p-2">
-    <div class="container d-flex">
+  <div class="top-bar bg-light p-2">
+    <div class="container d-flex justify-content-between">
       <a href="https://ejudgment.judicial.gov.gh/"
          target="_blank"
-         rel="noreferrer"
-         class="ms-auto">
+         rel="noreferrer">
         <img src="{% static 'images/ejudgment-logo.png' %}"
-             alt="e-judgment logo"
-             height="40"/>
+             class="top-bar-logo"
+             alt="e-judgment logo"/>
+      </a>
+      <a href="https://www.openlawafrica.org/"
+         target="_blank"
+         rel="noreferrer">
+        <img class="top-bar-logo"
+             src="{% static 'images/open-law-africa.png' %}"
+             alt="{% trans 'Open Law Africa' %}"/>
       </a>
     </div>
   </div>

diff --git a/lawlibrary/templates/peachjam/_footer.html b/lawlibrary/templates/peachjam/_footer.html
@@ -5,8 +5,10 @@
     {% blocktrans trimmed %}
       LawLibrary.org.za is curated by the African Legal Information Institute (AfricanLII) at the
       <a href="http://www.dgru.uct.ac.za/">Democratic Governance and Rights Unit</a>, Faculty of Law, University of
-      Cape Town (UCT) and in partnership with UCT's <a href="http://www.jifa.uct.ac.za/">Judicial Institute for Africa</a>
-      (JIFA) and <a href="http://laws.africa/">Laws.Africa</a> NPO. AfricanLII and Laws.Africa are members of the regional
+      Cape Town (UCT) and in partnership with UCT's
+      <a href="http://www.jifa.uct.ac.za/">Judicial Institute for Africa</a>
+      (JIFA) and <a href="http://laws.africa/">Laws.Africa</a> NPO. AfricanLII and Laws.Africa are members of the
+      regional
       and global Free Access to Law community and subscribe to the principles of the
       <a href="http://www.falm.info/declaration/">Montreal Declaration on Free Access to Law.</a>
     {% endblocktrans %}
@@ -23,6 +25,11 @@ <h5>{% trans 'Our partners' %}</h5>
   <div>
     <a href="https://laws.africa/" target="_blank" rel="noreferrer">Laws.Africa</a>
   </div>
+  <div>
+    <a href="https://www.openlawafrica.org/"
+       target="_blank"
+       rel="noreferrer">{% trans 'Open Law Africa' %}</a>
+  </div>
   <h6 class="mt-4">{% trans 'With support from' %}</h6>
   <div>
     <a href="https://www.uct.ac.za/" target="_blank" rel="noreferrer">{% trans 'University of Cape Town' %}</a>
@@ -34,7 +41,7 @@ <h6 class="mt-4">{% trans 'With support from' %}</h6>
        target="_blank"
        rel="noreferrer"
        class="footer-logos__item">
-      <img src="{% static 'images/uct-logo.svg' %}" alt="UCT logo" />
+      <img src="{% static 'images/uct-logo.svg' %}" alt="UCT logo"/>
     </a>
     <a href="https://laws.africa/"
        target="_blank"
@@ -47,13 +54,20 @@ <h6 class="mt-4">{% trans 'With support from' %}</h6>
        href="https://africanlii.org/"
        target="_blank"
        rel="noreferrer">
-      <img src="{% static 'images/africanlii-logo.svg' %}" alt="AfricanLII" />
+      <img src="{% static 'images/africanlii-logo.svg' %}" alt="AfricanLII"/>
     </a>
     <a href="http://www.jifa.uct.ac.za/"
        target="_blank"
        rel="noreferrer"
        class="footer-logos__item">
-      <img src="{% static 'images/jifa.png' %}" alt="JIFA" />
+      <img src="{% static 'images/jifa.png' %}" alt="JIFA"/>
+    </a>
+    <a href="https://www.openlawafrica.org/"
+       target="_blank"
+       rel="noreferrer"
+       class="footer-logos__item">
+      <img src="{% static 'images/open-law-africa.png' %}"
+           alt="{% trans 'Open Law Africa' %}"/>
     </a>
   </div>
 {% endblock %}
diff --git a/lawlibrary/templates/peachjam/_header.html b/lawlibrary/templates/peachjam/_header.html
@@ -2,6 +2,7 @@
 {% load static i18n %}
 {% block top-bar %}
   {% include 'lawlibrary/_early_preview_warning.html' %}
+  {% include 'peachjam/_open_law_africa.html' %}
 {% endblock %}
 {% block navbar-logo %}
   <img src="{% static 'images/lawlibrary-logo.png' %}"

diff --git a/lesotholii/templates/peachjam/_footer.html b/lesotholii/templates/peachjam/_footer.html
@@ -36,8 +36,7 @@ <h5>{% trans 'Our partners' %}</h5>
        href="https://jud.gov.ls"
        target="_blank"
        rel="noreferrer">
-      <img height="26"
-           src="{% static 'images/lesotho_judiciary_coat_of_arms.png' %}"
+      <img src="{% static 'images/lesotho_judiciary_coat_of_arms.png' %}"
            alt="lesotho_judiciary-logo"/>
     </a>
   </div>

diff --git a/namiblii/templates/peachjam/_footer.html b/namiblii/templates/peachjam/_footer.html
@@ -42,8 +42,7 @@ <h5>{% trans 'Our partners' %}</h5>
        href="https://www.lac.org.na"
        target="_blank"
        rel="noreferrer">
-      <img height="26"
-           src="{% static 'images/lac_logo_full.jpg' %}"
+      <img src="{% static 'images/lac_logo_full.jpg' %}"
            alt="lesotho_judiciary-logo"/>
     </a>
   </div>

diff --git a/peachjam/static/images/open-law-africa-inverted.png b/peachjam/static/images/open-law-africa-inverted.png
diff --git a/peachjam/static/images/open-law-africa.png b/peachjam/static/images/open-law-africa.png
diff --git a/peachjam/static/stylesheets/components/_header.scss b/peachjam/static/stylesheets/components/_header.scss
@@ -0,0 +1,11 @@
+.top-bar {
+  .top-bar-logo {
+    max-height: 40px;
+  }
+
+  @include media-breakpoint-down(sm) {
+    .top-bar-logo {
+      max-height: 30px;
+    }
+  }
+}
diff --git a/peachjam/static/stylesheets/components/_index.scss b/peachjam/static/stylesheets/components/_index.scss
@@ -3,6 +3,7 @@
 @import "entity-profile";
 @import "footer";
 @import "gutter";
+@import "header";
 @import "icons";
 @import "letter-radiobox";
 @import "loaders";

diff --git a/peachjam/templates/peachjam/_open_law_africa.html b/peachjam/templates/peachjam/_open_law_africa.html
@@ -0,0 +1,13 @@
+{% load i18n static %}
+<div class="top-bar bg-dark p-2">
+  <div class="container d-flex">
+    <a href="https://www.openlawafrica.org/"
+       target="_blank"
+       rel="noreferrer"
+       class="ms-auto">
+      <img src="{% static 'images/open-law-africa-inverted.png' %}"
+           alt="{% trans 'Open Law Africa' %}"
+           class="top-bar-logo ola-logo"/>
+    </a>
+  </div>
+</div>
diff --git a/seylii/templates/peachjam/_footer.html b/seylii/templates/peachjam/_footer.html
@@ -24,6 +24,11 @@ <h5>{% trans 'Our partners' %}</h5>
   <div>
     <a href="https://laws.africa/" target="_blank" rel="noreferrer">Laws.Africa</a>
   </div>
+  <div>
+    <a href="https://www.openlawafrica.org/"
+       target="_blank"
+       rel="noreferrer">Open Law Africa</a>
+  </div>
   <h6 class="mt-4">{% trans 'With support from' %}</h6>
   <div>
     <a href="https://www.indigotrust.org.uk/"
@@ -59,5 +64,12 @@ <h6 class="mt-4">{% trans 'With support from' %}</h6>
       <img src="{% static 'images/judiciary-of-the-seychelles-logo.jpg' %}"
            alt="Judiciary of the Seychelles"/>
     </a>
+    <a class="footer-logos__item"
+       href="https://www.openlawafrica.org/"
+       target="_blank"
+       rel="noreferrer">
+      <img src="{% static 'images/open-law-africa.png' %}"
+           alt="{% trans 'Open Law Africa' %}"/>
+    </a>
   </div>
 {% endblock %}
diff --git a/seylii/templates/peachjam/_header.html b/seylii/templates/peachjam/_header.html
@@ -1,5 +1,8 @@
 {% extends 'peachjam/_header.html' %}
 {% load static i18n %}
+{% block top-bar %}
+  {% include 'peachjam/_open_law_africa.html' %}
+{% endblock %}
 {% block nav-items %}
   <li class="nav-item">
     <a class="nav-link {% if view.navbar_link == 'judgments' %}active{% endif %}"

diff --git a/sierralii/templates/peachjam/_footer.html b/sierralii/templates/peachjam/_footer.html
@@ -36,8 +36,7 @@ <h5>{% trans 'Our partners' %}</h5>
        href="https://jud.gov.ls"
        target="_blank"
        rel="noreferrer">
-      <img height="26"
-           style="background-color: #2D5D88"
+      <img style="background-color: #2D5D88"
            src="{% static 'images/jsco_logo.png' %}"
            alt="jsco-logo"/>
     </a>

diff --git a/tanzlii/templates/peachjam/_footer.html b/tanzlii/templates/peachjam/_footer.html
@@ -22,6 +22,11 @@ <h5>{% trans 'Our partners' %}</h5>
   <div>
     <a href="https://laws.africa/" target="_blank" rel="noreferrer">Laws.Africa</a>
   </div>
+  <div>
+    <a href="https://www.openlawafrica.org/"
+       target="_blank"
+       rel="noreferrer">Open Law Africa</a>
+  </div>
 {% endblock %}
 {% block footer-logos %}
   <div class="footer-logos">
@@ -45,5 +50,11 @@ <h5>{% trans 'Our partners' %}</h5>
       <img src="{% static 'images/laws-africa-logo-horizontal.png' %}"
            alt="Laws.Africa"/>
     </a>
+    <a href="https://www.openlawafrica.org/"
+       target="_blank"
+       rel="noreferrer"
+       class="footer-logos__item">
+      <img src="{% static 'images/open-law-africa.png' %}" alt="Open Law Africa"/>
+    </a>
   </div>
 {% endblock %}