diff --git a/changelog/8668.md b/changelog/8668.md
new file mode 100644
index 0000000000..53fb71aa92
--- /dev/null
+++ b/changelog/8668.md
@@ -0,0 +1,5 @@
+### Changed
+- updated navigation for burger menu
+
+### Removed
+- userindicator (blue bar)
diff --git a/meinberlin/apps/cms/migrations/0047_headerpages_easy_language_page.py b/meinberlin/apps/cms/migrations/0047_headerpages_easy_language_page.py
new file mode 100644
index 0000000000..7764737a3f
--- /dev/null
+++ b/meinberlin/apps/cms/migrations/0047_headerpages_easy_language_page.py
@@ -0,0 +1,28 @@
+# Generated by Django 4.2.11 on 2025-01-08 15:20
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("wagtailcore", "0089_log_entry_data_json_null_to_object"),
+ ("meinberlin_cms", "0046_alter_docspage_body"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="headerpages",
+ name="easy_language_page",
+ field=models.ForeignKey(
+ blank=True,
+ help_text="Please add a link to the easy language page.",
+ null=True,
+ on_delete=django.db.models.deletion.SET_NULL,
+ related_name="easy_language_page",
+ to="wagtailcore.page",
+ verbose_name="Easy Language Form Page",
+ ),
+ ),
+ ]
diff --git a/meinberlin/apps/cms/models/settings.py b/meinberlin/apps/cms/models/settings.py
index 392fbb057b..858dd864af 100644
--- a/meinberlin/apps/cms/models/settings.py
+++ b/meinberlin/apps/cms/models/settings.py
@@ -26,6 +26,15 @@ class HeaderPages(BaseSiteSetting):
on_delete=models.SET_NULL,
help_text=_("Please add a link to the feedback form page."),
)
+ easy_language_page = models.ForeignKey(
+ "wagtailcore.Page",
+ related_name="easy_language_page",
+ verbose_name="Easy Language Form Page",
+ null=True,
+ blank=True,
+ on_delete=models.SET_NULL,
+ help_text=_("Please add a link to the easy language page."),
+ )
# accessibility settings
feedback_name = models.CharField(max_length=255, blank=True)
feedback_email = models.EmailField(max_length=255, blank=True)
@@ -48,6 +57,7 @@ class HeaderPages(BaseSiteSetting):
panels = [
FieldPanel("help_page"),
FieldPanel("feedback_page"),
+ FieldPanel("easy_language_page"),
MultiFieldPanel(
[
FieldPanel("feedback_name"),
diff --git a/meinberlin/apps/users/templates/meinberlin_users/user_indicator.html b/meinberlin/apps/users/templates/meinberlin_users/user_indicator.html
deleted file mode 100644
index 432ec89b4d..0000000000
--- a/meinberlin/apps/users/templates/meinberlin_users/user_indicator.html
+++ /dev/null
@@ -1,55 +0,0 @@
-{% load i18n static %}
-
-
-
- {% if request.user.is_authenticated %}
-
-
- {% else %}
-
-
- {% endif %}
-
-
diff --git a/meinberlin/apps/users/templatetags/userindicator.py b/meinberlin/apps/users/templatetags/userindicator.py
index 7ed07dc7dd..ddeecd4dfc 100644
--- a/meinberlin/apps/users/templatetags/userindicator.py
+++ b/meinberlin/apps/users/templatetags/userindicator.py
@@ -24,13 +24,6 @@ def get_next_url(request):
return request.get_full_path()
-@register.inclusion_tag("meinberlin_users/user_indicator.html", takes_context=True)
-def userindicator(context):
- if hasattr(context, "request"):
- context["redirect_field_value"] = get_next_url(context["request"])
- return context
-
-
@register.inclusion_tag("meinberlin_users/initiator_indicator.html", takes_context=True)
def initiatorindicator(context):
if hasattr(context, "request"):
diff --git a/meinberlin/assets/scss/components_user_facing/_navigation-meta.scss b/meinberlin/assets/scss/components_user_facing/_navigation-meta.scss
new file mode 100644
index 0000000000..0c2ff017d6
--- /dev/null
+++ b/meinberlin/assets/scss/components_user_facing/_navigation-meta.scss
@@ -0,0 +1,32 @@
+.navigation-meta .heading {
+ padding-bottom: 1.5em;
+ padding-top: 1.5em;
+ border-top: 1px solid $gray-lighter;
+ border-bottom: 1px solid $gray-lighter;
+}
+
+.navigation-meta a {
+ border-bottom: 1px solid $gray-lighter;
+}
+
+.navigation-meta li:last-child a {
+ border-bottom: 0;
+}
+
+.navigation-meta:last-child li:last-child {
+ border-bottom: 1px solid $gray-lighter;
+}
+
+.navigation-meta .heading:empty {
+ height: 4.375em;
+}
+
+.navigation-meta .navigation-meta__link {
+ margin: 3px;
+ display: block;
+ padding: 1em 0 1em 12px;
+
+ @media screen and (min-width: $breakpoint-tablet-landscape) {
+ padding: 1em 24px;
+ }
+}
diff --git a/meinberlin/assets/scss/style_user_facing.scss b/meinberlin/assets/scss/style_user_facing.scss
index ae7a15a026..e84d700f6e 100644
--- a/meinberlin/assets/scss/style_user_facing.scss
+++ b/meinberlin/assets/scss/style_user_facing.scss
@@ -39,6 +39,7 @@
@import "components_user_facing/moderator_notes";
@import "components_user_facing/moderator_status";
@import "components_user_facing/narrow-wrapper";
+@import "components_user_facing/navigation-meta";
@import "components_user_facing/nextprev";
@import "components_user_facing/phase_info";
@import "components_user_facing/pill";
diff --git a/meinberlin/templates/base.html b/meinberlin/templates/base.html
index 373e0bc165..e3729136e4 100644
--- a/meinberlin/templates/base.html
+++ b/meinberlin/templates/base.html
@@ -1,5 +1,5 @@
-{% load i18n userindicator static contrib_tags wagtailuserbar %}
+{% load i18n static contrib_tags wagtailuserbar %}
{% get_current_language as LANGUAGE_CODE %}
@@ -54,7 +54,6 @@
{% if messages %}
diff --git a/meinberlin/templates/header.html b/meinberlin/templates/header.html
index a6180830b0..c84578e938 100644
--- a/meinberlin/templates/header.html
+++ b/meinberlin/templates/header.html
@@ -6,7 +6,7 @@
@@ -15,7 +15,7 @@
@@ -30,7 +30,7 @@
{% get_header_menu "topnav" as topnav %}
{% for item in topnav %}
- {{ item.title}}
+ {{ item.title }}
{% endfor %}
{% if settings.meinberlin_cms.HeaderPages.help_page %}
@@ -196,34 +196,7 @@ {% translate 'Menu' %}
-
+ {% include 'navigation_primary.html' %}
diff --git a/meinberlin/templates/navigation_primary.html b/meinberlin/templates/navigation_primary.html
new file mode 100644
index 0000000000..c31e593730
--- /dev/null
+++ b/meinberlin/templates/navigation_primary.html
@@ -0,0 +1,102 @@
+{% load i18n %}
+
+