From a252ebdb88d0379337a5360492b6227c34b85013 Mon Sep 17 00:00:00 2001 From: Restioson Date: Tue, 8 Oct 2024 14:17:31 +0200 Subject: [PATCH] drop: djhtml formatting test --- app/templates/500.html | 2 +- app/templates/admin/base_site.html | 16 +- app/templates/app/_nav_item.html | 6 +- app/templates/app/_navbar_items.html | 22 +- app/templates/app/_pagination.html | 80 +++---- app/templates/app/_search_filter.html | 22 +- .../app/_subj_lang_institution_filter.html | 84 ++++---- app/templates/app/contact.html | 100 ++++----- app/templates/app/document_detail.html | 114 +++++----- app/templates/app/documents.html | 86 ++++---- app/templates/app/home.html | 154 +++++++------- app/templates/app/institution_detail.html | 96 ++++----- app/templates/app/institutions.html | 88 ++++---- app/templates/app/languages.html | 102 ++++----- app/templates/app/legal_notices.html | 158 +++++++------- app/templates/app/project_detail.html | 130 ++++++------ app/templates/app/projects.html | 104 +++++----- app/templates/app/search.html | 150 +++++++------- app/templates/app/subjects.html | 104 +++++----- app/templates/base.html | 196 +++++++++--------- app/templates/base_error.html | 6 +- app/templates/base_htmx.html | 34 +-- app/templates/django/forms/field.html | 24 +-- app/templates/registration/login.html | 24 +-- .../registration/password_change_done.html | 4 +- .../registration/password_change_form2.html | 24 +-- .../registration/password_reset_complete.html | 10 +- .../registration/password_reset_confirm.html | 26 +-- .../registration/password_reset_done.html | 26 +-- .../registration/password_reset_form.html | 24 +-- app/templates/registration/register.html | 12 +- .../registration/registration_base.html | 18 +- 32 files changed, 1023 insertions(+), 1023 deletions(-) diff --git a/app/templates/500.html b/app/templates/500.html index be6be8d4..d011714d 100644 --- a/app/templates/500.html +++ b/app/templates/500.html @@ -3,5 +3,5 @@ {% block error_title %}{% trans "Internal Server Error (500)" %}{% endblock %} {% block error_message %} -{% trans "The server encountered an unexpected condition that prevented it from fulfilling the request." %} + {% trans "The server encountered an unexpected condition that prevented it from fulfilling the request." %} {% endblock %} diff --git a/app/templates/admin/base_site.html b/app/templates/admin/base_site.html index 84dfac52..8b83cc76 100644 --- a/app/templates/admin/base_site.html +++ b/app/templates/admin/base_site.html @@ -23,12 +23,12 @@ {% endblock %} {% block branding %} -

- - - -

-{% if user.is_anonymous %} - {% include "admin/color_theme_toggle.html" %} -{% endif %} +

+ + + +

+ {% if user.is_anonymous %} + {% include "admin/color_theme_toggle.html" %} + {% endif %} {% endblock %} diff --git a/app/templates/app/_nav_item.html b/app/templates/app/_nav_item.html index 5fc7f8ec..352828b7 100644 --- a/app/templates/app/_nav_item.html +++ b/app/templates/app/_nav_item.html @@ -1,8 +1,8 @@
  • + {% if current_page == view %} class="nav-link active px-3" aria-current="page" + {% else %} class="nav-link px-3" + {% endif %}> {{ label }}
    • diff --git a/app/templates/app/_navbar_items.html b/app/templates/app/_navbar_items.html index 5cf6bcde..13e41d45 100644 --- a/app/templates/app/_navbar_items.html +++ b/app/templates/app/_navbar_items.html @@ -1,14 +1,14 @@ {% load i18n %} {% spaceless %} - + {% endspaceless %} diff --git a/app/templates/app/_pagination.html b/app/templates/app/_pagination.html index 9579749b..5338ee26 100644 --- a/app/templates/app/_pagination.html +++ b/app/templates/app/_pagination.html @@ -1,9 +1,9 @@ {% load i18n %} {% spaceless %} -{% if page_obj.has_previous or page_obj.has_next %} - + {% endif %} {% endspaceless %} diff --git a/app/templates/app/_search_filter.html b/app/templates/app/_search_filter.html index ddb229b8..552a3264 100644 --- a/app/templates/app/_search_filter.html +++ b/app/templates/app/_search_filter.html @@ -1,13 +1,13 @@ {% spaceless %} -
    - {{ field.label }} -
    {# open if currently filtering on this field #} - {{ summary }} - {% for checkbox in field %} -
    - -
    - {% endfor %} -
    -
    +
    + {{ field.label }} +
    {# open if currently filtering on this field #} + {{ summary }} + {% for checkbox in field %} +
    + +
    + {% endfor %} +
    +
    {% endspaceless %} diff --git a/app/templates/app/_subj_lang_institution_filter.html b/app/templates/app/_subj_lang_institution_filter.html index 158ea7e6..78a63a71 100644 --- a/app/templates/app/_subj_lang_institution_filter.html +++ b/app/templates/app/_subj_lang_institution_filter.html @@ -1,47 +1,47 @@ {% load i18n %} {% spaceless %} -
    -
    -
    - - + +
    +
    + + +
    +
    + + +
    +
    + + +
    -
    - - +
    + + {% trans "Reset" %}
    -
    - - -
    -
    -
    - - {% trans "Reset" %} -
    - + {% endspaceless %} diff --git a/app/templates/app/contact.html b/app/templates/app/contact.html index 3cec35ba..173cc414 100644 --- a/app/templates/app/contact.html +++ b/app/templates/app/contact.html @@ -3,58 +3,58 @@ {% load i18n %} {% block content %} -{% spaceless %} -
    -
    -

    {% trans "Contact us" %}

    -
    -
    -

    {% trans "Contact details for more information" %}

    -

    - {% blocktrans trimmed %} - Juan Steyn
    - South African Centre for Digital Language Resources (SADiLaR)
    - North-West University
    - South Africa - {% endblocktrans %} -

    -

    +27 (0)18 285-2750

    -

    info@sadilar.org

    -
    + {% spaceless %} +
    +
    +

    {% trans "Contact us" %}

    +
    +
    +

    {% trans "Contact details for more information" %}

    +

    + {% blocktrans trimmed %} + Juan Steyn
    + South African Centre for Digital Language Resources (SADiLaR)
    + North-West University
    + South Africa + {% endblocktrans %} +

    +

    +27 (0)18 285-2750

    +

    info@sadilar.org

    +
    -
    -

    {% trans "Physical address" %}

    -
    - {% blocktrans trimmed %} - Buildings F16 C & F16 D
    - North-West University
    - Potchefstroom Campus
    - Potchefstroom
    - South Africa - {% endblocktrans %} -
    -

    - - {% trans "Directions" %} - -

    -
    +
    +

    {% trans "Physical address" %}

    +
    + {% blocktrans trimmed %} + Buildings F16 C & F16 D
    + North-West University
    + Potchefstroom Campus
    + Potchefstroom
    + South Africa + {% endblocktrans %} +
    +

    + + {% trans "Directions" %} + +

    +
    -
    -

    {% trans "Postal address" %}

    -
    - {% blocktrans trimmed %} - SADiLaR
    - Internal Box 340
    - Private bag X6001
    - Potchefstroom
    - South Africa
    - 2520 - {% endblocktrans %} -
    +
    +

    {% trans "Postal address" %}

    +
    + {% blocktrans trimmed %} + SADiLaR
    + Internal Box 340
    + Private bag X6001
    + Potchefstroom
    + South Africa
    + 2520 + {% endblocktrans %} +
    +
    +
    -
    -
    -{% endspaceless %} + {% endspaceless %} {% endblock content %} diff --git a/app/templates/app/document_detail.html b/app/templates/app/document_detail.html index 5a62493d..dda743e8 100644 --- a/app/templates/app/document_detail.html +++ b/app/templates/app/document_detail.html @@ -6,72 +6,72 @@ {% block title %}{{ document.title }}{% endblock %} {% block content %} -{% spaceless %} -
    -

    {% trans "Documents" %} > {{ document.title }}

    + {% spaceless %} +
    +

    {% trans "Documents" %} > {{ document.title }}

    -
    -

    {{ document.title }}

    - {% if document.url %} -
    - - {{ document.url }} - -
    - {% endif %} +
    +

    {{ document.title }}

    + {% if document.url %} +
    + + {{ document.url }} + +
    + {% endif %} - {% if document.uploaded_file %} -
    - - - -
    - {% endif %} + {% if document.uploaded_file %} +
    + + + +
    + {% endif %} -
    - {{ document.description | linebreaks}} -
    +
    + {{ document.description | linebreaks}} +
    -

    - - {{ document.institution.name }} - -

    +

    + + {{ document.institution.name }} + +

    -

    {% trans "License:" %} {{ document.license }}

    -

    {% trans "Category:" %} {{ document.document_type }}

    -
    +

    {% trans "License:" %} {{ document.license }}

    +

    {% trans "Category:" %} {{ document.document_type }}

    +
    -
    - {% if document.subjects.all %} -
    -

    {% trans "Subjects" %}

    -
      - {% for subject in document.subjects.all %} -
    • {% icon "subject" %}{{ subject.name }}
      • - {% endfor %} -
    -
    - {% endif %} +
    + {% if document.subjects.all %} +
    +

    {% trans "Subjects" %}

    +
      + {% for subject in document.subjects.all %} +
    • {% icon "subject" %}{{ subject.name }}
      • + {% endfor %} +
    +
    + {% endif %} - {% if document.languages.all %} -
    -

    {% trans "Languages" %}

    -
      - {% for language in document.languages.all %} -
    • {% icon "language" %}{{ language.name }}
      • - {% endfor %} -
    -
    - {% endif %} + {% if document.languages.all %} +
    +

    {% trans "Languages" %}

    +
      + {% for language in document.languages.all %} +
    • {% icon "language" %}{{ language.name }}
      • + {% endfor %} +
    +
    + {% endif %} -
    +
    -
    +
    -{% endspaceless %} + {% endspaceless %} {% endblock content %} diff --git a/app/templates/app/documents.html b/app/templates/app/documents.html index ecb18399..43e484c0 100644 --- a/app/templates/app/documents.html +++ b/app/templates/app/documents.html @@ -6,48 +6,48 @@ {% block title %}{% trans "Documents" %}{% endblock %} {% block content %} -{% spaceless %} -
    -

    {% trans "Documents" %}

    - - {% include "app/_subj_lang_institution_filter.html" with view="documents"%} - - {% for item in documents %} -
    {# additional indent simplifies comparison with projects.html #} -

    - - {{ item.document.title }} - -

    - {% if item.document.url %} - - {% endif %} -
    - {{ item.institution_name }} -
    -

    - {{ item.description|truncatewords:30 }} - {% trans "Read more" %} -

    - - {% if item.languages %} -
    {% icon "language" %} {{ item.languages }}
    - {% endif %} - - {% if item.subjects %} -
    {% icon "subject" %} {{ item.subjects }}
    - {% endif %} -
    -
    - {% endfor %} - - {% include "app/_pagination.html" %} + {% spaceless %} +
    +

    {% trans "Documents" %}

    + + {% include "app/_subj_lang_institution_filter.html" with view="documents"%} + + {% for item in documents %} +
    {# additional indent simplifies comparison with projects.html #} +

    + + {{ item.document.title }} + +

    + {% if item.document.url %} + + {% endif %} +
    + {{ item.institution_name }} +
    +

    + {{ item.description|truncatewords:30 }} + {% trans "Read more" %} +

    + + {% if item.languages %} +
    {% icon "language" %} {{ item.languages }}
    + {% endif %} + + {% if item.subjects %} +
    {% icon "subject" %} {{ item.subjects }}
    + {% endif %} +
    +
    + {% endfor %} + + {% include "app/_pagination.html" %} -
    -{% endspaceless %} +
    + {% endspaceless %} {% endblock content %} diff --git a/app/templates/app/home.html b/app/templates/app/home.html index 0698c3ee..da95c231 100644 --- a/app/templates/app/home.html +++ b/app/templates/app/home.html @@ -3,83 +3,83 @@ {% load i18n %} {% block content %} -{% spaceless %} -

    {% trans "LwimiLinks" %}

    -
    -
    -

    {% trans "Explore" %}

    -

    - {% blocktrans trimmed %} - LwimiLinks is a place for multilingual terminology and other useful language - resources. We encourage institutions to upload their resources, and to register - information on related projects. - {% endblocktrans %} -

    -
    - - -
    -

    - {% trans "Browse through the available information by one of the following categories:" %} -

    - -
    -
    + {% spaceless %} +

    {% trans "LwimiLinks" %}

    +
    +
    +

    {% trans "Explore" %}

    +

    + {% blocktrans trimmed %} + LwimiLinks is a place for multilingual terminology and other useful language + resources. We encourage institutions to upload their resources, and to register + information on related projects. + {% endblocktrans %} +

    +
    + + +
    +

    + {% trans "Browse through the available information by one of the following categories:" %} +

    + +
    +
    -
    -
    -

    {% trans "Background information" %}

    -

    - {% blocktrans trimmed %} - The South African Centre for Digital Language Resources (SADiLaR) is a national research - infrastructure that aims to ensure a digital future for our official languages. - It supports researchers in the fields of digital humanities and social sciences and also - assists institutions in their language implementation plans. - {% endblocktrans %} - {% blocktrans %}Read more about SADiLaR.{% endblocktrans %} -

    -

    - {% blocktrans trimmed %} - SADiLaR conducted an audit at South African public higher education institutions that highlighted - areas that require attention. - {% endblocktrans %} - {% blocktrans %}Read the report.{% endblocktrans %} -

    -

    - {% blocktrans trimmed %} - This platform highlights previous and current work at institutions to encourage collaboration and - disseminate resources. - {% endblocktrans %} -

    -
    -
    +
    +
    +

    {% trans "Background information" %}

    +

    + {% blocktrans trimmed %} + The South African Centre for Digital Language Resources (SADiLaR) is a national research + infrastructure that aims to ensure a digital future for our official languages. + It supports researchers in the fields of digital humanities and social sciences and also + assists institutions in their language implementation plans. + {% endblocktrans %} + {% blocktrans %}Read more about SADiLaR.{% endblocktrans %} +

    +

    + {% blocktrans trimmed %} + SADiLaR conducted an audit at South African public higher education institutions that highlighted + areas that require attention. + {% endblocktrans %} + {% blocktrans %}Read the report.{% endblocktrans %} +

    +

    + {% blocktrans trimmed %} + This platform highlights previous and current work at institutions to encourage collaboration and + disseminate resources. + {% endblocktrans %} +

    +
    +
    -{% endspaceless %} + {% endspaceless %} {% endblock content %} diff --git a/app/templates/app/institution_detail.html b/app/templates/app/institution_detail.html index 75cea3d5..5cf6b19e 100644 --- a/app/templates/app/institution_detail.html +++ b/app/templates/app/institution_detail.html @@ -6,57 +6,57 @@ {% block title %}{{ institution.name }}{% endblock %} {% block content %} -{% spaceless %} -
    -

    {% trans "Institutions" %} > {{ institution.name }}

    + {% spaceless %} +
    +

    {% trans "Institutions" %} > {{ institution.name }}

    -
    - +
    + - {% if institution.logo %} -
    - -
    - {% endif %} -
    + {% if institution.logo %} +
    + +
    + {% endif %} +
    -
    - {% if projects %} -
    -

    {% trans "Projects" %}

    -
      - {% for project in projects %} -
    • - {% icon "project" %} - {{ project.name }} -
      • - {% endfor %} -
    -
    - {% endif %} - {% if documents %} -
    -

    {% trans "Documents" %}

    -
      - {% for document in documents %} -
    • - {% icon "document" %} - {{ document.title }} -
      • - {% endfor %} -
    +
    + {% if projects %} +
    +

    {% trans "Projects" %}

    +
      + {% for project in projects %} +
    • + {% icon "project" %} + {{ project.name }} +
      • + {% endfor %} +
    +
    + {% endif %} + {% if documents %} +
    +

    {% trans "Documents" %}

    +
      + {% for document in documents %} +
    • + {% icon "document" %} + {{ document.title }} +
      • + {% endfor %} +
    +
    + {% endif %} +
    - {% endif %} -
    -
    -{% endspaceless %} + {% endspaceless %} {% endblock content %} diff --git a/app/templates/app/institutions.html b/app/templates/app/institutions.html index 0c67a994..6de15c98 100644 --- a/app/templates/app/institutions.html +++ b/app/templates/app/institutions.html @@ -6,50 +6,50 @@ {% block title %}{% trans "Institutions" %}{% endblock %} {% block content %} -{% spaceless %} -

    {% trans "Overview of institutions" %}

    -
    {# row has unwanted margin #} - {% for institution in institutions %} -
    -
    -
    -
    -

    - {{ institution.name }} -

    -

    {{ institution.abbreviation }}

    - {% if institution.project_count %} -

    - {% icon "project" %} - {% blocktrans count project_count=institution.project_count trimmed %} - {{ project_count }} project - {% plural %} - {{ project_count }} projects - {% endblocktrans %} -

    - {% endif %} - {% if institution.document_count %} -

    - {% icon "document" %} - {% blocktrans count document_count=institution.document_count trimmed %} - {{ document_count }} document - {% plural %} - {{ document_count }} documents - {% endblocktrans %} -

    - {% endif %} + {% spaceless %} +

    {% trans "Overview of institutions" %}

    +
    {# row has unwanted margin #} + {% for institution in institutions %} +
    +
    +
    +
    +

    + {{ institution.name }} +

    +

    {{ institution.abbreviation }}

    + {% if institution.project_count %} +

    + {% icon "project" %} + {% blocktrans count project_count=institution.project_count trimmed %} + {{ project_count }} project + {% plural %} + {{ project_count }} projects + {% endblocktrans %} +

    + {% endif %} + {% if institution.document_count %} +

    + {% icon "document" %} + {% blocktrans count document_count=institution.document_count trimmed %} + {{ document_count }} document + {% plural %} + {{ document_count }} documents + {% endblocktrans %} +

    + {% endif %} +
    + {% if institution.logo %} +
    + +
    + {% endif %} +
    +
    - {% if institution.logo %} -
    - -
    - {% endif %} -
    + {% endfor %}
    -
    - {% endfor %} -
    -{% endspaceless %} + {% endspaceless %} {% endblock content %} diff --git a/app/templates/app/languages.html b/app/templates/app/languages.html index b417c69a..da53d5e6 100644 --- a/app/templates/app/languages.html +++ b/app/templates/app/languages.html @@ -6,59 +6,59 @@ {% block title %}{% trans "Languages" %}{% endblock %} {% block content %} -{% spaceless %} -
    -

    {% trans "Information by language" %}

    -
    - {% for item in language_data %} -

    {{ item.language.name }}

    -
    - {% if item.documents.exists %} -

    {% trans "Documents" %}

    -
    -
      - {% for document in item.documents %} -
    • - {% icon "document" %} - {{ document.title }} -
      • - {% endfor %} -
    -
    - {% else %} + {% spaceless %} +
    +

    {% trans "Information by language" %}

    +
    + {% for item in language_data %} +

    {{ item.language.name }}

    +
    + {% if item.documents.exists %} +

    {% trans "Documents" %}

    +
    +
      + {% for document in item.documents %} +
    • + {% icon "document" %} + {{ document.title }} +
      • + {% endfor %} +
    +
    + {% else %} {# Only show this in two-column mode to ensure consistent layout and placement #} - - {% endif %} -
    -
    - {% if item.projects.exists %} -

    {% trans "Projects" %}

    -
    -
      - {% for project in item.projects %} -
    • - {% icon "project" %} - {{ project.name }} -
      • - {% endfor %} -
    -
    - {% else %} + + {% endif %} +
    +
    + {% if item.projects.exists %} +

    {% trans "Projects" %}

    +
    +
      + {% for project in item.projects %} +
    • + {% icon "project" %} + {{ project.name }} +
      • + {% endfor %} +
    +
    + {% else %} {# Only show this in two-column mode to ensure consistent layout and placement #} - - {% endif %} -
    -
    - {% endfor %} -
    + + {% endif %} +
    +
    + {% endfor %} +
    -
    +
    -{% endspaceless %} + {% endspaceless %} {% endblock content %} diff --git a/app/templates/app/legal_notices.html b/app/templates/app/legal_notices.html index 05f520b2..710eea43 100644 --- a/app/templates/app/legal_notices.html +++ b/app/templates/app/legal_notices.html @@ -3,83 +3,83 @@ {% load i18n %} {% block content %} -{% spaceless %} -
    -
    -

    {% trans "Legal Notices" %}

    -

    {% trans "Terms of use" %}

    -

    - - {% trans "The terms of use statement for the SADiLaR website and services" %} - -

    -

    {% trans "Copyright" %}

    -

    - {% blocktrans trimmed %} - Intellectual property rights concerning the materials shared via this website and the website - as such belong to the original creator or to SADiLaR. Where exceptions apply, the license - agreement governing a particular resource will be explicitly listed. - {% endblocktrans %} - {% blocktrans trimmed %} - Content included in the website is shared under the Creative Commons License Attribution - 2.0, unless indicated otherwise for specific materials. This license agreement does not allow - the inclusion of any elements contained in the website (such as images, logos, videos and - other resources) in a frame-set or an in-line link to another web page without giving due - credit to the origin of the material. - {% endblocktrans %} -

    -

    {% trans "Disclaimer" %}

    -

    - {% blocktrans trimmed %} - SADiLaR and its partners make a conscious effort to obtain copyright clearance for any - materials shared on or used in creation of the website before publication. Should you notice - any potential infringement on your own or anyone else’s intellectual property rights, we ask - that you inform us directly so that we may remove the material and/or clear any outstanding - copyright matters with the rightful owner immediately. - {% endblocktrans %} -

    -

    {% trans "Privacy Policy and Privacy Statement" %}

    -

    - {% blocktrans trimmed %} - Please find the privacy policy and privacy statement for the SADiLaR website and services here. - {% endblocktrans %} -

    -

    {% trans "Protection of Personal Information" %}

    -

    - {% blocktrans with url="https://www.nwu.ac.za/POPIA_Policy_NWU" trimmed %} - The purpose of the South African Protection of Personal Information Act 4 of 2013 (POPIA) - is to ensure responsible handling of an individual’s personal information and to hold all South - African institutions accountable should they not safeguard the collection, storing or sharing - of such information against possible abuse in any way. SADiLaR is strongly committed to - protecting personal information/data and strives to adhere to the - guidelines - as set out by the host institution for the Centre, the North-West University. - {% endblocktrans %} -

    -

    {% trans "Use of cookies" %}

    -

    - {% blocktrans with url="https://www.nwu.ac.za/POPIA_Policy_NWU" trimmed %} - Cookies are data saved on the device with which you access this website to customise your - experience or provide essential functions of the website such as enabling you to log in to - secure areas, e.g. the Repository. You can learn more about the different types of cookies - and how to disable non-essential cookies here. - {% endblocktrans %} -

    -

    - {% blocktrans trimmed %} - By using the SADiLaR website, you consent to our use of cookies and storage thereof on - your device. Should you not accept our use of cookies (or your browser is set to block all - cookies), your ability to access all functions on this website might be impaired. - {% endblocktrans %} -

    -

    {% trans "User support" %}

    -

    - {% blocktrans with address="info@sadilar.org" trimmed %} - Any questions concerning the website or services offered via the website can be addressed - to SADiLaR via email to {{ address }}. - {% endblocktrans %} -

    -
    -
    -{% endspaceless %} + {% spaceless %} +
    +
    +

    {% trans "Legal Notices" %}

    +

    {% trans "Terms of use" %}

    +

    + + {% trans "The terms of use statement for the SADiLaR website and services" %} + +

    +

    {% trans "Copyright" %}

    +

    + {% blocktrans trimmed %} + Intellectual property rights concerning the materials shared via this website and the website + as such belong to the original creator or to SADiLaR. Where exceptions apply, the license + agreement governing a particular resource will be explicitly listed. + {% endblocktrans %} + {% blocktrans trimmed %} + Content included in the website is shared under the Creative Commons License Attribution + 2.0, unless indicated otherwise for specific materials. This license agreement does not allow + the inclusion of any elements contained in the website (such as images, logos, videos and + other resources) in a frame-set or an in-line link to another web page without giving due + credit to the origin of the material. + {% endblocktrans %} +

    +

    {% trans "Disclaimer" %}

    +

    + {% blocktrans trimmed %} + SADiLaR and its partners make a conscious effort to obtain copyright clearance for any + materials shared on or used in creation of the website before publication. Should you notice + any potential infringement on your own or anyone else’s intellectual property rights, we ask + that you inform us directly so that we may remove the material and/or clear any outstanding + copyright matters with the rightful owner immediately. + {% endblocktrans %} +

    +

    {% trans "Privacy Policy and Privacy Statement" %}

    +

    + {% blocktrans trimmed %} + Please find the privacy policy and privacy statement for the SADiLaR website and services here. + {% endblocktrans %} +

    +

    {% trans "Protection of Personal Information" %}

    +

    + {% blocktrans with url="https://www.nwu.ac.za/POPIA_Policy_NWU" trimmed %} + The purpose of the South African Protection of Personal Information Act 4 of 2013 (POPIA) + is to ensure responsible handling of an individual’s personal information and to hold all South + African institutions accountable should they not safeguard the collection, storing or sharing + of such information against possible abuse in any way. SADiLaR is strongly committed to + protecting personal information/data and strives to adhere to the + guidelines + as set out by the host institution for the Centre, the North-West University. + {% endblocktrans %} +

    +

    {% trans "Use of cookies" %}

    +

    + {% blocktrans with url="https://www.nwu.ac.za/POPIA_Policy_NWU" trimmed %} + Cookies are data saved on the device with which you access this website to customise your + experience or provide essential functions of the website such as enabling you to log in to + secure areas, e.g. the Repository. You can learn more about the different types of cookies + and how to disable non-essential cookies here. + {% endblocktrans %} +

    +

    + {% blocktrans trimmed %} + By using the SADiLaR website, you consent to our use of cookies and storage thereof on + your device. Should you not accept our use of cookies (or your browser is set to block all + cookies), your ability to access all functions on this website might be impaired. + {% endblocktrans %} +

    +

    {% trans "User support" %}

    +

    + {% blocktrans with address="info@sadilar.org" trimmed %} + Any questions concerning the website or services offered via the website can be addressed + to SADiLaR via email to {{ address }}. + {% endblocktrans %} +

    +
    +
    + {% endspaceless %} {% endblock content %} diff --git a/app/templates/app/project_detail.html b/app/templates/app/project_detail.html index e7656623..3ab1ef04 100644 --- a/app/templates/app/project_detail.html +++ b/app/templates/app/project_detail.html @@ -6,82 +6,82 @@ {% block title %}{{ project.name }}{% endblock %} {% block content %} -{% spaceless %} -
    -

    {% trans "Projects" %} > {{ project.name }}

    + {% spaceless %} +
    +

    {% trans "Projects" %} > {{ project.name }}

    -
    +
    {# incorrect indent facilitates comparison with document_detail.html #} - -
    - {% if logo %} - - {% endif %} -
    +
    + {% if logo %} + + {% endif %} +
    -
    +
    -
    - {% if subjects %} -
    -

    {% trans "Subjects" %}

    -
      - {% for subject in subjects %} -
    • {% icon "subject" %}{{ subject.name }}
      • - {% endfor %} -
    -
    - {% endif %} +
    + {% if subjects %} +
    +

    {% trans "Subjects" %}

    +
      + {% for subject in subjects %} +
    • {% icon "subject" %}{{ subject.name }}
      • + {% endfor %} +
    +
    + {% endif %} - {% if languages %} -
    -

    {% trans "Languages" %}

    -
      - {% for language in languages %} -
    • {% icon "language" %}{{ language.name }}
      • - {% endfor %} -
    -
    - {% endif %} + {% if languages %} +
    +

    {% trans "Languages" %}

    +
      + {% for language in languages %} +
    • {% icon "language" %}{{ language.name }}
      • + {% endfor %} +
    +
    + {% endif %} -
    +
    -
    +
    -{% endspaceless %} + {% endspaceless %} {% endblock content %} diff --git a/app/templates/app/projects.html b/app/templates/app/projects.html index 64a21c6a..0c98270c 100644 --- a/app/templates/app/projects.html +++ b/app/templates/app/projects.html @@ -6,67 +6,67 @@ {% block title %}{% trans "Projects" %}{% endblock %} {% block content %} -{% spaceless %} -
    -

    {% trans "Projects" %}

    + {% spaceless %} +
    +

    {% trans "Projects" %}

    - {% include "app/_subj_lang_institution_filter.html" with view="projects" %} + {% include "app/_subj_lang_institution_filter.html" with view="projects" %} - {% for item in projects %} -
    {# container adds unwanted padding #} + {% for item in projects %} +
    {# container adds unwanted padding #} -
    -
    {# "wrong" indent simplifies comparison with documents.html #} -

    - - {{ item.project.name }} - -

    - {% if item.project.url %} - - {% endif %} -
    - {{ item.institution_name }} -
    +
    +
    {# "wrong" indent simplifies comparison with documents.html #} +

    + + {{ item.project.name }} + +

    + {% if item.project.url %} + + {% endif %} +
    + {{ item.institution_name }} +
    -
    -
    - {% if item.logo %} - - {% endif %} -
    -
    +
    +
    + {% if item.logo %} + + {% endif %} +
    +
    -
    -

    - {{ item.description|truncatewords:30 }} - {% trans "Read more" %} -

    +
    +

    + {{ item.description|truncatewords:30 }} + {% trans "Read more" %} +

    - {% if item.languages %} -
    {% icon "language" %} {{ item.languages }}
    - {% endif %} + {% if item.languages %} +
    {% icon "language" %} {{ item.languages }}
    + {% endif %} - {% if item.subjects %} -
    {% icon "subject" %} {{ item.subjects }}
    - {% endif %} + {% if item.subjects %} +
    {% icon "subject" %} {{ item.subjects }}
    + {% endif %} - {% if item.date %} -
    {% icon "date" %} {{ item.date }}
    - {% endif %} + {% if item.date %} +
    {% icon "date" %} {{ item.date }}
    + {% endif %} -
    +
    -
    - {% endfor %} +
    + {% endfor %} -
    -{% endspaceless %} +
    + {% endspaceless %} {% endblock content %} diff --git a/app/templates/app/search.html b/app/templates/app/search.html index c3ba9eb6..48c632a4 100644 --- a/app/templates/app/search.html +++ b/app/templates/app/search.html @@ -14,43 +14,43 @@ {% block title %}{{ request.GET.search }} - {% trans "Search" %}{% endblock %} {% block content %} -{% spaceless %} -
    -

    {% trans "Search and filter for information" %}

    -
    -
    + {% spaceless %} +
    +

    {% trans "Search and filter for information" %}

    + +
    {# Search #} -
    - -
    - -
    -
    - - {% trans 'Reset' %} -
    - {% if page_obj.paginator.num_pages > 1 %} -
    - {% trans "Filter results below" %} -
    - {% endif %} -
    -{% endspaceless %} +
    + +
    + +
    +
    + + {% trans 'Reset' %} +
    + {% if page_obj.paginator.num_pages > 1 %} +
    + {% trans "Filter results below" %} +
    + {% endif %} +
    + {% endspaceless %} {# Results #} -
    - {% for result in page_obj %} -{% spaceless %} +
    + {% for result in page_obj %} + {% spaceless %}

    @@ -60,63 +60,63 @@

    {% if result.associated_url %} - - {{ result.associated_url }} - + + {{ result.associated_url }} + {% endif %} {% if result.extra %} -

    {{ result.extra|truncatewords:20 }}

    - {% endif %} -{% endspaceless %} - {% if result.search_headline.strip %} -
    -

    … {{ result.search_headline|safe }} …

    -
    +

    {{ result.extra|truncatewords:20 }}

    {% endif %} + {% endspaceless %} + {% if result.search_headline.strip %} +
    +

    … {{ result.search_headline|safe }} …

    +
    + {% endif %} {% comment "Left for debugging of search ranking" %}

    {{ result.rank }}

    {% endcomment %} -
    - {% if result.logo_url %} -
    - -
    - {% endif %} +
    + {% if result.logo_url %} +
    +
    - {% empty %} -

    {% trans "No results." %}

    - {% endfor %} -
    + {% endif %} +
    + {% empty %} +

    {% trans "No results." %}

    + {% endfor %} + {# Pagination #} - {% include "app/_pagination.html" %} + {% include "app/_pagination.html" %} -
    +
    {# Filters #} -{% spaceless %} + {% spaceless %} {% if request.htmx.target != "search-main" %} -
    {# target for link at the top #} -

    {% trans "Filters" %}

    -
    - {% with form=filter.form %} - {% include "app/_search_filter.html" with field=form.institution summary=_("Filter by institution") %} - {% include "app/_search_filter.html" with field=form.subjects summary=_("Filter by subject") %} - {% include "app/_search_filter.html" with field=form.languages summary=_("Filter by language") %} - {% endwith %} -
    - {% trans "Alter search terms above" %} +
    {# target for link at the top #} +

    {% trans "Filters" %}

    +
    + {% with form=filter.form %} + {% include "app/_search_filter.html" with field=form.institution summary=_("Filter by institution") %} + {% include "app/_search_filter.html" with field=form.subjects summary=_("Filter by subject") %} + {% include "app/_search_filter.html" with field=form.languages summary=_("Filter by language") %} + {% endwith %} +
    + {% trans "Alter search terms above" %} +
    -
    - - {% trans 'Reset' %} -
    + + {% trans 'Reset' %} + {% endif %} -
    -
    -{% endspaceless %} + +
    + {% endspaceless %} {% endblock content %} diff --git a/app/templates/app/subjects.html b/app/templates/app/subjects.html index d143eb6f..e8def3c3 100644 --- a/app/templates/app/subjects.html +++ b/app/templates/app/subjects.html @@ -6,60 +6,60 @@ {% block title %}{% trans "Subjects" %}{% endblock %} {% block content %} -{% spaceless %} -
    -

    {% trans "Information by subject" %}

    -
    - {% for item in subject_data %} -

    {{ item.subject.name }}

    -
    - {% if item.documents.exists %} -

    {% trans "Documents" %}

    -
    -
      - {% for document in item.documents %} -
    • - {% icon "document" %} - {{ document.title }} -
      • - {% endfor %} -
    -
    - {% else %} + {% spaceless %} +
    +

    {% trans "Information by subject" %}

    +
    + {% for item in subject_data %} +

    {{ item.subject.name }}

    +
    + {% if item.documents.exists %} +

    {% trans "Documents" %}

    +
    +
      + {% for document in item.documents %} +
    • + {% icon "document" %} + {{ document.title }} +
      • + {% endfor %} +
    +
    + {% else %} {# Only show this in two-column mode to ensure consistent layout and placement #} - - {% endif %} -
    -
    - {% if item.projects.exists %} -

    {% trans "Projects" %}

    -
    -
      - {% for project in item.projects %} -
    • - {% icon "project" %} - {{ project.name }} -
      • - {% endfor %} -
    -
    - {% else %} + + {% endif %} +
    +
    + {% if item.projects.exists %} +

    {% trans "Projects" %}

    +
    +
      + {% for project in item.projects %} +
    • + {% icon "project" %} + {{ project.name }} +
      • + {% endfor %} +
    +
    + {% else %} {# Only show this in two-column mode to ensure consistent layout and placement #} - - {% endif %} -
    -
    - {% endfor %} -
    + + {% endif %} +
    +
    + {% endfor %} +
    - {% include "app/_pagination.html" %} + {% include "app/_pagination.html" %} -
    -{% endspaceless %} +
    + {% endspaceless %} {% endblock content %} diff --git a/app/templates/base.html b/app/templates/base.html index c736d04c..79e9f63e 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -2,135 +2,135 @@ {% load i18n %} {% load bs_icons %} {% spaceless %} - - - - {% block title %}{% trans "LwimiLinks" %}{% endblock %} - - - - - - + + + + {% block title %}{% trans "LwimiLinks" %}{% endblock %} + + + + + + {# htmx JS at the end of body seems to create problems when navigating through browser history #} - - - - + + + + - -
    -{% block header %} -
    - -{% endblock header %} -
    + +
    + {% block header %} +
    + + {% endblock header %} +
    -{% block error %} + {% block error %} {# Render the error block hidden, so that it can be updated on the front-end. #} - -{% endblock error %} + + {% endblock error %} {% endspaceless %}
    -{% block content %} + {% block content %} {% comment %} The content block should probably be overridden by all pages. The `aria-labelledby` means this base template expects some element with id="main-heading" in the child template, otherwise this is invalid HTML. {% endcomment %} -{% endblock content %} + {% endblock content %}
    {% spaceless %} - {% endspaceless %} {% if debug %} {% load django_htmx %} {% django_htmx_script %} {% endif %} {% if debug_toolbar %} - + {% endif %} diff --git a/app/templates/base_error.html b/app/templates/base_error.html index 1a18e526..b0786de3 100644 --- a/app/templates/base_error.html +++ b/app/templates/base_error.html @@ -5,7 +5,7 @@ {% block title %}{% trans "Error" %}{% endblock %} {% block error %} -{% with show_error=True%} - {{ block.super }} -{% endwith %} + {% with show_error=True%} + {{ block.super }} + {% endwith %} {% endblock %} diff --git a/app/templates/base_htmx.html b/app/templates/base_htmx.html index 28dd7c40..54aa5049 100644 --- a/app/templates/base_htmx.html +++ b/app/templates/base_htmx.html @@ -1,9 +1,9 @@ {% load i18n %} {% spaceless %} -{# Required for HTMX title swapping to work #} - - {% block title %}{% trans "LwimiLinks" %}{% endblock %} - + {# Required for HTMX title swapping to work #} + + {% block title %}{% trans "LwimiLinks" %}{% endblock %} + {% comment %} Some elements outside of
    might need to be updated. @@ -13,25 +13,25 @@ document title is automatically swapped by HTMX. {% endcomment %} -{% include "app/_navbar_items.html" %} + {% include "app/_navbar_items.html" %} -{% block error %} - {% if show_error %} -

    {% block error_title %}{% endblock %}

    -

    {% block error_message %}{% endblock %}

    - {% endif %} -{% endblock %} + {% block error %} + {% if show_error %} +

    {% block error_title %}{% endblock %}

    +

    {% block error_message %}{% endblock %}

    + {% endif %} + {% endblock %} {% endspaceless %}
    -{% block content %}{# See notes in base.html #}{% endblock content %} + {% block content %}{# See notes in base.html #}{% endblock content %}
    {% spaceless %} -{% if debug_toolbar %} - -{% endif %} + {% if debug_toolbar %} + + {% endif %} {% endspaceless %} diff --git a/app/templates/django/forms/field.html b/app/templates/django/forms/field.html index 2df6154a..1b11c36f 100644 --- a/app/templates/django/forms/field.html +++ b/app/templates/django/forms/field.html @@ -6,16 +6,16 @@ - bootstrap classes {% endcomment %} {% spaceless %} -
    -{% if field.use_fieldset %} -
    - {% if field.label %}{{ field.legend_tag }}{% endif %} -{% else %} - {% if field.label %}{{ field.label_tag }}{% endif %} -{% endif %} -{{ field.errors }} -{{ field }} -{% if field.help_text %}
    {{ field.help_text|safe }}
    {% endif %} -{% if field.use_fieldset %}
    {% endif %} -
    +
    + {% if field.use_fieldset %} +
    + {% if field.label %}{{ field.legend_tag }}{% endif %} + {% else %} + {% if field.label %}{{ field.label_tag }}{% endif %} + {% endif %} + {{ field.errors }} + {{ field }} + {% if field.help_text %}
    {{ field.help_text|safe }}
    {% endif %} + {% if field.use_fieldset %}
    {% endif %} +
    {% endspaceless %} diff --git a/app/templates/registration/login.html b/app/templates/registration/login.html index 10968cca..01cd7ddc 100644 --- a/app/templates/registration/login.html +++ b/app/templates/registration/login.html @@ -4,17 +4,17 @@ {% block title %}{% trans "Log In" %}{% endblock %} {% block account_content %} -

    {% trans "Log In" %}

    -
    - {% csrf_token %} - {{ form }} - {% trans "Forgot Password?" %} - -
    +

    {% trans "Log In" %}

    +
    + {% csrf_token %} + {{ form }} + {% trans "Forgot Password?" %} + +
    -
    -

    - {% trans "Don’t have an account?" %} - {% trans "Create one" %} -

    +
    +

    + {% trans "Don’t have an account?" %} + {% trans "Create one" %} +

    {% endblock %} diff --git a/app/templates/registration/password_change_done.html b/app/templates/registration/password_change_done.html index 24d2f913..2959b41c 100644 --- a/app/templates/registration/password_change_done.html +++ b/app/templates/registration/password_change_done.html @@ -4,6 +4,6 @@ {% block title %}{% trans "Password change successful" %}{% endblock %} {% block account_content %} -

    {% trans "Password change successful" %}

    -

    {% trans "Your password was changed." %} +

    {% trans "Password change successful" %}

    +

    {% trans "Your password was changed." %} {% endblock %} diff --git a/app/templates/registration/password_change_form2.html b/app/templates/registration/password_change_form2.html index 762359ed..248e2630 100644 --- a/app/templates/registration/password_change_form2.html +++ b/app/templates/registration/password_change_form2.html @@ -4,16 +4,16 @@ {% block title %}{% trans "Enter new password" %}{% endblock %} {% block account_content %} -

    {% trans "Enter new password" %}

    -

    - {% blocktrans trimmed %} - Please enter your old password, for security’s sake, and then enter your new - password twice so we can verify you typed it in correctly. - {% endblocktrans %} -

    -
    - {% csrf_token %} - {{ form }} - -
    +

    {% trans "Enter new password" %}

    +

    + {% blocktrans trimmed %} + Please enter your old password, for security’s sake, and then enter your new + password twice so we can verify you typed it in correctly. + {% endblocktrans %} +

    +
    + {% csrf_token %} + {{ form }} + +
    {% endblock %} diff --git a/app/templates/registration/password_reset_complete.html b/app/templates/registration/password_reset_complete.html index 2dc8c0d7..67d8ff45 100644 --- a/app/templates/registration/password_reset_complete.html +++ b/app/templates/registration/password_reset_complete.html @@ -4,9 +4,9 @@ {% block title %}{% trans "Password reset complete" %}{% endblock %} {% block account_content %} -

    {% trans "Password was successfully set" %}

    -

    {% trans "Your password has been set. You may go ahead and log in now." %}

    -

    - {% trans "Log in" %} -

    +

    {% trans "Password was successfully set" %}

    +

    {% trans "Your password has been set. You may go ahead and log in now." %}

    +

    + {% trans "Log in" %} +

    {% endblock %} diff --git a/app/templates/registration/password_reset_confirm.html b/app/templates/registration/password_reset_confirm.html index 4ab6510f..66f48f6b 100644 --- a/app/templates/registration/password_reset_confirm.html +++ b/app/templates/registration/password_reset_confirm.html @@ -5,22 +5,22 @@ {% block account_content %} {% if validlink %} -

    {% trans "Enter new password" %}

    -

    {% trans "Please enter your new password twice so we can verify you typed it in correctly." %}

    +

    {% trans "Enter new password" %}

    +

    {% trans "Please enter your new password twice so we can verify you typed it in correctly." %}

    -
    {% csrf_token %} - {{ form }} - -
    +
    {% csrf_token %} + {{ form }} + +
    {% else %} -

    {% trans "Password reset link was invalid" %}

    -

    - {% blocktrans trimmed %} - The password reset link was invalid, possibly because it has - already been used. Please request a new password reset. - {% endblocktrans %} -

    +

    {% trans "Password reset link was invalid" %}

    +

    + {% blocktrans trimmed %} + The password reset link was invalid, possibly because it has + already been used. Please request a new password reset. + {% endblocktrans %} +

    {% endif %} {% endblock %} diff --git a/app/templates/registration/password_reset_done.html b/app/templates/registration/password_reset_done.html index 390d970d..f5564b70 100644 --- a/app/templates/registration/password_reset_done.html +++ b/app/templates/registration/password_reset_done.html @@ -4,17 +4,17 @@ {% block title %}Password reset sent{% endblock %} {% block account_content %} -

    {% trans "Password reset sent" %}

    -

    - {% blocktrans trimmed %} - We’ve emailed you instructions for setting your password, if an account - exists with the email you entered. You should receive them shortly. - {% endblocktrans %} -

    -

    - {% blocktrans trimmed %} - If you don’t receive an email, please make sure you’ve entered the address - you registered with, and check your spam folder. - {% endblocktrans %} -

    +

    {% trans "Password reset sent" %}

    +

    + {% blocktrans trimmed %} + We’ve emailed you instructions for setting your password, if an account + exists with the email you entered. You should receive them shortly. + {% endblocktrans %} +

    +

    + {% blocktrans trimmed %} + If you don’t receive an email, please make sure you’ve entered the address + you registered with, and check your spam folder. + {% endblocktrans %} +

    {% endblock %} diff --git a/app/templates/registration/password_reset_form.html b/app/templates/registration/password_reset_form.html index 29277340..2b3f5306 100644 --- a/app/templates/registration/password_reset_form.html +++ b/app/templates/registration/password_reset_form.html @@ -4,16 +4,16 @@ {% block title %}{% trans "Password reset" %}{% endblock %} {% block account_content %} -

    {% trans "Password reset" %}

    -

    - {% blocktrans trimmed %} - Forgotten your password? Enter your email address below, and we’ll email - instructions for setting a new one. - {% endblocktrans %} -

    -
    - {% csrf_token %} - {{ form }} - -
    +

    {% trans "Password reset" %}

    +

    + {% blocktrans trimmed %} + Forgotten your password? Enter your email address below, and we’ll email + instructions for setting a new one. + {% endblocktrans %} +

    +
    + {% csrf_token %} + {{ form }} + +
    {% endblock %} diff --git a/app/templates/registration/register.html b/app/templates/registration/register.html index 79880100..d1697da2 100644 --- a/app/templates/registration/register.html +++ b/app/templates/registration/register.html @@ -4,10 +4,10 @@ {% block title %}{% trans "Register" %}{% endblock %} {% block account_content %} -

    {% trans "Register" %}

    -
    - {% csrf_token %} - {{ form }} - -
    +

    {% trans "Register" %}

    +
    + {% csrf_token %} + {{ form }} + +
    {% endblock %} diff --git a/app/templates/registration/registration_base.html b/app/templates/registration/registration_base.html index d72902b7..ba95a223 100644 --- a/app/templates/registration/registration_base.html +++ b/app/templates/registration/registration_base.html @@ -1,14 +1,14 @@ {% extends BASE_TEMPLATE %} {% spaceless %} -{% block content %} -
    -
    -
    - {% block account_content%} - {% endblock %} + {% block content %} +
    +
    +
    + {% block account_content%} + {% endblock %} +
    +
    -
    -
    -{% endblock %} + {% endblock %} {% endspaceless %}