diff --git a/fragdenstaat_de/settings/base.py b/fragdenstaat_de/settings/base.py
index 9d835c0d8..eb60da38d 100644
--- a/fragdenstaat_de/settings/base.py
+++ b/fragdenstaat_de/settings/base.py
@@ -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,
@@ -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/{}/",
diff --git a/fragdenstaat_de/templates/foirequest/snippets/request_campaign_main.html b/fragdenstaat_de/templates/foirequest/snippets/request_campaign_main.html
new file mode 100644
index 000000000..3cfd9612b
--- /dev/null
+++ b/fragdenstaat_de/templates/foirequest/snippets/request_campaign_main.html
@@ -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
+
+or, FIXME: replace the alias with markup:
+
+
+Eigene Anfrage schreiben
+
+
+{% endcomment %}
diff --git a/fragdenstaat_de/templates/foirequest/snippets/request_campaign_other.html b/fragdenstaat_de/templates/foirequest/snippets/request_campaign_other.html
new file mode 100644
index 000000000..ddd2ebd8f
--- /dev/null
+++ b/fragdenstaat_de/templates/foirequest/snippets/request_campaign_other.html
@@ -0,0 +1,2 @@
+{% load djangocms_alias_tags %}
+{% static_alias "request_campaign_other" %}
diff --git a/fragdenstaat_de/templates/foirequest/snippets/request_intro_howto.html b/fragdenstaat_de/templates/foirequest/snippets/request_intro_howto.html
new file mode 100644
index 000000000..1f83eafb5
--- /dev/null
+++ b/fragdenstaat_de/templates/foirequest/snippets/request_intro_howto.html
@@ -0,0 +1,2 @@
+{% load djangocms_alias_tags %}
+{% static_alias "request_intro_howto" %}
diff --git a/fragdenstaat_de/templates/foirequest/snippets/request_user_confirm.html b/fragdenstaat_de/templates/foirequest/snippets/request_user_confirm.html
new file mode 100644
index 000000000..6b6b6f008
--- /dev/null
+++ b/fragdenstaat_de/templates/foirequest/snippets/request_user_confirm.html
@@ -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" %}
diff --git a/frontend/javascript/main.ts b/frontend/javascript/main.ts
index 2c918d989..875fe1c5f 100644
--- a/frontend/javascript/main.ts
+++ b/frontend/javascript/main.ts
@@ -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'
@@ -26,5 +27,6 @@ if (document.body.dataset.sentry !== undefined) {
}
document.addEventListener('DOMContentLoaded', () => {
+ purgeStorageAfterLogout()
initSearch([['recherchen', '/artikel/suche/']])
})
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 404e6d5ed..e9ce5dd66 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -40,16 +40,16 @@ importers:
version: 4.7.0
froide:
specifier: github:okfde/froide
- version: https://codeload.github.com/okfde/froide/tar.gz/cade39e24835ee07c6bd3134e65e6a6334a1e037(fuse.js@7.1.0)(typescript@5.9.2)
+ version: https://codeload.github.com/okfde/froide/tar.gz/d0d5c7c079cdc2b63ab5589531a945bb78b10f08(fuse.js@7.1.0)(typescript@5.9.2)
froide_campaign:
specifier: github:okfde/froide-campaign
- version: https://codeload.github.com/okfde/froide-campaign/tar.gz/caede728d94fe7b08437e4ae3229d7222b6a104b(froide@https://codeload.github.com/okfde/froide/tar.gz/cade39e24835ee07c6bd3134e65e6a6334a1e037(fuse.js@7.1.0)(typescript@5.9.2))(typescript@5.9.2)
+ version: https://codeload.github.com/okfde/froide-campaign/tar.gz/caede728d94fe7b08437e4ae3229d7222b6a104b(froide@https://codeload.github.com/okfde/froide/tar.gz/d0d5c7c079cdc2b63ab5589531a945bb78b10f08(fuse.js@7.1.0)(typescript@5.9.2))(typescript@5.9.2)
froide_exam:
specifier: github:okfde/froide-exam
version: https://codeload.github.com/okfde/froide-exam/tar.gz/779005ccfc21a3e75aeb57eb486c91b670739a3c
froide_food:
specifier: github:okfde/froide-food
- version: https://codeload.github.com/okfde/froide-food/tar.gz/a70bfc44e56e5d2338dc4ba3111ed376152d550b(@types/leaflet@1.9.20)(froide@https://codeload.github.com/okfde/froide/tar.gz/cade39e24835ee07c6bd3134e65e6a6334a1e037(fuse.js@7.1.0)(typescript@5.9.2))(typescript@5.9.2)
+ version: https://codeload.github.com/okfde/froide-food/tar.gz/a70bfc44e56e5d2338dc4ba3111ed376152d550b(@types/leaflet@1.9.20)(froide@https://codeload.github.com/okfde/froide/tar.gz/d0d5c7c079cdc2b63ab5589531a945bb78b10f08(fuse.js@7.1.0)(typescript@5.9.2))(typescript@5.9.2)
froide_legalaction:
specifier: github:okfde/froide-legalaction
version: https://codeload.github.com/okfde/froide-legalaction/tar.gz/fdcfec87724c7388d22d6377bcce9feb7de88662
@@ -1574,8 +1574,8 @@ packages:
fraction.js@4.3.7:
resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==}
- froide@https://codeload.github.com/okfde/froide/tar.gz/cade39e24835ee07c6bd3134e65e6a6334a1e037:
- resolution: {tarball: https://codeload.github.com/okfde/froide/tar.gz/cade39e24835ee07c6bd3134e65e6a6334a1e037}
+ froide@https://codeload.github.com/okfde/froide/tar.gz/d0d5c7c079cdc2b63ab5589531a945bb78b10f08:
+ resolution: {tarball: https://codeload.github.com/okfde/froide/tar.gz/d0d5c7c079cdc2b63ab5589531a945bb78b10f08}
version: 6.0.0
froide_campaign@https://codeload.github.com/okfde/froide-campaign/tar.gz/caede728d94fe7b08437e4ae3229d7222b6a104b:
@@ -4147,7 +4147,7 @@ snapshots:
fraction.js@4.3.7: {}
- froide@https://codeload.github.com/okfde/froide/tar.gz/cade39e24835ee07c6bd3134e65e6a6334a1e037(fuse.js@7.1.0)(typescript@5.9.2):
+ froide@https://codeload.github.com/okfde/froide/tar.gz/d0d5c7c079cdc2b63ab5589531a945bb78b10f08(fuse.js@7.1.0)(typescript@5.9.2):
dependencies:
'@hey-api/openapi-ts': 0.83.1(typescript@5.9.2)
'@okfde/filingcabinet': https://codeload.github.com/okfde/django-filingcabinet/tar.gz/a7951d051fc155104bfe07ff43573762abafb1ec(typescript@5.9.2)
@@ -4192,13 +4192,13 @@ snapshots:
- universal-cookie
- worker-loader
- froide_campaign@https://codeload.github.com/okfde/froide-campaign/tar.gz/caede728d94fe7b08437e4ae3229d7222b6a104b(froide@https://codeload.github.com/okfde/froide/tar.gz/cade39e24835ee07c6bd3134e65e6a6334a1e037(fuse.js@7.1.0)(typescript@5.9.2))(typescript@5.9.2):
+ froide_campaign@https://codeload.github.com/okfde/froide-campaign/tar.gz/caede728d94fe7b08437e4ae3229d7222b6a104b(froide@https://codeload.github.com/okfde/froide/tar.gz/d0d5c7c079cdc2b63ab5589531a945bb78b10f08(fuse.js@7.1.0)(typescript@5.9.2))(typescript@5.9.2):
dependencies:
'@turf/bbox': 6.5.0
'@types/leaflet': 1.9.20
'@vue-leaflet/vue-leaflet': 0.8.1(leaflet@1.9.4)(vue@3.5.22(typescript@5.9.2))
deepmerge: 4.3.1
- froide: https://codeload.github.com/okfde/froide/tar.gz/cade39e24835ee07c6bd3134e65e6a6334a1e037(fuse.js@7.1.0)(typescript@5.9.2)
+ froide: https://codeload.github.com/okfde/froide/tar.gz/d0d5c7c079cdc2b63ab5589531a945bb78b10f08(fuse.js@7.1.0)(typescript@5.9.2)
leaflet: 1.9.4
leaflet.icon.glyph: 0.3.0
lodash.debounce: 4.0.8
@@ -4209,11 +4209,11 @@ snapshots:
froide_exam@https://codeload.github.com/okfde/froide-exam/tar.gz/779005ccfc21a3e75aeb57eb486c91b670739a3c: {}
- froide_food@https://codeload.github.com/okfde/froide-food/tar.gz/a70bfc44e56e5d2338dc4ba3111ed376152d550b(@types/leaflet@1.9.20)(froide@https://codeload.github.com/okfde/froide/tar.gz/cade39e24835ee07c6bd3134e65e6a6334a1e037(fuse.js@7.1.0)(typescript@5.9.2))(typescript@5.9.2):
+ froide_food@https://codeload.github.com/okfde/froide-food/tar.gz/a70bfc44e56e5d2338dc4ba3111ed376152d550b(@types/leaflet@1.9.20)(froide@https://codeload.github.com/okfde/froide/tar.gz/d0d5c7c079cdc2b63ab5589531a945bb78b10f08(fuse.js@7.1.0)(typescript@5.9.2))(typescript@5.9.2):
dependencies:
'@turf/bbox': 6.5.0
'@vue-leaflet/vue-leaflet': 0.10.1(@types/leaflet@1.9.20)(leaflet@1.9.4)(typescript@5.9.2)
- froide: https://codeload.github.com/okfde/froide/tar.gz/cade39e24835ee07c6bd3134e65e6a6334a1e037(fuse.js@7.1.0)(typescript@5.9.2)
+ froide: https://codeload.github.com/okfde/froide/tar.gz/d0d5c7c079cdc2b63ab5589531a945bb78b10f08(fuse.js@7.1.0)(typescript@5.9.2)
leaflet: 1.9.4
vue: 3.5.22(typescript@5.9.2)
vue3-slide-up-down: 1.2.5(vue@3.5.22(typescript@5.9.2))
diff --git a/requirements-dev.txt b/requirements-dev.txt
index c0e87b828..7bcccbced 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -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)
diff --git a/requirements-production.txt b/requirements-production.txt
index 3b8b98751..c1ab9a018 100644
--- a/requirements-production.txt
+++ b/requirements-production.txt
@@ -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)
diff --git a/requirements.txt b/requirements.txt
index d1b8d535c..4b03d4a92 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -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)