Skip to content
Merged
3 changes: 3 additions & 0 deletions fragdenstaat_de/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,7 @@ def FROIDE_CONFIG(self):
"create_new_publicbody": False,
"publicbody_empty": True,
"user_can_hide_web": True,
"user_can_claim_vip": True,
"public_body_officials_public": False,
"public_body_officials_email_public": False,
"default_law": 2,
Expand Down Expand Up @@ -794,6 +795,8 @@ def FROIDE_CONFIG(self):
"throttled": "/hilfe/erste-anfrage/wie-viele-anfragen-kann-ich-stellen/",
"help_postupload_redaction": "/hilfe/plain/funktionen-der-plattform/schwaerzungen-durchfuehren/",
"help_attachments_management": "/hilfe/plain/funktionen-der-plattform/anhange-verwalten/",
"help_request_public": "/hilfe/plain/funktionen-der-plattform/anfrage-nicht-oeffentlich-stellen/",
"help_request_privacy": "/hilfe/datenschutz-und-privatsphare/", # not /plain/, regular link
},
"mobile_app_install_url": "TODO", # TODO
"mobile_app_content_url": "/app/scanner/postupload/message/{}/",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{% load i18n %}
{% load djangocms_alias_tags %}
{% static_alias "request_campaign_main" %}
{% comment %}

to match froide's layout, in CMS, build:

- Bild, with Attribute
class=campaign-logo d-block object-fit-contain w-100 mb-3
- Überschrift, h2, with Attribute
class=fs-4
- Text, containg an <ul>

or, FIXME: replace the alias with markup:

<img src="todo" alt="" class="class=campaign-logo d-block object-fit-contain w-100 mb-3">
<h2 class="fs-4">Eigene Anfrage schreiben</h2>
<ul>
<li>And so on</li>
</ul>

{% endcomment %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{% load djangocms_alias_tags %}
{% static_alias "request_campaign_other" %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{% load djangocms_alias_tags %}
{% static_alias "request_intro_howto" %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{% load djangocms_alias_tags %}
{% comment %}
provide the required indicator (red asterisk) in the static_alias if it contains p/div/ul
{% endcomment %}
{% static_alias "request_user_confirm" %}
2 changes: 2 additions & 0 deletions frontend/javascript/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import 'froide/frontend/javascript/snippets/share-links'
import 'froide/frontend/javascript/snippets/inline-edit-forms'
import 'froide/frontend/javascript/snippets/color-mode'
import { initSearch } from 'froide/frontend/javascript/snippets/search'
import { purgeStorageAfterLogout } from 'froide/frontend/javascript/snippets/purgestorage.ts'

import './donation-form'
import './magnifier'
Expand All @@ -26,5 +27,6 @@ if (document.body.dataset.sentry !== undefined) {
}

document.addEventListener('DOMContentLoaded', () => {
purgeStorageAfterLogout()
initSearch([['recherchen', '/artikel/suche/']])
})
20 changes: 10 additions & 10 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ filelock==3.19.1
# virtualenv
fonttools==4.60.0
# via weasyprint
froide @ git+https://github.com/okfde/froide.git@cade39e24835ee07c6bd3134e65e6a6334a1e037
froide @ git+https://github.com/okfde/froide.git@d0d5c7c079cdc2b63ab5589531a945bb78b10f08
# via fragdenstaat-de (pyproject.toml)
froide-campaign @ git+https://github.com/okfde/froide-campaign.git@caede728d94fe7b08437e4ae3229d7222b6a104b
# via fragdenstaat-de (pyproject.toml)
Expand Down
2 changes: 1 addition & 1 deletion requirements-production.txt
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ filelock==3.19.1
# via torch
fonttools==4.60.0
# via weasyprint
froide @ git+https://github.com/okfde/froide.git@cade39e24835ee07c6bd3134e65e6a6334a1e037
froide @ git+https://github.com/okfde/froide.git@d0d5c7c079cdc2b63ab5589531a945bb78b10f08
# via fragdenstaat-de (pyproject.toml)
froide-campaign @ git+https://github.com/okfde/froide-campaign.git@caede728d94fe7b08437e4ae3229d7222b6a104b
# via fragdenstaat-de (pyproject.toml)
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ filelock==3.19.1
# via torch
fonttools==4.60.0
# via weasyprint
froide @ git+https://github.com/okfde/froide.git@cade39e24835ee07c6bd3134e65e6a6334a1e037
froide @ git+https://github.com/okfde/froide.git@d0d5c7c079cdc2b63ab5589531a945bb78b10f08
# via fragdenstaat-de (pyproject.toml)
froide-campaign @ git+https://github.com/okfde/froide-campaign.git@caede728d94fe7b08437e4ae3229d7222b6a104b
# via fragdenstaat-de (pyproject.toml)
Expand Down