From b5b0a567e7c74a38f63d17f2f2ff1ef8049f2cbb Mon Sep 17 00:00:00 2001 From: krmax44 Date: Fri, 1 Nov 2024 13:24:36 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20add=20`.alert-link`=20to=20links?= =?UTF-8?q?=20in=20alerts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/foirequest/attachment/show.html | 5 ++--- .../templates/foirequest/header/header.html | 14 +++++++++----- .../foirequest/templates/foirequest/request.html | 2 +- froide/foisite/templates/foisite/banner.html | 2 +- .../templates/publicbody/show_foilaw.html | 9 ++++++--- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/froide/foirequest/templates/foirequest/attachment/show.html b/froide/foirequest/templates/foirequest/attachment/show.html index 95a83eb1d..015ea57f1 100644 --- a/froide/foirequest/templates/foirequest/attachment/show.html +++ b/froide/foirequest/templates/foirequest/attachment/show.html @@ -25,9 +25,8 @@

{% blocktrans with name=attachment.name %}Attachment “{{ name }}”{% endb {% if foirequest|can_write_foirequest:request or foirequest|can_moderate_pii_foirequest:request %} {% if foirequest.awaits_classification %} {% endif %} {% if attachment.can_redact %} diff --git a/froide/foirequest/templates/foirequest/header/header.html b/froide/foirequest/templates/foirequest/header/header.html index 7165607fd..42b201185 100644 --- a/froide/foirequest/templates/foirequest/header/header.html +++ b/froide/foirequest/templates/foirequest/header/header.html @@ -35,12 +35,15 @@

{% trans "Special access" %}

  • {% blocktrans %}Have you received a reply by postal mail?{% endblocktrans %} → - {% translate "Upload the letter now!" %} + {% translate "Upload the letter now!" %}
  • {% blocktrans %}Have you not gotten any reply?{% endblocktrans %} → - {% translate "Write a reminder to the public body!" %} + {% translate "Write a reminder to the public body!" %}
  • {% block aditional_actions %}{% endblock %} @@ -49,9 +52,10 @@

    {% trans "Special access" %}

    {% if object|can_write_foirequest:request and object.has_been_refused and object.can_be_escalated %}
    {% blocktrans %}You request has been refused.{% endblocktrans %} - - {% blocktrans %}Consider sending a letter to a mediator{% endblocktrans %} - + {% blocktrans %}Consider sending a letter to a mediator{% endblocktrans %}
    {% endif %} {% if object.banner %}
    {{ object.banner | markdown }}
    {% endif %} diff --git a/froide/foirequest/templates/foirequest/request.html b/froide/foirequest/templates/foirequest/request.html index 98e0eef9c..a0da34fb5 100644 --- a/froide/foirequest/templates/foirequest/request.html +++ b/froide/foirequest/templates/foirequest/request.html @@ -119,7 +119,7 @@
    {% blocktrans %}Important Notes:{% endblocktrans %}
    {% if not request.user.is_authenticated %}
    - {% trans "You have to login or signup first in order to make a request." %} + {% trans "You have to login or signup first in order to make a request." %}
    {% else %} {% if publicbodies %} diff --git a/froide/foisite/templates/foisite/banner.html b/froide/foisite/templates/foisite/banner.html index b83a08d17..5c7cf5d91 100644 --- a/froide/foisite/templates/foisite/banner.html +++ b/froide/foisite/templates/foisite/banner.html @@ -4,7 +4,7 @@ {% if foisite %}
    - {% blocktrans with name=foisite.name country_name=foisite.country_name url=foisite.url %}It looks like you are visiting from {{ country_name }}. Did you know that there is an FOI site for {{ country_name }} called {{ name }}?{% endblocktrans %} + {% blocktrans with name=foisite.name country_name=foisite.country_name url=foisite.url %}It looks like you are visiting from {{ country_name }}. Did you know that there is an FOI site for {{ country_name }} called {{ name }}?{% endblocktrans %}
    {% endif %} diff --git a/froide/publicbody/templates/publicbody/show_foilaw.html b/froide/publicbody/templates/publicbody/show_foilaw.html index 4aae431a1..fea0ad83c 100644 --- a/froide/publicbody/templates/publicbody/show_foilaw.html +++ b/froide/publicbody/templates/publicbody/show_foilaw.html @@ -60,9 +60,12 @@

    {{ object.name }}