From d305f05e4ff6cb640c9c23d377f641f8ea9eeb88 Mon Sep 17 00:00:00 2001
From: vincent porte <vincent@neuralia.co>
Date: Wed, 28 Jun 2023 12:37:29 +0200
Subject: [PATCH] wip

wip

wip render short_desc

wip

wip

wip fixing existing tests
---
 config/settings/base.py                       |   1 -
 lacommunaute/forum/admin.py                   |   4 +-
 lacommunaute/forum/enums.py                   |   7 +
 lacommunaute/forum/factories.py               |   3 +-
 .../management/commands/202306_forumpublic.py |  77 ++++++
 .../forum/migrations/0011_forum_kind.py       |  49 ++++
 ...orum_short_description_alter_forum_kind.py |  17 ++
 lacommunaute/forum/models.py                  |  11 +-
 .../forum/tests/test_CategoryForumListView.py |   8 +-
 lacommunaute/forum/tests/tests_model.py       |   6 +-
 lacommunaute/forum/tests/tests_views.py       |   2 +-
 lacommunaute/forum/urls.py                    |   2 +-
 lacommunaute/forum/views.py                   |   6 +-
 lacommunaute/forum_conversation/models.py     |   8 +-
 .../forum_conversation/tests/tests_models.py  |   4 +-
 .../forum_conversation/tests/tests_views.py   | 227 +++--------------
 .../tests/tests_views_htmx.py                 |   2 +-
 lacommunaute/forum_conversation/urls.py       |  12 +-
 lacommunaute/forum_conversation/views.py      |  80 +++---
 lacommunaute/forum_member/tests/tests_view.py |   2 +-
 lacommunaute/forum_upvote/shortcuts.py        |   7 +-
 .../forum_upvote/tests/tests_shortcuts.py     |   6 +-
 .../inclusion_connect/tests/tests_views.py    |  12 +-
 lacommunaute/inclusion_connect/views.py       |   8 +-
 .../notification/tests/tests_tasks.py         |   3 +-
 lacommunaute/pages/tests/tests.py             |   2 +-
 lacommunaute/pages/urls.py                    |   1 +
 lacommunaute/pages/views.py                   |  20 ++
 lacommunaute/templates/404.html               |   2 +-
 .../templates/forum/category_forum_list.html  |  74 ++++--
 .../templates/forum/forum_detail.html         | 109 +++++---
 lacommunaute/templates/forum/forum_list.html  |  12 +-
 .../partials/topics_and_members_counts.html   |   4 +-
 .../partials/topic_filter.html                |  14 +-
 .../partials/topic_tags.html                  |   6 -
 .../topic_list_newsfeed.html                  | 102 ++++++++
 .../forum_conversation/topics_newsfeed.html   |  58 +++++
 .../forum_conversation/topics_public.html     |  70 +++++
 lacommunaute/templates/pages/home.html        | 241 +++++++-----------
 .../templates/partials/ask_a_question.html    |  48 ++--
 lacommunaute/templates/partials/footer.html   |  54 ++--
 lacommunaute/templates/partials/header.html   |   4 +-
 .../partials/header_nav_secondary_items.html  |  41 +--
 lacommunaute/utils/middleware.py              |  35 ---
 lacommunaute/utils/tests.py                   |  99 -------
 45 files changed, 843 insertions(+), 717 deletions(-)
 create mode 100644 lacommunaute/forum/enums.py
 create mode 100644 lacommunaute/forum/management/commands/202306_forumpublic.py
 create mode 100644 lacommunaute/forum/migrations/0011_forum_kind.py
 create mode 100644 lacommunaute/forum/migrations/0012_forum_short_description_alter_forum_kind.py
 create mode 100644 lacommunaute/templates/forum_conversation/topic_list_newsfeed.html
 create mode 100644 lacommunaute/templates/forum_conversation/topics_newsfeed.html
 create mode 100644 lacommunaute/templates/forum_conversation/topics_public.html
 delete mode 100644 lacommunaute/utils/middleware.py

diff --git a/config/settings/base.py b/config/settings/base.py
index fe54845c0..94052fd60 100644
--- a/config/settings/base.py
+++ b/config/settings/base.py
@@ -94,7 +94,6 @@
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "django_htmx.middleware.HtmxMiddleware",
     "machina.apps.forum_permission.middleware.ForumPermissionMiddleware",
-    "lacommunaute.utils.middleware.VisibleForumsMiddleware",
 ]
 
 ROOT_URLCONF = "config.urls"
diff --git a/lacommunaute/forum/admin.py b/lacommunaute/forum/admin.py
index 5dcff6e2e..c580db000 100644
--- a/lacommunaute/forum/admin.py
+++ b/lacommunaute/forum/admin.py
@@ -3,9 +3,9 @@
 
 class ForumAdmin(BaseForumAdmin):
     fieldsets = BaseForumAdmin.fieldsets
+    fieldsets[0][1]["fields"] += ("short_description",)
     fieldsets[1][1]["fields"] += (
         "members_group",
         "invitation_token",
-        "is_private",
-        "is_newsfeed",
+        "kind",
     )
diff --git a/lacommunaute/forum/enums.py b/lacommunaute/forum/enums.py
new file mode 100644
index 000000000..99e92a12f
--- /dev/null
+++ b/lacommunaute/forum/enums.py
@@ -0,0 +1,7 @@
+from django.db import models
+
+
+class Kind(models.TextChoices):
+    PUBLIC_FORUM = "PUBLIC_FORUM", "Espace public"
+    PRIVATE_FORUM = "PRIVATE_FORUM", "Espace privé"
+    NEWS = "NEWS", "Actualités"
diff --git a/lacommunaute/forum/factories.py b/lacommunaute/forum/factories.py
index fb7d5c31e..b281eb947 100644
--- a/lacommunaute/forum/factories.py
+++ b/lacommunaute/forum/factories.py
@@ -14,7 +14,8 @@ class ForumFactory(BaseForumFactory):
     type = Forum.FORUM_POST
     members_group = factory.SubFactory(GroupFactory, name=factory.SelfAttribute("..name"))
     name = factory.Faker("name")
-    description = factory.Faker("sentence", nb_words=10)
+    description = factory.Faker("sentence", nb_words=100)
+    short_description = factory.Faker("sentence", nb_words=10)
 
     @factory.post_generation
     def with_public_perms(self, create, extracted, **kwargs):
diff --git a/lacommunaute/forum/management/commands/202306_forumpublic.py b/lacommunaute/forum/management/commands/202306_forumpublic.py
new file mode 100644
index 000000000..f4c16c6b2
--- /dev/null
+++ b/lacommunaute/forum/management/commands/202306_forumpublic.py
@@ -0,0 +1,77 @@
+from typing import List
+
+from django.contrib.redirects.models import Redirect
+from django.contrib.sites.models import Site
+from django.core.management.base import BaseCommand
+from taggit.models import Tag
+
+from lacommunaute.forum.models import Forum
+from lacommunaute.forum_conversation.models import Topic
+
+
+public_forums_id_list = [2, 106, 69, 107, 50, 98]
+new_forum_name = "Espace d'échanges"
+site_id = 1
+
+
+def create_tags(forum_id_list: List[int]) -> None:
+    print("Création des nouveaux tags")
+    return Tag.objects.bulk_create(
+        [Tag(name=forum.name, slug=forum.slug) for forum in Forum.objects.filter(id__in=forum_id_list)]
+    )
+
+
+def create_forum() -> Forum:
+    print("Création du nouveau forum public")
+    forum = Forum.objects.create(name=new_forum_name, type=Forum.FORUM_POST)
+    forum.move_to(Forum.objects.get(tree_id=1, level=0), "left")
+    return forum
+
+
+def update_topics(forum_id_list: List[int], new_forum: Forum) -> None:
+    print("Mise à jour des topics")
+    for forum in Forum.objects.filter(id__in=public_forums_id_list):
+        for topic in Topic.objects.filter(forum=forum):
+            topic.tags.add(forum.name)
+            topic.forum = new_forum
+            topic.save()
+
+
+def add_redirections(forum_id_list: List[int], site_id: int, new_forum: Forum) -> None:
+    print("Ajout des redirections")
+    site = Site.objects.get(id=site_id)
+    Redirect.objects.bulk_create(
+        [
+            Redirect(
+                site=site,
+                old_path=f"/forum/{forum.slug}-{forum.id}/{topic.slug}-{topic.id}",
+                new_path=f"/forum/{new_forum.slug}-{new_forum.id}/{topic.slug}-{topic.id}",
+            )
+            for forum in Forum.objects.filter(id__in=forum_id_list)
+            for topic in Topic.objects.filter(forum=forum)
+        ]
+    )
+
+
+class Command(BaseCommand):
+    help = "réorganisation des forums publics"
+
+    def handle(self, *args, **options):
+        # ajouter les nouveaux tags à partir des forums publics existants
+        create_tags(public_forums_id_list)
+
+        # ajouter le nouveau forum public
+        forum = create_forum()
+
+        # ajouter ces tags aux topics concernés
+        # migrer les topics des forums publics existants vers le nouveau forum public
+        update_topics(public_forums_id_list, forum)
+
+        # ajouter les redirections des anciens forums publics vers le nouveau forum public
+        add_redirections(public_forums_id_list, site_id, forum)
+
+        # supprimer les forums publics existants
+        print("Suppression des anciens forums publics")
+        Forum.objects.filter(id__in=public_forums_id_list).delete()
+
+        print("Terminé")
diff --git a/lacommunaute/forum/migrations/0011_forum_kind.py b/lacommunaute/forum/migrations/0011_forum_kind.py
new file mode 100644
index 000000000..2c7d9d114
--- /dev/null
+++ b/lacommunaute/forum/migrations/0011_forum_kind.py
@@ -0,0 +1,49 @@
+# Generated by Django 4.2.2 on 2023-06-28 08:37
+
+from django.db import migrations, models
+
+
+def add_kind_to_forums(apps, schema_editor):
+    Forum = apps.get_model("forum", "Forum")
+    Forum.objects.filter(is_newsfeed=True).update(kind="NEWS")
+    Forum.objects.filter(is_newsfeed=False, is_private=True).update(kind="PRIVATE_FORUM")
+    Forum.objects.filter(is_newsfeed=False, is_private=False, type=1).update(kind="DOCUMENTATION")
+
+
+def remove_kind_from_forums(apps, schema_editor):
+    Forum = apps.get_model("forum", "Forum")
+    Forum.objects.filter(kind="NEWS").update(is_newsfeed=True, is_private=False)
+    Forum.objects.filter(kind="PRIVATE_FORUM").update(is_private=True, is_newsfeed=False)
+    Forum.objects.filter(kind="DOCUMENTATION").update(is_private=False, is_newsfeed=False, type=1)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("forum", "0010_forum_is_newsfeed"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="forum",
+            name="kind",
+            field=models.CharField(
+                choices=[
+                    ("PUBLIC_FORUM", "Espace public"),
+                    ("PRIVATE_FORUM", "Espace privé"),
+                    ("NEWS", "Actualités"),
+                ],
+                default="PUBLIC_FORUM",
+                max_length=20,
+                verbose_name="Type",
+            ),
+        ),
+        migrations.RunPython(add_kind_to_forums, remove_kind_from_forums),
+        migrations.RemoveField(
+            model_name="forum",
+            name="is_newsfeed",
+        ),
+        migrations.RemoveField(
+            model_name="forum",
+            name="is_private",
+        ),
+    ]
diff --git a/lacommunaute/forum/migrations/0012_forum_short_description_alter_forum_kind.py b/lacommunaute/forum/migrations/0012_forum_short_description_alter_forum_kind.py
new file mode 100644
index 000000000..d92e411ea
--- /dev/null
+++ b/lacommunaute/forum/migrations/0012_forum_short_description_alter_forum_kind.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.2 on 2023-06-28 08:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("forum", "0011_forum_kind"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="forum",
+            name="short_description",
+            field=models.CharField(blank=True, max_length=400, null=True, verbose_name="Description courte (SEO)"),
+        ),
+    ]
diff --git a/lacommunaute/forum/models.py b/lacommunaute/forum/models.py
index 34b6ac8be..9a4b333d8 100644
--- a/lacommunaute/forum/models.py
+++ b/lacommunaute/forum/models.py
@@ -5,12 +5,13 @@
 from django.utils.functional import cached_property
 from machina.apps.forum.abstract_models import AbstractForum
 
+from lacommunaute.forum.enums import Kind as Forum_Kind
 from lacommunaute.forum_conversation.models import Topic
 
 
 class ForumQuerySet(models.QuerySet):
     def public(self):
-        return self.filter(is_private=False)
+        return self.filter(kind=Forum_Kind.PUBLIC_FORUM)
 
 
 class Forum(AbstractForum):
@@ -18,8 +19,12 @@ class Forum(AbstractForum):
         Group, blank=True, null=True, on_delete=models.CASCADE, verbose_name=("Members Group")
     )
     invitation_token = models.UUIDField(default=uuid.uuid4, unique=True)
-    is_private = models.BooleanField(default=False, verbose_name="privée")
-    is_newsfeed = models.BooleanField(default=False, verbose_name="fil d'actualité")
+    kind = models.CharField(
+        max_length=20, choices=Forum_Kind.choices, default=Forum_Kind.PUBLIC_FORUM, verbose_name="Type"
+    )
+    short_description = models.CharField(
+        max_length=400, blank=True, null=True, verbose_name="Description courte (SEO)"
+    )
 
     objects = ForumQuerySet().as_manager()
 
diff --git a/lacommunaute/forum/tests/test_CategoryForumListView.py b/lacommunaute/forum/tests/test_CategoryForumListView.py
index cc86360fa..07e26e78c 100644
--- a/lacommunaute/forum/tests/test_CategoryForumListView.py
+++ b/lacommunaute/forum/tests/test_CategoryForumListView.py
@@ -1,26 +1,28 @@
 import pytest  # noqa
 from django.urls import reverse
 
+from lacommunaute.forum.enums import Kind as ForumKind
 from lacommunaute.forum.factories import ForumFactory
 from lacommunaute.forum.models import Forum
 
 
 def test_context(client, db):
-    url = reverse("forum_extension:categories")
+    url = reverse("forum_extension:documentation")
     response = client.get(url)
     assert response.status_code == 200
     assert "forum/category_forum_list.html" == response.templates[0].name
+    assert reverse("pages:statistiques") in str(response.content)
 
 
 def test_queryset(client, db):
     forum = ForumFactory(type=Forum.FORUM_CAT)
     unvisible_forums = (
         ForumFactory(type=Forum.FORUM_CAT, parent=forum),
-        ForumFactory(type=Forum.FORUM_CAT, is_private=True),
+        ForumFactory(type=Forum.FORUM_CAT, kind=ForumKind.PRIVATE_FORUM),
         ForumFactory(),
         ForumFactory(type=Forum.FORUM_LINK),
     )
-    url = reverse("forum_extension:categories")
+    url = reverse("forum_extension:documentation")
     response = client.get(url)
     assert response.status_code == 200
     assert forum in response.context_data["forums"]
diff --git a/lacommunaute/forum/tests/tests_model.py b/lacommunaute/forum/tests/tests_model.py
index 104b1e073..42a20b68b 100644
--- a/lacommunaute/forum/tests/tests_model.py
+++ b/lacommunaute/forum/tests/tests_model.py
@@ -4,6 +4,7 @@
 from machina.core.db.models import get_model
 from machina.core.loading import get_class
 
+from lacommunaute.forum.enums import Kind as ForumKind
 from lacommunaute.forum.factories import ForumFactory
 from lacommunaute.forum.models import Forum
 from lacommunaute.forum_conversation.factories import TopicFactory
@@ -20,11 +21,12 @@
 
 class ForumManagerTest(TestCase):
     def test_private_forum(self):
-        ForumFactory(is_private=True)
+        ForumFactory(kind=ForumKind.NEWS)
+        ForumFactory(kind=ForumKind.PRIVATE_FORUM)
         self.assertEqual(Forum.objects.public().count(), 0)
 
     def test_public_forum(self):
-        forum = ForumFactory(is_private=False)
+        forum = ForumFactory(kind=ForumKind.PUBLIC_FORUM)
         self.assertEqual(Forum.objects.public().count(), 1)
         self.assertIn(forum, Forum.objects.public())
 
diff --git a/lacommunaute/forum/tests/tests_views.py b/lacommunaute/forum/tests/tests_views.py
index d98f462da..0c8af8ca3 100644
--- a/lacommunaute/forum/tests/tests_views.py
+++ b/lacommunaute/forum/tests/tests_views.py
@@ -254,7 +254,7 @@ def test_cannot_submit_post(self):
     def test_queries(self):
         TopicFactory.create_batch(20, with_post=True)
         self.client.force_login(self.user)
-        with self.assertNumQueries(31):
+        with self.assertNumQueries(27):
             self.client.get(self.url)
 
     def test_certified_post_display(self):
diff --git a/lacommunaute/forum/urls.py b/lacommunaute/forum/urls.py
index 00143ef84..92467ee8b 100644
--- a/lacommunaute/forum/urls.py
+++ b/lacommunaute/forum/urls.py
@@ -8,5 +8,5 @@
 
 urlpatterns = [
     path("forum/<str:slug>-<int:pk>/", ForumView.as_view(), name="forum"),
-    path("forum/categories/", CategoryForumListView.as_view(), name="categories"),
+    path("forum/documentation/", CategoryForumListView.as_view(), name="documentation"),
 ]
diff --git a/lacommunaute/forum/views.py b/lacommunaute/forum/views.py
index e80782887..2f182d549 100644
--- a/lacommunaute/forum/views.py
+++ b/lacommunaute/forum/views.py
@@ -9,6 +9,7 @@
 from machina.apps.forum.views import ForumView as BaseForumView
 from machina.core.loading import get_class
 
+from lacommunaute.forum.enums import Kind as ForumKind
 from lacommunaute.forum.models import Forum
 from lacommunaute.forum_conversation.forms import PostForm
 from lacommunaute.forum_conversation.models import Topic
@@ -52,6 +53,9 @@ def get_context_data(self, **kwargs):
             .annotate(likes=Count("likers"))
             .annotate(has_liked=Exists(User.objects.filter(topic_likes=OuterRef("id"), id=self.request.user.id)))
         )
+        if forum.parent and forum.parent.type == Forum.FORUM_CAT:
+            context["forums"] = Forum.objects.filter(parent=forum.parent).order_by("lft")
+            context["parent_forum"] = forum.parent
         return context
 
 
@@ -60,4 +64,4 @@ class CategoryForumListView(ListView):
     context_object_name = "forums"
 
     def get_queryset(self) -> QuerySet[Any]:
-        return Forum.objects.exclude(is_private=True).filter(type=Forum.FORUM_CAT, level=0)
+        return Forum.objects.filter(type=Forum.FORUM_CAT, kind=ForumKind.PUBLIC_FORUM, level=0)
diff --git a/lacommunaute/forum_conversation/models.py b/lacommunaute/forum_conversation/models.py
index 85dd4a82b..1df210d6b 100644
--- a/lacommunaute/forum_conversation/models.py
+++ b/lacommunaute/forum_conversation/models.py
@@ -15,13 +15,14 @@ def unanswered(self):
         return (
             self.exclude(approved=False)
             .exclude(status=Topic.TOPIC_LOCKED)
-            .filter(posts_count=1, type__in=[Topic.TOPIC_POST, Topic.TOPIC_STICKY])
+            .exclude(type=Topic.TOPIC_ANNOUNCE)
+            .filter(posts_count=1)
         )
 
     def optimized_for_topics_list(self, user_id):
         return (
             self.exclude(approved=False)
-            .filter(type__in=[Topic.TOPIC_POST, Topic.TOPIC_STICKY, Topic.TOPIC_NEWS])
+            .filter(type__in=[Topic.TOPIC_POST, Topic.TOPIC_STICKY])
             .annotate(likes=Count("likers"))
             .annotate(has_liked=Exists(User.objects.filter(topic_likes=OuterRef("id"), id=user_id)))
             .select_related(
@@ -56,9 +57,6 @@ class Topic(AbstractTopic):
 
     tags = TaggableManager()
 
-    TOPIC_NEWS = 3
-    TYPE_CHOICES = AbstractTopic.TYPE_CHOICES + ((TOPIC_NEWS, _("News")),)
-
     def get_absolute_url(self):
         return reverse(
             "forum_conversation:topic",
diff --git a/lacommunaute/forum_conversation/tests/tests_models.py b/lacommunaute/forum_conversation/tests/tests_models.py
index 2600fda5e..87459d9a9 100644
--- a/lacommunaute/forum_conversation/tests/tests_models.py
+++ b/lacommunaute/forum_conversation/tests/tests_models.py
@@ -36,8 +36,7 @@ def test_unanswered(self):
         TopicFactory(forum=forum, posts_count=1, type=Topic.TOPIC_ANNOUNCE)
         TopicFactory(forum=forum, posts_count=1, approved=False)
 
-        self.assertEqual(Topic.objects.unanswered().count(), 1)
-        self.assertIn(topic, Topic.objects.unanswered())
+        self.assertEqual(Topic.objects.unanswered().get(), topic)
 
     def test_optimized_for_topics_list_disapproved(self):
         TopicFactory(approved=False)
@@ -125,4 +124,3 @@ def test_topic_types(self):
         self.assertEqual(0, Topic.TOPIC_POST)
         self.assertEqual(1, Topic.TOPIC_STICKY)
         self.assertEqual(2, Topic.TOPIC_ANNOUNCE)
-        self.assertEqual(3, Topic.TOPIC_NEWS)
diff --git a/lacommunaute/forum_conversation/tests/tests_views.py b/lacommunaute/forum_conversation/tests/tests_views.py
index ae8f40422..0ec243da7 100644
--- a/lacommunaute/forum_conversation/tests/tests_views.py
+++ b/lacommunaute/forum_conversation/tests/tests_views.py
@@ -12,13 +12,13 @@
 from machina.core.loading import get_class
 from taggit.models import Tag
 
+from lacommunaute.forum.enums import Kind as ForumKind
 from lacommunaute.forum.factories import ForumFactory
-from lacommunaute.forum.models import Forum
 from lacommunaute.forum_conversation.enums import Filters
 from lacommunaute.forum_conversation.factories import PostFactory, TopicFactory
 from lacommunaute.forum_conversation.forms import PostForm
 from lacommunaute.forum_conversation.models import Topic
-from lacommunaute.forum_conversation.views import PostDeleteView, TopicCreateView, TopicUpdateView
+from lacommunaute.forum_conversation.views import PostDeleteView
 from lacommunaute.forum_upvote.factories import CertifiedPostFactory, UpVoteFactory
 from lacommunaute.notification.factories import BouncedEmailFactory
 from lacommunaute.users.factories import UserFactory
@@ -32,13 +32,11 @@
 assign_perm = get_class("forum_permission.shortcuts", "assign_perm")
 
 
-@patch("machina.apps.forum.views.ForumView.perform_permissions_check", return_value=True)
-@patch("machina.apps.forum_conversation.views.TopicCreateView.perform_permissions_check", return_value=True)
 class TopicCreateViewTest(TestCase):
     @classmethod
     def setUpTestData(cls):
         cls.poster = UserFactory()
-        cls.forum = ForumFactory()
+        cls.forum = ForumFactory(with_public_perms=True)
         cls.url = reverse(
             "forum_conversation:topic_create",
             kwargs={
@@ -49,15 +47,8 @@ def setUpTestData(cls):
 
         cls.post_data = {"subject": faker.text(max_nb_chars=10), "content": faker.text(max_nb_chars=30)}
 
-    def test_redirection(self, *args):
-        topic = TopicFactory(forum=self.forum, poster=self.poster, with_post=True)
-        view = TopicCreateView()
-        view.forum_post = topic.posts.first()
-
-        self.assertEqual(
-            view.get_success_url(),
-            reverse("forum_extension:forum", kwargs={"pk": self.forum.pk, "slug": self.forum.slug}),
-        )
+    def test_get_success_url(self):
+        pass
 
     def test_delete_button_is_hidden(self, *args):
         self.client.force_login(self.poster)
@@ -69,18 +60,6 @@ def test_delete_button_is_hidden(self, *args):
             response, '/post/delete/" title="Supprimer" role="button" class="btn btn-outline-danger">Supprimer</a>'
         )
 
-    def test_topic_is_marked_as_read_when_created(self, *args):
-        self.assertFalse(TopicReadTrack.objects.count())
-        self.client.force_login(self.poster)
-
-        response = self.client.post(
-            self.url,
-            self.post_data,
-            follow=True,
-        )
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(1, TopicReadTrack.objects.count())
-
     def test_topic_poster_is_added_to_likers_list(self, *args):
         self.client.force_login(self.poster)
 
@@ -93,7 +72,6 @@ def test_topic_poster_is_added_to_likers_list(self, *args):
         self.assertEqual(1, Topic.objects.count())
         self.assertEqual(1, Topic.objects.first().likers.count())
 
-    @patch("machina.apps.forum_permission.handler.PermissionHandler.can_post_without_approval", return_value=True)
     def test_topic_create_as_anonymous_user(self, *args):
         self.post_data["username"] = faker.email()
 
@@ -114,7 +92,6 @@ def test_topic_create_as_anonymous_user(self, *args):
         self.assertTrue(topic.approved)
         self.assertTrue(topic.first_post.approved)
 
-    @patch("machina.apps.forum_permission.handler.PermissionHandler.can_post_without_approval", return_value=True)
     def test_topic_create_as_unapproved_anonymous_user(self, *args):
         self.post_data["username"] = faker.email()
         BouncedEmailFactory(email=self.post_data["username"])
@@ -131,7 +108,6 @@ def test_topic_create_as_unapproved_anonymous_user(self, *args):
         self.assertFalse(topic.approved)
         self.assertFalse(topic.first_post.approved)
 
-    @patch("machina.apps.forum_permission.handler.PermissionHandler.can_post_without_approval", return_value=True)
     def test_topic_create_as_authenticated_user(self, *args):
         self.client.force_login(self.poster)
 
@@ -180,10 +156,9 @@ def test_checked_tags_are_saved(self, *args):
 class TopicUpdateViewTest(TestCase):
     @classmethod
     def setUpTestData(cls):
-        cls.topic = TopicFactory(with_post=True)
-        cls.forum = cls.topic.forum
+        cls.forum = ForumFactory(with_public_perms=True)
+        cls.topic = TopicFactory(with_post=True, forum=cls.forum)
         cls.poster = cls.topic.poster
-        cls.perm_handler = PermissionHandler()
         cls.url = reverse(
             "forum_conversation:topic_update",
             kwargs={
@@ -193,39 +168,8 @@ def setUpTestData(cls):
                 "pk": cls.topic.pk,
             },
         )
-        assign_perm("can_read_forum", cls.poster, cls.topic.forum)
-        assign_perm("can_see_forum", cls.poster, cls.topic.forum)
-
-    def test_redirection(self):
-        view = TopicUpdateView()
-        view.forum_post = self.topic.posts.first()
-        self.assertEqual(
-            view.get_success_url(),
-            reverse("forum_extension:forum", kwargs={"pk": self.forum.pk, "slug": self.forum.slug}),
-        )
 
-    def test_has_not_permission_to_delete_post(self):
-        assign_perm("can_edit_own_posts", self.poster, self.forum)
-        self.client.force_login(self.poster)
-        response = self.client.get(self.url)
-        self.assertEqual(response.status_code, 200)
-        self.assertNotContains(
-            response,
-            reverse(
-                "forum_conversation:post_delete",
-                kwargs={
-                    "forum_slug": self.forum.slug,
-                    "forum_pk": self.forum.pk,
-                    "topic_slug": self.topic.slug,
-                    "topic_pk": self.topic.pk,
-                    "pk": self.topic.posts.first().pk,
-                },
-            ),
-        )
-
-    def test_has_permission_to_delete_post(self):
-        assign_perm("can_edit_own_posts", self.poster, self.forum)
-        assign_perm("can_delete_own_posts", self.poster, self.forum)
+    def test_delete_post_button_is_shown(self):
         self.client.force_login(self.poster)
         response = self.client.get(self.url)
         self.assertEqual(response.status_code, 200)
@@ -248,7 +192,6 @@ def test_topic_is_marked_as_read_when_updated(self):
         # because of django-machina logic
         self.assertFalse(ForumReadTrack.objects.count())
 
-        assign_perm("can_edit_own_posts", self.poster, self.forum)
         self.client.force_login(self.poster)
 
         post_data = {"subject": "s", "content": "c"}
@@ -261,7 +204,6 @@ def test_topic_is_marked_as_read_when_updated(self):
         self.assertEqual(1, ForumReadTrack.objects.count())
 
     def test_selected_tags_are_checked(self):
-        assign_perm("can_edit_own_posts", self.poster, self.forum)
         self.client.force_login(self.poster)
 
         tag = Tag.objects.create(name=faker.word())
@@ -307,13 +249,13 @@ def test_machina_route_forbidden(self):
         self.assertEqual(response.status_code, 403)
 
 
-@patch("machina.apps.forum.views.ForumView.perform_permissions_check", return_value=True)
-@patch("machina.apps.forum_permission.handler.PermissionHandler.can_edit_post", return_value=True)
+# @patch("machina.apps.forum.views.ForumView.perform_permissions_check", return_value=True)
+# @patch("machina.apps.forum_permission.handler.PermissionHandler.can_edit_post", return_value=True)
 class PostUpdateViewTest(TestCase):
     @classmethod
     def setUpTestData(cls):
-        cls.topic = TopicFactory(with_post=True)
-        cls.forum = cls.topic.forum
+        cls.forum = ForumFactory(with_public_perms=True)
+        cls.topic = TopicFactory(with_post=True, forum=cls.forum)
         cls.post = PostFactory(topic=cls.topic)
         cls.poster = cls.post.poster
         cls.kwargs = {
@@ -326,38 +268,14 @@ def setUpTestData(cls):
         cls.url = reverse("forum_conversation:post_update", kwargs=cls.kwargs)
         cls.post_data = {"content": faker.text(max_nb_chars=20)}
 
-    def test_has_not_permission_to_delete_post(self, *args):
-        self.client.force_login(self.poster)
-
-        response = self.client.get(self.url)
-
-        self.assertEqual(response.status_code, 200)
-        self.assertNotContains(response, reverse("forum_conversation:post_delete", kwargs=self.kwargs))
-
-    def test_has_permission_to_delete_post(self, *args):
+    def test_delete_post_button_is_visible(self, *args):
         self.client.force_login(self.poster)
-        assign_perm("can_delete_own_posts", self.poster, self.forum)
 
         response = self.client.get(self.url)
 
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, reverse("forum_conversation:post_delete", kwargs=self.kwargs))
 
-    def test_topic_is_marked_as_read_when_post_is_updated(self, *args):
-        # evaluating ForumReadTrack instead of TopicReadTrack
-        # because of django-machina logic
-        self.assertFalse(ForumReadTrack.objects.count())
-
-        self.client.force_login(self.poster)
-
-        response = self.client.post(
-            self.url,
-            self.post_data,
-            follow=True,
-        )
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(1, ForumReadTrack.objects.count())
-
     def test_update_post_as_authenticated_user(self, *args):
         self.client.force_login(self.poster)
 
@@ -512,26 +430,12 @@ def test_has_tags(self):
         response = self.client.get(self.url)
         self.assertEqual(response.status_code, 200)
         self.assertNotContains(response, tag)
-        self.assertContains(
-            response, reverse("forum_extension:forum", kwargs={"pk": self.forum.pk, "slug": self.forum.slug})
-        )
-        self.assertContains(
-            response,
-            f'<span class="badge badge-xs badge-pill badge-info-lighter text-info">{self.forum.name}</span></a>',
-        )
 
         self.topic.tags.add(tag)
 
         response = self.client.get(self.url)
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, tag)
-        self.assertContains(
-            response, reverse("forum_extension:forum", kwargs={"pk": self.forum.pk, "slug": self.forum.slug})
-        )
-        self.assertContains(
-            response,
-            f'<span class="badge badge-xs badge-pill badge-info-lighter text-info">{self.forum.name}</span></a>',
-        )
 
     def test_edit_link_is_visible(self):
         self.client.force_login(self.poster)
@@ -548,7 +452,7 @@ def test_numqueries(self):
         self.client.force_login(self.poster)
 
         # note vincentporte : to be optimized
-        with self.assertNumQueries(55):
+        with self.assertNumQueries(44):
             response = self.client.get(self.url)
         self.assertEqual(response.status_code, 200)
 
@@ -556,20 +460,20 @@ def test_numqueries(self):
 class TopicListViewTest(TestCase):
     @classmethod
     def setUpTestData(cls):
-        cls.url = reverse("forum_conversation_extension:home")
-        cls.topic = TopicFactory(with_post=True, with_like=True)
-        cls.forum = cls.topic.forum
+        cls.url = reverse("forum_conversation_extension:publicforum")
+        cls.forum = ForumFactory(with_public_perms=True)
+        cls.topic = TopicFactory(with_post=True, with_like=True, forum=cls.forum)
         cls.user = cls.topic.poster
 
-        assign_perm("can_see_forum", cls.user, cls.forum)
-        assign_perm("can_read_forum", cls.user, cls.forum)
-
     def test_context(self):
         response = self.client.get(self.url)
 
         self.assertIsInstance(response.context_data["form"], PostForm)
         self.assertEqual(response.context_data["filters"], Filters.choices)
-        self.assertEqual(response.context_data["loadmoretopic_url"], reverse("forum_conversation_extension:home"))
+        self.assertEqual(
+            response.context_data["loadmoretopic_url"], reverse("forum_conversation_extension:publicforum")
+        )
+        self.assertEqual(response.context_data["forum"], self.forum)
         self.assertEqual(response.context_data["active_filter_name"], Filters.ALL.label)
 
         for filter, label in Filters.choices:
@@ -577,7 +481,7 @@ def test_context(self):
                 response = self.client.get(self.url + f"?filter={filter}")
                 self.assertEqual(
                     response.context_data["loadmoretopic_url"],
-                    reverse("forum_conversation_extension:home") + f"?filter={filter}",
+                    reverse("forum_conversation_extension:publicforum") + f"?filter={filter}",
                 )
                 self.assertEqual(response.context_data["active_filter_name"], label)
 
@@ -590,39 +494,14 @@ def test_has_liked(self):
         # icon: solid heart
         self.assertContains(response, '<i class="ri-heart-3-fill" aria-hidden="true"></i><span class="ml-1">1</span>')
 
-    def test_store_upper_visible_forums(
-        self,
-    ):
-        hidden_forum = ForumFactory()
-        categ_forum = ForumFactory(type=Forum.FORUM_CAT)
-        assign_perm("can_see_forum", self.user, categ_forum)
-        assign_perm("can_read_forum", self.user, categ_forum)
-        self.client.force_login(self.user)
-
-        response = self.client.get(self.url)
-
-        self.assertEqual(response.status_code, 200)
-        self.assertNotContains(
-            response,
-            '<a class="dropdown-header matomo-event" href="'
-            + reverse("forum_extension:forum", kwargs={"pk": hidden_forum.pk, "slug": hidden_forum.slug}),
-        )
-        self.assertNotContains(
-            response,
-            '<a class="dropdown-header matomo-event" href="'
-            + reverse("forum_extension:forum", kwargs={"pk": categ_forum.pk, "slug": categ_forum.slug}),
-        )
-        self.assertContains(
-            response,
-            '<a class="dropdown-header matomo-event" href="'
-            + reverse("forum_extension:forum", kwargs={"pk": self.forum.pk, "slug": self.forum.slug}),
-        )
-
     def test_queryset(self):
         answered_topic = TopicFactory(with_post=True, forum=self.forum)
         PostFactory(topic=answered_topic)
-        nonreadable_topic = TopicFactory(with_post=True)
         certified_topic = TopicFactory(with_post=True, with_certified_post=True, forum=self.forum)
+
+        nonreadable_forum = ForumFactory(kind=ForumKind.PRIVATE_FORUM)
+        nonreadable_topic = TopicFactory(with_post=True, forum=nonreadable_forum)
+
         self.client.force_login(self.user)
 
         response = self.client.get(self.url)
@@ -661,7 +540,7 @@ def test_unanswerd_topics_visibility(self):
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, self.topic.subject)
 
-        self.forum.is_private = True
+        self.forum.kind = ForumKind.PRIVATE_FORUM
         self.forum.save()
 
         response = self.client.get(url)
@@ -669,7 +548,9 @@ def test_unanswerd_topics_visibility(self):
         self.assertNotContains(response, self.topic.subject)
 
     def test_certified_topics_list_content(self):
-        certified_private_topic = TopicFactory(with_certified_post=True, forum=ForumFactory(is_private=True))
+        certified_private_topic = TopicFactory(
+            with_certified_post=True, forum=ForumFactory(kind=ForumKind.PRIVATE_FORUM)
+        )
         certified_public_topic = TopicFactory(with_certified_post=True, forum=self.forum)
         topic = TopicFactory(with_post=True)
         self.client.force_login(self.user)
@@ -725,53 +606,7 @@ def test_filter_dropdown_visibility(self):
 
     def test_template_name(self):
         response = self.client.get(self.url)
-        self.assertTemplateUsed(response, "pages/home.html")
+        self.assertTemplateUsed(response, "forum_conversation/topics_public.html")
 
         response = self.client.get(self.url, **{"HTTP_HX_REQUEST": "true"})
         self.assertTemplateUsed(response, "forum_conversation/topic_list.html")
-
-
-class NewsFeedTopicListViewTest(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.topic = TopicFactory(with_post=True, type=Topic.TOPIC_NEWS)
-        cls.user = cls.topic.poster
-        cls.forum = cls.topic.forum
-        assign_perm("can_read_forum", cls.topic.poster, cls.topic.forum)
-        cls.url = reverse("forum_conversation_extension:newsfeed_topics_list")
-
-    def test_view(self):
-        TopicFactory(with_post=True, poster=self.user, forum=self.forum)
-        self.client.force_login(self.user)
-
-        response = self.client.get(self.url)
-
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "forum_conversation/topic_list.html")
-        self.assertIsInstance(response.context_data["form"], PostForm)
-        self.assertEqual(response.context_data["loadmoretopic_url"], self.url)
-        self.assertEqual(response.context_data["loadmoretopic_suffix"], "newsfeed")
-        self.assertEqual(list(response.context_data["topics"]), [self.topic])
-        self.assertEqual(response.context_data["display_filter_dropdown"], False)
-        self.assertNotContains(response, '<div class="dropdown-menu" id="filterTopicsDropdown" style="">')
-
-    def test_forum_is_private(self):
-        self.forum.is_private = True
-        self.forum.save()
-        response = self.client.get(self.url)
-
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(len(response.context_data["topics"]), 0)
-
-    def test_pagination(self):
-        TopicFactory.create_batch(9, with_post=True, type=Topic.TOPIC_NEWS)
-        response = self.client.get(self.url)
-
-        self.assertEqual(response.status_code, 200)
-        self.assertNotContains(response, self.url + "?page=2")
-
-        TopicFactory(with_post=True, type=Topic.TOPIC_NEWS)
-        response = self.client.get(self.url)
-
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, self.url + "?page=2")
diff --git a/lacommunaute/forum_conversation/tests/tests_views_htmx.py b/lacommunaute/forum_conversation/tests/tests_views_htmx.py
index 8482217e7..12872e870 100644
--- a/lacommunaute/forum_conversation/tests/tests_views_htmx.py
+++ b/lacommunaute/forum_conversation/tests/tests_views_htmx.py
@@ -88,7 +88,7 @@ def test_numqueries_vs_tags(self):
         assign_perm("can_read_forum", self.user, self.topic.forum)
         self.client.force_login(self.user)
 
-        with self.assertNumQueries(22):
+        with self.assertNumQueries(13):
             self.client.get(self.url)
 
 
diff --git a/lacommunaute/forum_conversation/urls.py b/lacommunaute/forum_conversation/urls.py
index a64a78bc8..19103ab85 100644
--- a/lacommunaute/forum_conversation/urls.py
+++ b/lacommunaute/forum_conversation/urls.py
@@ -1,6 +1,6 @@
 from django.urls import include, path
 
-from lacommunaute.forum_conversation.views import TopicListView, TopicNewsListView
+from lacommunaute.forum_conversation.views import NewsFeedTopicListView, TopicListView
 from lacommunaute.forum_conversation.views_htmx import (
     ForumTopicListView,
     PostFeedCreateView,
@@ -22,18 +22,12 @@
     path("topic/", ForumTopicListView.as_view(), name="topic_list"),
 ]
 
-public_topics_urlpatterns = [
-    path("topic/newsfeed/", TopicNewsListView.as_view(), name="newsfeed_topics_list"),
-]
 
 urlpatterns = [
-    path("", TopicListView.as_view(), name="home"),
+    path("publicforum/", TopicListView.as_view(), name="publicforum"),
+    path("newsfeed/", NewsFeedTopicListView.as_view(), name="newsfeed"),
     path(
         "forum/<str:forum_slug>-<int:forum_pk>/",
         include(conversation_urlpatterns),
     ),
-    path(
-        "public/",
-        include(public_topics_urlpatterns),
-    ),
 ]
diff --git a/lacommunaute/forum_conversation/views.py b/lacommunaute/forum_conversation/views.py
index ea1601c48..f9a75ca13 100644
--- a/lacommunaute/forum_conversation/views.py
+++ b/lacommunaute/forum_conversation/views.py
@@ -7,13 +7,13 @@
 from machina.apps.forum_conversation import views
 from machina.core.loading import get_class
 
+from lacommunaute.forum.enums import Kind as ForumKind
 from lacommunaute.forum.models import Forum
 from lacommunaute.forum_conversation.enums import Filters
 from lacommunaute.forum_conversation.forms import PostForm, TopicForm
 from lacommunaute.forum_conversation.models import Topic
 from lacommunaute.forum_conversation.shortcuts import get_posts_of_a_topic_except_first_one
 from lacommunaute.forum_upvote.shortcuts import can_certify_post
-from lacommunaute.utils.middleware import store_upper_visible_forums
 
 
 logger = logging.getLogger(__name__)
@@ -23,17 +23,6 @@
 track_handler = TrackingHandler()
 
 
-class SuccessUrlMixin:
-    def get_success_url(self):
-        return reverse(
-            "forum_extension:forum",
-            kwargs={
-                "pk": self.forum_post.topic.forum.pk,
-                "slug": self.forum_post.topic.forum.slug,
-            },
-        )
-
-
 class FormValidMixin:
     def form_valid(self, *args, **kwargs):
         valid = super().form_valid(*args, **kwargs)
@@ -41,20 +30,36 @@ def form_valid(self, *args, **kwargs):
         return valid
 
 
-class TopicCreateView(SuccessUrlMixin, FormValidMixin, views.TopicCreateView):
+class TopicCreateView(FormValidMixin, views.TopicCreateView):
     post_form_class = TopicForm
 
     def form_valid(self, *args, **kwargs):
         valid = super().form_valid(*args, **kwargs)
         if self.request.user.is_authenticated:
             self.forum_post.topic.likers.add(self.request.user)
-        if self.forum_post.topic.forum.is_newsfeed:
-            self.forum_post.topic.type = Topic.TOPIC_NEWS
-            self.forum_post.topic.save()
         return valid
 
+    def get_success_url(self):
+        if not self.forum_post.approved:
+            return reverse(
+                "forum_extension:forum",
+                kwargs={
+                    "slug": self.forum_post.topic.forum.slug,
+                    "pk": self.forum_post.topic.forum.pk,
+                },
+            )
+        return reverse(
+            "forum_conversation:topic",
+            kwargs={
+                "forum_slug": self.forum_post.topic.forum.slug,
+                "forum_pk": self.forum_post.topic.forum.pk,
+                "slug": self.forum_post.topic.slug,
+                "pk": self.forum_post.topic.pk,
+            },
+        )
+
 
-class TopicUpdateView(SuccessUrlMixin, FormValidMixin, views.TopicUpdateView):
+class TopicUpdateView(FormValidMixin, views.TopicUpdateView):
     post_form_class = TopicForm
 
 
@@ -63,7 +68,7 @@ def perform_permissions_check(self, user, obj, perms):
         return False
 
 
-class PostUpdateView(SuccessUrlMixin, FormValidMixin, views.PostUpdateView):
+class PostUpdateView(FormValidMixin, views.PostUpdateView):
     pass
 
 
@@ -105,30 +110,18 @@ class TopicListView(ListView):
     def get_template_names(self):
         if self.request.META.get("HTTP_HX_REQUEST"):
             return ["forum_conversation/topic_list.html"]
-        return ["pages/home.html"]
+        return ["forum_conversation/topics_public.html"]
 
     def get_filter(self):
         if not hasattr(self, "filter"):
             self.filter = self.request.GET.get("filter", None)
         return self.filter
 
-    def get_content_tree(self):
-        if not hasattr(self, "forum_visibility_content_tree"):
-            self.forum_visibility_content_tree = ForumVisibilityContentTree.from_forums(
-                self.request.forum_permission_handler.forum_list_filter(
-                    Forum.objects.exclude(type=Forum.FORUM_CAT).prefetch_related("members_group__user_set"),
-                    self.request.user,
-                ),
-            )
-            store_upper_visible_forums(self.request, self.forum_visibility_content_tree.top_nodes)
-        return self.forum_visibility_content_tree
-
     def get_queryset(self):
-        forums = self.get_content_tree().forums
-        qs = Topic.objects.filter(forum__in=forums).optimized_for_topics_list(self.request.user.id)
+        qs = Topic.objects.filter(forum__kind=ForumKind.PUBLIC_FORUM).optimized_for_topics_list(self.request.user.id)
 
         if self.get_filter() == Filters.NEW:
-            qs = qs.unanswered().filter(forum__in=Forum.objects.public())
+            qs = qs.unanswered()
         elif self.get_filter() == Filters.CERTIFIED:
             qs = qs.filter(certified_post__isnull=False)
 
@@ -137,7 +130,7 @@ def get_queryset(self):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["form"] = PostForm(user=self.request.user)
-        context["loadmoretopic_url"] = reverse("forum_conversation_extension:home")
+        context["loadmoretopic_url"] = reverse("forum_conversation_extension:publicforum")
 
         if self.get_filter():
             context["loadmoretopic_url"] += f"?filter={self.get_filter()}"
@@ -150,24 +143,23 @@ def get_context_data(self, **kwargs):
         context["loadmoretopic_suffix"] = "topics"
         context["total"] = self.get_queryset().count()
         context["filters"] = Filters.choices
+        context["forum"] = Forum.objects.filter(kind=ForumKind.PUBLIC_FORUM, lft=1, level=0).first()
 
         return context
 
 
-class TopicNewsListView(ListView):
-    context_object_name = "topics"
-    paginate_by = settings.FORUM_TOPICS_NUMBER_PER_PAGE
-    template_name = "forum_conversation/topic_list.html"
+class NewsFeedTopicListView(TopicListView):
+    def get_template_names(self):
+        if self.request.META.get("HTTP_HX_REQUEST"):
+            return ["forum_conversation/topic_list_newsfeed.html"]
+        return ["forum_conversation/topics_newsfeed.html"]
 
     def get_queryset(self):
-        return Topic.objects.filter(forum__in=Forum.objects.public(), type=Topic.TOPIC_NEWS).optimized_for_topics_list(
-            self.request.user.id
-        )
+        return Topic.objects.filter(forum__kind=ForumKind.NEWS)
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["form"] = PostForm(user=self.request.user)
-        context["loadmoretopic_url"] = reverse("forum_conversation_extension:newsfeed_topics_list")
+        context["loadmoretopic_url"] = reverse("forum_conversation_extension:newsfeed")
         context["loadmoretopic_suffix"] = "newsfeed"
-        context["display_filter_dropdown"] = False
+        context["forum"] = None
         return context
diff --git a/lacommunaute/forum_member/tests/tests_view.py b/lacommunaute/forum_member/tests/tests_view.py
index 96146432d..d7468b2c7 100644
--- a/lacommunaute/forum_member/tests/tests_view.py
+++ b/lacommunaute/forum_member/tests/tests_view.py
@@ -108,7 +108,7 @@ def test_queries_number(self):
         self.forum.members_group.save()
 
         self.client.force_login(self.profile.user)
-        with self.assertNumQueries(19):
+        with self.assertNumQueries(11):
             self.client.get(self.url)
 
 
diff --git a/lacommunaute/forum_upvote/shortcuts.py b/lacommunaute/forum_upvote/shortcuts.py
index ceeeb8574..daefa9935 100644
--- a/lacommunaute/forum_upvote/shortcuts.py
+++ b/lacommunaute/forum_upvote/shortcuts.py
@@ -1,4 +1,9 @@
+from lacommunaute.forum.enums import Kind as Forum_Kind
+
+
 def can_certify_post(forum, user):
     return (
-        user.is_authenticated and not forum.is_private and (user.groups.filter(forum=forum).exists() or user.is_staff)
+        user.is_authenticated
+        and forum.kind == Forum_Kind.PUBLIC_FORUM
+        and (user.groups.filter(forum=forum).exists() or user.is_staff)
     )
diff --git a/lacommunaute/forum_upvote/tests/tests_shortcuts.py b/lacommunaute/forum_upvote/tests/tests_shortcuts.py
index 004010b4c..704c196f3 100644
--- a/lacommunaute/forum_upvote/tests/tests_shortcuts.py
+++ b/lacommunaute/forum_upvote/tests/tests_shortcuts.py
@@ -1,6 +1,7 @@
 from django.contrib.auth.models import AnonymousUser
 from django.test import TestCase
 
+from lacommunaute.forum.enums import Kind as ForumKind
 from lacommunaute.forum.factories import ForumFactory
 from lacommunaute.forum_upvote.shortcuts import can_certify_post
 from lacommunaute.users.factories import UserFactory
@@ -16,7 +17,10 @@ def test_user_is_not_authenticated(self):
         self.assertFalse(can_certify_post(self.forum, AnonymousUser()))
 
     def test_forum_is_private(self):
-        self.assertFalse(can_certify_post(ForumFactory.create(is_private=True), self.user))
+        self.assertFalse(can_certify_post(ForumFactory.create(kind=ForumKind.PRIVATE_FORUM), self.user))
+
+    def test_forum_is_newsfeed(self):
+        self.assertFalse(can_certify_post(ForumFactory.create(kind=ForumKind.NEWS), self.user))
 
     def test_user_is_not_in_the_forum_members_group(self):
         self.assertFalse(can_certify_post(self.forum, self.user))
diff --git a/lacommunaute/inclusion_connect/tests/tests_views.py b/lacommunaute/inclusion_connect/tests/tests_views.py
index 5853cf704..fb9f1a0e4 100644
--- a/lacommunaute/inclusion_connect/tests/tests_views.py
+++ b/lacommunaute/inclusion_connect/tests/tests_views.py
@@ -41,7 +41,7 @@ def mock_oauth_dance(
     previous_url=None,
     next_url=None,
     assert_redirects=True,
-    expected_route="forum_conversation_extension:home",
+    expected_route="pages:home",
     user_info_email=None,
 ):
     respx.get(constants.INCLUSION_CONNECT_ENDPOINT_AUTHORIZE).respond(302)
@@ -175,19 +175,17 @@ def test_normal_signin(self):
         response = self.client.post(reverse("inclusion_connect:logout"))
 
         # Then log in again.
-        response = self.client.get(reverse("forum_conversation_extension:home"))
+        response = self.client.get(reverse("pages:home"))
         self.assertContains(response, reverse("inclusion_connect:authorize"))
 
         response = mock_oauth_dance(self, assert_redirects=False)
-        expected_redirection = reverse("forum_conversation_extension:home")
+        expected_redirection = reverse("pages:home")
         self.assertRedirects(response, expected_redirection)
 
         # Make sure it was a login instead of a new signup.
         users_count = User.objects.filter(email=OIDC_USERINFO["email"]).count()
         self.assertEqual(users_count, 1)
 
-        self.assertIn("upper_visible_forums", response.wsgi_request.session.keys())
-
 
 class InclusionConnectLogoutTest(InclusionConnectBaseTestCase):
     @respx.mock
@@ -196,13 +194,13 @@ def test_simple_logout(self):
         respx.get(constants.INCLUSION_CONNECT_ENDPOINT_LOGOUT).respond(200)
         logout_url = reverse("inclusion_connect:logout")
         response = self.client.get(logout_url)
-        self.assertRedirects(response, reverse("forum_conversation_extension:home"))
+        self.assertRedirects(response, reverse("pages:home"))
         self.assertFalse(auth.get_user(self.client).is_authenticated)
 
     @respx.mock
     def test_logout_with_redirection(self):
         mock_oauth_dance(self)
-        expected_redirection = reverse("forum_conversation_extension:home")
+        expected_redirection = reverse("pages:home")
         respx.get(constants.INCLUSION_CONNECT_ENDPOINT_LOGOUT).respond(200)
 
         params = {"redirect_url": expected_redirection}
diff --git a/lacommunaute/inclusion_connect/views.py b/lacommunaute/inclusion_connect/views.py
index 99ea29413..4a95bbd39 100644
--- a/lacommunaute/inclusion_connect/views.py
+++ b/lacommunaute/inclusion_connect/views.py
@@ -43,12 +43,12 @@ def _redirect_to_login_page_on_error(error_msg, request=None):
     if request:
         messages.error(request, "Une erreur technique est survenue. Merci de recommencer.")
     logger.error(error_msg)
-    return HttpResponseRedirect(reverse("forum_conversation_extension:home"))
+    return HttpResponseRedirect(reverse("pages:home"))
 
 
 def inclusion_connect_authorize(request):
     # Start a new session.
-    previous_url = request.GET.get("previous_url", reverse("forum_conversation_extension:home"))
+    previous_url = request.GET.get("previous_url", reverse("pages:home"))
     next_url = request.GET.get("next_url")
     sign_in = bool(request.GET.get("sign_in", False))
 
@@ -145,14 +145,14 @@ def inclusion_connect_callback(request):  # pylint: disable=too-many-return-stat
 
     login(request, user)
 
-    next_url = ic_session["next_url"] or reverse("forum_conversation_extension:home")
+    next_url = ic_session["next_url"] or reverse("pages:home")
     return HttpResponseRedirect(next_url)
 
 
 def inclusion_connect_logout(request):
     token = request.GET.get("token")
     state = request.GET.get("state")
-    post_logout_redirect_url = request.GET.get("redirect_url", reverse("forum_conversation_extension:home"))
+    post_logout_redirect_url = request.GET.get("redirect_url", reverse("pages:home"))
 
     # Fallback on session data.
     if not token:
diff --git a/lacommunaute/notification/tests/tests_tasks.py b/lacommunaute/notification/tests/tests_tasks.py
index 14f02ef91..d1e5ff81f 100644
--- a/lacommunaute/notification/tests/tests_tasks.py
+++ b/lacommunaute/notification/tests/tests_tasks.py
@@ -14,6 +14,7 @@
     SIB_SMTP_URL,
     SIB_UNANSWERED_QUESTION_TEMPLATE,
 )
+from lacommunaute.forum.enums import Kind as ForumKind
 from lacommunaute.forum.factories import ForumFactory
 from lacommunaute.forum_conversation.factories import PostFactory, TopicFactory
 from lacommunaute.notification.models import EmailSentTrack
@@ -147,7 +148,7 @@ def setUp(self):
 
     @respx.mock
     def test_send_notifs_on_unanswered_topics(self):
-        TopicFactory(with_post=True, forum=ForumFactory(is_private=False))
+        TopicFactory(with_post=True, forum=ForumFactory(kind=ForumKind.PUBLIC_FORUM))
         expected_contact = self.contact_list_response["contacts"][0]
         to = [
             {
diff --git a/lacommunaute/pages/tests/tests.py b/lacommunaute/pages/tests/tests.py
index 1ff7857a1..ce3ab3629 100644
--- a/lacommunaute/pages/tests/tests.py
+++ b/lacommunaute/pages/tests/tests.py
@@ -13,7 +13,7 @@
 
 class HomepageTest(TestCase):
     def test_home_page(self):
-        url = reverse("forum_conversation_extension:home")
+        url = reverse("pages:home")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, "pages/home.html")
diff --git a/lacommunaute/pages/urls.py b/lacommunaute/pages/urls.py
index bf603f36e..d1daff80e 100644
--- a/lacommunaute/pages/urls.py
+++ b/lacommunaute/pages/urls.py
@@ -14,6 +14,7 @@
 app_name = "pages"
 
 urlpatterns = [
+    path("", views.HomeView.as_view(), name="home"),
     path("contact/", views.contact, name="contact"),
     path("statistiques/", views.StatistiquesPageView.as_view(), name="statistiques"),
     path("accessibilite/", views.accessibilite, name="accessibilite"),
diff --git a/lacommunaute/pages/views.py b/lacommunaute/pages/views.py
index 684351868..8b60e1ae7 100644
--- a/lacommunaute/pages/views.py
+++ b/lacommunaute/pages/views.py
@@ -1,4 +1,5 @@
 import logging
+from typing import Any
 
 from django.contrib.auth.mixins import UserPassesTestMixin
 from django.db.models import CharField
@@ -7,6 +8,9 @@
 from django.utils import timezone
 from django.views.generic.base import TemplateView
 
+from lacommunaute.forum.enums import Kind as ForumKind
+from lacommunaute.forum.models import Forum
+from lacommunaute.forum_conversation.models import Topic
 from lacommunaute.forum_stats.models import Stat
 from lacommunaute.utils.json import extract_values_in_list
 
@@ -47,6 +51,22 @@ def test_func(self):
         return self.request.user.is_superuser
 
 
+class HomeView(TemplateView):
+    template_name = "pages/home.html"
+
+    def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
+        context = super().get_context_data(**kwargs)
+        context["topics_public"] = Topic.objects.filter(forum__kind=ForumKind.PUBLIC_FORUM, approved=True).order_by(
+            "-last_post_on"
+        )[:4]
+        context["topics_newsfeed"] = Topic.objects.filter(forum__kind=ForumKind.NEWS).order_by("-last_post_on")[:4]
+        context["forums_category"] = Forum.objects.filter(kind=ForumKind.PUBLIC_FORUM, parent__type=1).order_by(
+            "-updated"
+        )[:4]
+        context["forum"] = Forum.objects.filter(kind=ForumKind.PUBLIC_FORUM, lft=1, level=0).first()
+        return context
+
+
 def accessibilite(request):
     return render(request, "pages/accessibilite.html")
 
diff --git a/lacommunaute/templates/404.html b/lacommunaute/templates/404.html
index 0c9aedd94..66b8bb1b3 100644
--- a/lacommunaute/templates/404.html
+++ b/lacommunaute/templates/404.html
@@ -12,7 +12,7 @@
                         <h1 class="h1">Bienvenue sur le site de la Communauté de l'Inclusion.</h1>
                         <p>Le site a fait peau neuve et le lien sur lequel vous avez cliqué n'est plus disponible.</p>
                         <p>L'aide reste accessible à l'adresse <a href="https://documentation.inclusion.beta.gouv.fr/aide/">documentation.inclusion.beta.gouv.fr/aide/</a></p>
-                        <p>La liste des communautés publiques est accessible à l'adresse <a href="{% url 'forum_conversation_extension:home' %}">communaute.inclusion.beta.gouv.fr</a></p>
+                        <p>La liste des communautés publiques est accessible à l'adresse <a href="{% url 'pages:home' %}">communaute.inclusion.beta.gouv.fr</a></p>
                         <p>Pour retrouver l'intégralité des services, vous pouvez consulter le site <a href="https://inclusion.beta.gouv.fr/">inclusion.beta.gouv.fr</a></p>
                     </div>
                 </div>
diff --git a/lacommunaute/templates/forum/category_forum_list.html b/lacommunaute/templates/forum/category_forum_list.html
index 867ddf868..cf87fa913 100644
--- a/lacommunaute/templates/forum/category_forum_list.html
+++ b/lacommunaute/templates/forum/category_forum_list.html
@@ -1,31 +1,51 @@
-<div class="row">
-    {% for forum in forums %}
-        <div class="col-12 col-md-4 mb-3">
-            <div class="card c-card has-links-inside h-100">
-                {% if forum.image %}
-                    <div class="card-header">
-                        <img src="{{ forum.image.url }}" class="img-fluid img-fitcover" alt="">
-                    </div>
-                {% endif %}
-                <div class="card-body pb-0">
-                    <p class="h3 lh-base">{{ forum.name }}</p>
-                    {% if forum.description %}
-                        <div>
-                            {{ forum.description.rendered|truncatechars_html:100 }}
+{% extends 'board_base.html' %}
+
+
+{% block meta_description %}Des ressources exclusives pour les professionnels de l'inclusion{% endblock meta_description %}"
+
+{% block content %}
+
+    <section class="s-page-menu-01 s-page-menu-01--communaute">
+        <div class="s-page-menu-01__container container">
+            <div class="s-page-menu-01__row row align-items-center">
+                <div class="s-page-menu-01__col s-page-menu-01__col--title col-12">
+                    <h1 class="h1-hero lh-sm font-weight-bold m-0">Documentations</h1>
+                    <h2 class="mt-3">Des ressources exclusives pour les professionnels de l'inclusion (texte pour le SEO)</h2>
+                </div>
+            </div>
+        </div>
+    </section>
+
+    <div class="row">
+        {% for forum in forums %}
+            <div class="col-12 col-md-4 mb-3">
+                <div class="card c-card has-links-inside h-100">
+                    {% if forum.image %}
+                        <div class="card-header">
+                            <img src="{{ forum.image.url }}" class="img-fluid img-fitcover" alt="">
                         </div>
                     {% endif %}
-                </div>
-                <div class="card-footer text-right">
-                    <a href="{% url 'forum_extension:forum' forum.slug forum.id %}"
-                       class="btn btn-ico btn-link stretched-link matomo-event"
-                       data-matomo-category="engagement"
-                       data-matomo-action="show"
-                       data-matomo-option="fichestechniques">
-                        <span>Consulter les fiches du thème</span>
-                        <i class="ri-arrow-right-up-line ri-lg"></i>
-                    </a>
+                    <div class="card-body pb-0">
+                        <p class="h3 lh-base">{{ forum.name }}</p>
+                        {% if forum.short_description %}
+                            <div>
+                                {{ forum.short_description }}
+                            </div>
+                        {% endif %}
+                    </div>
+                    <div class="card-footer text-right">
+                        <a href="{% url 'forum_extension:forum' forum.slug forum.id %}"
+                            class="btn btn-ico btn-link stretched-link matomo-event"
+                            data-matomo-category="engagement"
+                            data-matomo-action="show"
+                            data-matomo-option="fichestechniques">
+                            <span>Consulter les fiches du thème</span>
+                            <i class="ri-arrow-right-up-line ri-lg"></i>
+                        </a>
+                    </div>
                 </div>
             </div>
-        </div>
-    {% endfor %}
-</div>
+        {% endfor %}
+    </div>
+
+{% endblock content %}
diff --git a/lacommunaute/templates/forum/forum_detail.html b/lacommunaute/templates/forum/forum_detail.html
index 16206abbb..adbf3f719 100644
--- a/lacommunaute/templates/forum/forum_detail.html
+++ b/lacommunaute/templates/forum/forum_detail.html
@@ -14,23 +14,60 @@
     <div class="row">
         <div class="col-12">
             <h1>
-                {% if forum.level > 0 %}
-                    {% for ancestor in forum.get_ancestors %}
-                        <a href="{% url 'forum_extension:forum' ancestor.slug ancestor.id %}"
-                           class="matomo-event"
-                           data-matomo-category="engagement"
-                           data-matomo-action="view"
-                           data-matomo-option="forum">
-                            {{ ancestor.name }}</a> /
-                    {% endfor %}
-                {% endif %}
                 {{ forum.name }}
             </h1>
-            {% if forum.description %}
-                <div class="lead">{{forum.description.rendered|urlizetrunc_target_blank:30}}</div>
-            {% endif %}
         </div>
     </div>
+
+    {% if forum.short_description %}
+        <div class="row mt-3">
+            <div class="col-12">
+                <h2 class="h2">
+                    {{ forum.short_description }}
+                </h2>
+            </div>
+        </div>
+    {% endif %}
+
+    {% if forums %}
+        <div class="row mt-3">
+            <div class="col-12 col-sm-3">
+                <a href="{% url 'forum_extension:forum' parent_forum.slug parent_forum.id %}"
+                    class="matomo-event h3"
+                    data-matomo-category="engagement"
+                    data-matomo-action="view"
+                    data-matomo-option="forum">
+                    Fiches {{ parent_forum.name }}
+                </a>
+                <ul>
+                    {% for forum in forums %}
+                        <li><a href="{% url 'forum_extension:forum' forum.slug forum.id %}">{{ forum.name }}</a></li>
+                    {% endfor%}
+                </ul>
+            </div>
+            <div class="col-12 col-sm-9">
+                <small>dernière mise à jour le : {{ forum.updated|date:"d/m/Y" }}</small>
+                {{forum.description.rendered|urlizetrunc_target_blank:30}}
+            </div>
+        </div>
+    {% else %}
+        {% if forum.description %}
+            <div class="row mt-3">
+                <div class="col-12">
+                    <div class="lead">{{forum.description.rendered|urlizetrunc_target_blank:30}}</div>
+                </div>
+            </div>
+        {% endif %}
+    {% endif %}
+
+
+
+
+
+
+
+
+
     {% if sub_forums %}
         {% forum_list sub_forums %}
     {% endif %}
@@ -42,12 +79,12 @@ <h1>
                 <div class="col-12 col-sm-auto forum-actions-block">
                     {% if user_can_add_topic %}
                         <a href="{% url 'forum_conversation:topic_create' forum.slug forum.pk %}"
-                           class="btn btn-primary btn-ico matomo-event"
-                           data-matomo-category="engagement"
-                           data-matomo-action="contribute"
-                           data-matomo-option="new_topic">
+                            class="btn btn-primary btn-ico matomo-event"
+                            data-matomo-category="engagement"
+                            data-matomo-action="contribute"
+                            data-matomo-option="new_topic">
                             <i class="ri-chat-new-line ri-lg"></i>
-                            <span>{% if forum.is_newsfeed %}{% trans "New news" %}{% else %}{% trans "New topic" %}{% endif %}</span>
+                            <span>{% if forum.kind == 'NEWS' %}{% trans "New news" %}{% else %}{% trans "New topic" %}{% endif %}</span>
                         </a>
                     {% endif %}
                     {% if user_can_access_stats and forum.members_group%}
@@ -56,10 +93,10 @@ <h1>
                         </button>
                         <div class="dropdown-menu" aria-labelledby="id_dropdown_moderators_stats_button">
                             <a href="{% url 'members:forum_profiles' forum.slug forum.pk %}"
-                               class="dropdown-item matomo-event"
-                               data-matomo-category="engagement"
-                               data-matomo-action="view"
-                               data-matomo-option="directory">
+                                class="dropdown-item matomo-event"
+                                data-matomo-category="engagement"
+                                data-matomo-action="view"
+                                data-matomo-option="directory">
                                 {% trans "Members" %}
                             </a>
                         </div>
@@ -74,22 +111,22 @@ <h1>
                         <ul class="s-tabs-01__nav nav nav-tabs" role="tablist">
                             <li class="nav-item" role="presentation">
                                 <a class="nav-link active" id="topics-tab"
-                                   data-toggle="tab"
-                                   href="#topics"
-                                   role="tab"
-                                   aria-controls="topics"
-                                   aria-selected="true">
+                                    data-toggle="tab"
+                                    href="#topics"
+                                    role="tab"
+                                    aria-controls="topics"
+                                    aria-selected="true">
                                     Sujets
                                 </a>
                             </li>
                             {% if announces %}
                                 <li class="nav-item" role="presentation">
                                     <a class="nav-link" id="announces-tab"
-                                       data-toggle="tab"
-                                       href="#announces"
-                                       role="tab"
-                                       aria-controls="announces"
-                                       aria-selected="false">
+                                        data-toggle="tab"
+                                        href="#announces"
+                                        role="tab"
+                                        aria-controls="announces"
+                                        aria-selected="false">
                                         Annonces
                                     </a>
                                 </li>
@@ -102,16 +139,16 @@ <h1>
                         </ul>
                         <div class="tab-content topiclist">
                             <div class="tab-pane fade show active" id="topics"
-                                 role="tabpanel"
-                                 aria-labelledby="topics-tab">
+                                role="tabpanel"
+                                aria-labelledby="topics-tab">
                                 {% with unread_topics=unread_topics  %}
                                     {% include "forum_conversation/topic_list.html" %} <!-- note vincentporte : to be optimized -->
                                 {% endwith %}
                             </div>
                             {% if announces %}
                                 <div class="tab-pane fade" id="announces"
-                                     role="tabpanel"
-                                     aria-labelledby="announces-tab">
+                                    role="tabpanel"
+                                    aria-labelledby="announces-tab">
                                     {% with topics=announces hide_if_empty=True unread_topics=unread_topics loadmoretopic_url=None %}
                                         {% include "forum_conversation/topic_list.html" %} <!-- note vincentporte : to be optimized -->
                                     {% endwith %}
diff --git a/lacommunaute/templates/forum/forum_list.html b/lacommunaute/templates/forum/forum_list.html
index daaeafc65..6b7b34334 100644
--- a/lacommunaute/templates/forum/forum_list.html
+++ b/lacommunaute/templates/forum/forum_list.html
@@ -57,7 +57,7 @@ <h3 class="h3 mb-0">
                                                 {{ child.obj.name }}
                                             </a>
                                             <small class="text-muted">
-                                                {% if node.obj.is_private %}
+                                                {% if node.obj.kind == "" %}
                                                     <i class="ri-lock-2-fill"></i> {{node.obj.members_group.user_set.count}} Membres -
                                                 {% endif %}
                                                 {% if child.topics_count > 1 %}
@@ -88,9 +88,11 @@ <h3 class="h3 mb-0">
                     <div class="card c-card has-links-inside h-100">
                         <div class="card-body pb-0">
                             <p class="h3 lh-base">{{ node.obj.name }}</p>
-                            <div>
-                                {{ node.obj.description.rendered|truncatechars_html:200 }}
-                            </div>
+                            {% if node.obj.short_description %}
+                                <div>
+                                    {{ node.obj.short_description }}
+                                </div>
+                            {% endif %}
                         </div>
                         <div class="card-footer text-right">
                             <a href="{% url 'forum_extension:forum' node.obj.slug node.obj.id %}"
@@ -119,7 +121,7 @@ <h3 class="h3 mb-0">
                             {{ node.obj.name }}
                         </a>
                         <small class="text-muted">
-                            {% if node.obj.is_private%}
+                            {% if node.obj.kind == 'PRIVATE_FORUM' %}
                                 <i class="ri-lock-2-fill"></i> {{node.obj.members_group.user_set.count}} membres -
                             {% endif %}
                             {% if node.topics_count > 1 %}
diff --git a/lacommunaute/templates/forum/partials/topics_and_members_counts.html b/lacommunaute/templates/forum/partials/topics_and_members_counts.html
index 6f4b9ea47..6fc380df2 100644
--- a/lacommunaute/templates/forum/partials/topics_and_members_counts.html
+++ b/lacommunaute/templates/forum/partials/topics_and_members_counts.html
@@ -2,11 +2,11 @@
 {% load str_filters %}
 
 <small class="text-muted">
-    {% if node.obj.is_private%}
+    {% if node.obj.kind == 'PRIVATE_FORUM' %}
         <i class="ri-lock-2-fill"></i> {{node.obj.members_group.user_set.count}} membre{{ node.obj.members_group.user_set.count|pluralizefr }}
     {% endif %}
     {% if node.obj.is_forum %}
-        {% if node.obj.is_private%} - {% endif %}
+        {% if node.obj.kind == 'PRIVATE_FORUM' %} - {% endif %}
         {% if node.topics_count > 1 %}
             {{ node.topics_count }} {% trans "Topics" %}
         {% else %}
diff --git a/lacommunaute/templates/forum_conversation/partials/topic_filter.html b/lacommunaute/templates/forum_conversation/partials/topic_filter.html
index 0795b9267..47af51bc4 100644
--- a/lacommunaute/templates/forum_conversation/partials/topic_filter.html
+++ b/lacommunaute/templates/forum_conversation/partials/topic_filter.html
@@ -18,13 +18,13 @@
                             {% for filter in filters %}
                                 <li>
                                     <button id="filtertopics-button"
-                                            hx-target="#topicsarea"
-                                            hx-swap="outerHTML"
-                                            hx-get="{% url 'forum_conversation_extension:home' %}?filter={{ filter.0 }}"
-                                            class="dropdown-item matomo-event"
-                                            data-matomo-category="engagement"
-                                            data-matomo-action="filter"
-                                            data-matomo-option="topics">
+                                        hx-target="#topicsarea"
+                                        hx-swap="outerHTML"
+                                        hx-get="{% url 'forum_conversation_extension:publicforum' %}?filter={{ filter.0 }}"
+                                        class="dropdown-item matomo-event"
+                                        data-matomo-category="engagement"
+                                        data-matomo-action="filter"
+                                        data-matomo-option="topics">
                                         {{ filter.1 }}
                                     </button>
                                 </li>
diff --git a/lacommunaute/templates/forum_conversation/partials/topic_tags.html b/lacommunaute/templates/forum_conversation/partials/topic_tags.html
index 1eaf13b47..547aad54b 100644
--- a/lacommunaute/templates/forum_conversation/partials/topic_tags.html
+++ b/lacommunaute/templates/forum_conversation/partials/topic_tags.html
@@ -1,9 +1,3 @@
-<a class="matomo-event"
-   href="{% url 'forum_extension:forum' topic.forum.slug topic.forum.pk %}"
-   data-matomo-category="engagement"
-   data-matomo-action="view-tags"
-   data-matomo-option="forum">
-    <span class="badge badge-xs badge-pill badge-info-lighter text-info">{{ topic.forum.name }}</span></a>
 {% for tag in tags %}
     <span class="badge badge-xs badge-pill badge-info-lighter text-info">{{ tag }}</span>
 {% endfor %}
diff --git a/lacommunaute/templates/forum_conversation/topic_list_newsfeed.html b/lacommunaute/templates/forum_conversation/topic_list_newsfeed.html
new file mode 100644
index 000000000..171eb6479
--- /dev/null
+++ b/lacommunaute/templates/forum_conversation/topic_list_newsfeed.html
@@ -0,0 +1,102 @@
+{% load i18n %}
+{% load forum_conversation_tags %}
+{% load forum_member_tags %}
+{% load forum_tracking_tags %}
+{% load forum_permission_tags %}
+{% load str_filters %}
+{% load url_add_query %}
+
+{% if forum %}
+    {% get_permission 'can_download_files' forum request.user as user_can_download_files %}
+{% endif %}
+
+<div id="topicsarea">
+    {% if topics or not hide_if_empty %}
+
+        {% for topic in topics %}
+            <div class="row">
+                <div class="col-12">
+                    <div id="{{ topic.pk }}" class="card post mb-3">
+                        <div class="card-header mb-1 d-flex flex-column flex-md-row align-items-md-center">
+                            <div class="topic-thumbnail bg-light d-none d-md-block">
+                            </div>
+                            <p class="h4 mb-0 flex-grow-1">
+                                <a href="{% url 'forum_conversation:topic' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
+                                    class="matomo-event"
+                                    data-matomo-category="engagement"
+                                    data-matomo-action="view"
+                                    data-matomo-option="news">
+                                    {{ topic.subject }} {% if topic.is_locked %}&nbsp;<i class="fas fa-times-circle locked-indicator" aria-label="{% trans 'This topic is locked' %}"></i>{% endif %}
+                                </a>
+                            </p>
+                        </div>
+                        <div class="card-body pt-0">
+                            <div class="row">
+                                <div class="col-12 post-content-wrapper mb-1">
+                                    {% include "forum_conversation/partials/poster.html" with post=topic.first_post topic=topic is_topic_head=True %}
+                                </div>
+                                <div class="col-12 post-content">
+                                    <div id="showmoretopicsarea{{topic.pk}}">
+                                        {{ topic.first_post.content.rendered|urlizetrunc_target_blank:30|img_fluid|truncatechars_html:200 }}
+                                        {% if topic.first_post.content.rendered|length > 200 %}
+                                            <a hx-get="{% url 'forum_conversation_extension:showmore_topic' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
+                                                id="showmoretopic-button{{topic.pk}}"
+                                                hx-target="#showmoretopicsarea{{topic.pk}}"
+                                                hx-swap="outerHTML"
+                                                class="btn btn-link p-0 mh-auto matomo-event"
+                                                data-matomo-category="engagement"
+                                                data-matomo-action="showmore"
+                                                data-matomo-option="news"
+                                            >
+                                                {% trans "+ show more" %}
+                                            </a>
+                                        {% endif %}
+                                    </div>
+                                    {% include "forum_conversation/forum_attachments/attachments_images.html" with post=topic.first_post %}
+
+                                    {% if not forum %}
+                                        {% get_permission 'can_download_files' topic.forum request.user as user_can_download_files %}
+                                    {% endif %}
+                                    {% include "forum_conversation/forum_attachments/attachments_detail.html" with post=topic.first_post user_can_download_files=user_can_download_files %}
+
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row align-items-sm-center mb-3 justify-content-end">
+                <div class="col-12 col-sm-auto">
+                    {% include "forum_conversation/partials/social_share_buttons.html" with topic=topic %}
+                </div>
+            </div>
+        {% empty %}
+            <div class="row m-0 p-3">
+                <div class="col-12 pl-0">
+                    {% if empty_message %}
+                        {{ empty_message }}
+                    {% else %}
+                        {% trans "There are no topics in this forum." %}
+                    {% endif %}
+                </div>
+            </div>
+        {% endfor %}
+        {% if loadmoretopic_url and is_paginated and page_obj.has_next%}
+            <div id="loadmoretopicsarea{{ loadmoretopic_suffix }}" class="row mx-3 mt-md-5 justify-content-center">
+                <div class="col-12 col-md-auto">
+                    <a hx-get="{% url_add_query loadmoretopic_url page=page_obj.next_page_number %}"
+                        id="loadmoretopics-button"
+                        hx-target="#loadmoretopicsarea{{ loadmoretopic_suffix }}"
+                        hx-swap="outerHTML"
+                        class="btn btn-link btn-ico btn-block justify-content-center matomo-event"
+                        data-matomo-category="engagement"
+                        data-matomo-action="loadmore"
+                        data-matomo-option="topic">
+                        <i class="ri-loop-right-line" aria-hidden="true"></i>
+                        <span>{% trans "load more topics" %}</span>
+                    </a>
+                </div>
+            </div>
+        {% endif %}
+    {% endif %}
+</div>
diff --git a/lacommunaute/templates/forum_conversation/topics_newsfeed.html b/lacommunaute/templates/forum_conversation/topics_newsfeed.html
new file mode 100644
index 000000000..174b36192
--- /dev/null
+++ b/lacommunaute/templates/forum_conversation/topics_newsfeed.html
@@ -0,0 +1,58 @@
+{% extends "layouts/base.html" %}
+{% load static %}
+{% load i18n %}
+{% load forum_permission_tags %}
+{% load mptt_tags %}
+{% load forum_tags %}
+
+{% block title %}Actualités de l'inclusion{{ block.super }}{% endblock %}
+{% block meta_description %}{% endblock meta_description %}"
+
+{% block body_class %}p-homepage{{ block.super }}{% endblock %}
+
+{% block content %}
+
+    <section class="s-page-menu-01 s-page-menu-01--communaute">
+        <div class="s-page-menu-01__container container">
+            <div class="s-page-menu-01__row row align-items-center">
+                <div class="s-page-menu-01__col s-page-menu-01__col--title col-12">
+                    <h1 class="h1-hero lh-sm font-weight-bold m-0">Actualités de l'inclusion</h1>
+                    <h2 class="mt-3">Retrouvez les dernières actus et infos de l'inclusion (texte pour le SEO)</h2>
+                </div>
+            </div>
+        </div>
+    </section>
+
+    <section class="s-section mt-0">
+        <div class="s-section__container container">
+            <div class="s-section__row row">
+                <div class="s-section__col col-12">
+                    <div class="c-box">
+                        {% with topics=topics %}
+                            {% include "forum_conversation/topic_list_newsfeed.html" %}
+                        {% endwith %}
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
+
+    {% if not user.is_authenticated %}
+        <section class="s-section">
+            <div class="s-section__container container">
+                <div class="s-section__row row mb-1 mb-md-3">
+                    <div class="s-section__col col-12 col-lg-auto">
+                        <a href="{% url 'inclusion_connect:authorize' %}" class="btn btn-block btn-ico btn-outline-primary justify-content-center">
+                            <i class="ri-login-box-line ri-lg" aria-hidden="true"></i>
+                            <span>
+                                Je me connecte pour accéder à toutes mes thématiques
+                            </span>
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </section>
+    {% endif %}
+{% endblock %}
+
+
diff --git a/lacommunaute/templates/forum_conversation/topics_public.html b/lacommunaute/templates/forum_conversation/topics_public.html
new file mode 100644
index 000000000..436c50d9a
--- /dev/null
+++ b/lacommunaute/templates/forum_conversation/topics_public.html
@@ -0,0 +1,70 @@
+{% extends "layouts/base.html" %}
+{% load static %}
+{% load i18n %}
+{% load forum_permission_tags %}
+{% load mptt_tags %}
+{% load forum_tags %}
+
+{% block title %}Accueil{{ block.super }}{% endblock %}
+{% block meta_description %}Entraide, information et apprentissage pour les professionnels de l'Insertion par l'Activité Economique{% endblock meta_description %}"
+
+{% block body_class %}p-homepage{{ block.super }}{% endblock %}
+
+{% block content %}
+
+    <section class="s-page-menu-01 s-page-menu-01--communaute">
+        <div class="s-page-menu-01__container container">
+            <div class="s-page-menu-01__row row align-items-center">
+                <div class="s-page-menu-01__col s-page-menu-01__col--title col-12">
+                    <h1 class="h1-hero lh-sm font-weight-bold m-0">Espace d'échanges</h1>
+                    <h2 class="mt-3">Posez vos questions et répondez aux autres professionnels (texte pour le SEO)</h2>
+                </div>
+            </div>
+            <div class="s-page-menu-01__row row align-items-center">
+                <div class="s-page-menu-01__col s-page-menu-01__col--title col-12 col-lg-8 mt-3 mt-lg-5">
+                    {% include "partials/ask_a_question.html" %}
+                </div>
+            </div>
+
+        </div>
+    </section>
+
+
+    <div id="community"></div>
+
+    <section class="s-section mt-0">
+        <div class="s-section__container container">
+            <div class="s-section__row row">
+                <div class="s-section__col col-12">
+
+                    <div class="c-box">
+
+                        {% with topics=topics %}
+                            {% include "forum_conversation/topic_list.html" %}
+                        {% endwith %}
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
+
+    {% if not user.is_authenticated %}
+        <section class="s-section">
+            <div class="s-section__container container">
+                <div class="s-section__row row mb-1 mb-md-3">
+                    <div class="s-section__col col-12 col-lg-auto">
+                        <a href="{% url 'inclusion_connect:authorize' %}" class="btn btn-block btn-ico btn-outline-primary justify-content-center">
+                            <i class="ri-login-box-line ri-lg" aria-hidden="true"></i>
+                            <span>
+                                Je me connecte pour accéder à toutes mes thématiques
+                            </span>
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </section>
+    {% endif %}
+{% endblock %}
+
+
diff --git a/lacommunaute/templates/pages/home.html b/lacommunaute/templates/pages/home.html
index b06a87178..165a7864e 100644
--- a/lacommunaute/templates/pages/home.html
+++ b/lacommunaute/templates/pages/home.html
@@ -12,175 +12,108 @@
 
 {% block content %}
 
-    {% if user.is_authenticated %}
-        <section class="s-page-menu-01 s-page-menu-01--communaute">
-            <div class="s-page-menu-01__container container">
-                <div class="s-page-menu-01__row row align-items-center">
-                    <div class="s-page-menu-01__col s-page-menu-01__col--title col-12">
-                        <h1 class="h1-hero lh-sm font-weight-bold m-0">Entraide, actus et apprentissage pour les professionnels de l'IAE</h1>
-                    </div>
-                </div>
-                <div class="s-page-menu-01__row row">
-                    <div class="s-page-menu-01__col s-page-menu-01__col--title col-12 col-lg-8 mt-3 mt-lg-5">
-                        {% include "partials/ask_a_question.html" %}
-                    </div>
-                    <div class="s-page-menu-01__col col-12 mt-3 mt-lg-5">
-                        {% include "partials/banner.html" %}
-                    </div>
+    <section class="s-page-menu-01 s-page-menu-01--communaute">
+        <div class="s-page-menu-01__container container">
+            <div class="s-page-menu-01__row row align-items-center">
+                <div class="s-page-menu-01__col s-page-menu-01__col--title col-12">
+                    <h1 class="h1-hero lh-sm font-weight-bold m-0">Entraide, actus et apprentissage<br>pour les professionnels de l'IAE</h1>
                 </div>
             </div>
-        </section>
-    {% else %}
-        <section class="s-page-menu-01 s-page-menu-01--communaute">
-            <div class="s-page-menu-01__container container">
-                <div class="s-page-menu-01__row row align-items-center">
-                    <div class="s-page-menu-01__col s-page-menu-01__col--title col-12">
-                        <h1 class="h1-hero lh-sm font-weight-bold m-0">Entraide, actus et apprentissage<br>pour les professionnels de l'IAE</h1>
-                    </div>
-                </div>
-                <div class="s-page-menu-01__row row align-items-center">
-                    <div class="s-page-menu-01__col s-page-menu-01__col--title col-12 col-lg-8 mt-3 mt-lg-5">
-                        <h2 class="h1 mb-3 mb-lg-5">Améliorez votre pratique professionnelle :</h2>
-                        <ul class="lead list-unstyled mb-md-5">
-                            <li class="d-flex mb-2">
-                                <i class="text-success ri-checkbox-circle-fill ri-xxl"></i>
-                                <span class="ml-2">Posez vos questions et répondez aux autres professionnels</span>
-                            </li>
-                            <li class="d-flex mb-2">
-                                <i class="text-success ri-checkbox-circle-fill ri-xxl"></i>
-                                <span class="ml-2">Retrouvez les dernières actus et infos de l'inclusion</span>
-                            </li>
-                            <li class="d-flex mb-2">
-                                <i class="text-success ri-loader-2-line ri-xxl"></i>
-                                <span class="ml-2">Progressez grâce à des ressources exclusives</span>
-                            </li>
-                        </ul>
-                        {% include "partials/ask_a_question.html" %}
-                    </div>
-                    <div class="s-page-menu-01__col col-12 d-none d-lg-inline-flex col-md-4">
-                        <div>
-                            <img src="{% static 'images/hp-illustration-01.svg' %}" class="img-fluid w-lg-75" loading="lazy" alt="">
-                        </div>
-                    </div>
-                </div>
-                <div class="s-page-menu-01__row row">
-                    <div class="s-page-menu-01__col col-12 mt-3 mt-lg-5">
-                        {% include "partials/banner.html" %}
-                    </div>
-                </div>
-            </div>
-        </section>
-    {% endif %}
-
-    <div id="community"></div>
-
-    <section class="s-tabs-01 mt-0">
-        <div class="s-tabs-01__container container">
-            <div class="s-tabs-01__row row">
-                <div class="s-tabs-01__col col-12">
-                    <ul class="s-tabs-01__nav nav nav-tabs" role="tablist">
-                        <li class="nav-item" role="presentation">
-                            <a class="nav-link active" id="topics-tab"
-                               data-toggle="tab"
-                               href="#topics"
-                               role="tab"
-                               aria-controls="topics"
-                               aria-selected="true"
-                               data-matomo-category="engagement"
-                               data-matomo-action="view"
-                               data-matomo-option="topics">
-                                Questions/Réponses
-                            </a>
-                        </li>
-                        <li class="nav-item" role="presentation">
-                            <a id="newsfeed-topics-tab"
-                               data-toggle="tab"
-                               href="#newsfeed-topics"
-                               role="tab"
-                               aria-controls="newsfeed-topics"
-                               aria-selected="false"
-                               hx-target="#newsfeedtopicsarea"
-                               hx-swap="outerHTML"
-                               hx-get="{% url 'forum_conversation_extension:newsfeed_topics_list' %}"
-                               hx-trigger="load"
-                               class="nav-link matomo-event"
-                               data-matomo-category="engagement"
-                               data-matomo-action="loadmore"
-                               data-matomo-option="newsfeed_topic">
-                                Actualités
-                            </a>
+            <div class="s-page-menu-01__row row align-items-center">
+                <div class="s-page-menu-01__col s-page-menu-01__col--title col-12 col-lg-8 mt-3 mt-lg-5">
+                    <h2 class="h1 mb-3 mb-lg-5">Améliorez votre pratique professionnelle :</h2>
+                    <ul class="lead list-unstyled mb-md-5">
+                        <li class="d-flex mb-2">
+                            <i class="text-success ri-checkbox-circle-fill ri-xxl"></i>
+                            <span class="ml-2">Posez vos questions et répondez aux autres professionnels</span>
                         </li>
-                        <!-- coming soon
-                        <li class="nav-item" role="presentation">
-                            <a id="fichestechniques-tab"
-                                data-toggle="tab"
-                                href="#fichestechniques"
-                                role="tab"
-                                aria-controls="fichestechniques"
-                                aria-selected="false"
-                                hx-target="#fichestechniquesarea"
-                                hx-swap="outerHTML"
-                                hx-get="{% url 'forum_extension:categories' %}"
-                                hx-trigger="load"
-                                class="nav-link matomo-event"
-                                data-matomo-category="engagement"
-                                data-matomo-action="loadmore"
-                                data-matomo-option="fichestechniques">
-                                Fiches techniques
-                            </a>
+                        <li class="d-flex mb-2">
+                            <i class="text-success ri-checkbox-circle-fill ri-xxl"></i>
+                            <span class="ml-2">Retrouvez les dernières actus et infos de l'inclusion</span>
                         </li>
-                    -->
-                        <li class="nav-item-dropdown dropdown">
-                            <a class="nav-link dropdown-toggle" href="#" role="button" id="sTabs01DropdownMoreLink" data-toggle="dropdown" aria-expanded="false"><i class="ri-more-line" aria-hidden="true"></i></a>
-                            <div class="dropdown-menu dropdown-menu-right" aria-labelledby="sTabs01DropdownMoreLink"></div>
+                        <li class="d-flex mb-2">
+                            <i class="text-success ri-checkbox-circle-fill ri-xxl"></i>
+                            <span class="ml-2">Progressez grâce à des ressources exclusives</span>
                         </li>
                     </ul>
-                    <div class="tab-content topiclist">
-                        <div class="tab-pane fade show active" id="topics"
-                             role="tabpanel"
-                             aria-labelledby="topics-tab">
-                            {% with topics=topics %}
-                                {% include "forum_conversation/topic_list.html" %}
-                            {% endwith %}
-                        </div>
-                        <div class="tab-pane fade" id="newsfeed-topics"
-                             role="tabpanel"
-                             aria-labelledby="newsfeed-topics-tab">
-                            <div id="newsfeedtopicsarea">
-                                chargement en cours...
-                            </div>
-                        </div>
-                        <!-- coming soon
-                        <div class="tab-pane fade" id="fichestechniques"
-                            role="tabpanel"
-                            aria-labelledby="fichestechniques-tab">
-                            <div id="fichestechniquesarea">
-                                chargement en cours...
-                            </div>
-                        </div>
-                        -->
+                    {% include "partials/ask_a_question.html" %}
+                </div>
+                <div class="s-page-menu-01__col col-12 d-none d-lg-inline-flex col-md-4">
+                    <div>
+                        <img src="{% static 'images/hp-illustration-01.svg' %}" class="img-fluid w-lg-75" loading="lazy" alt="">
                     </div>
                 </div>
             </div>
+
         </div>
     </section>
 
-    {% if not user.is_authenticated %}
-        <section class="s-section">
-            <div class="s-section__container container">
-                <div class="s-section__row row mb-1 mb-md-3">
-                    <div class="s-section__col col-12 col-lg-auto">
-                        <a href="{% url 'inclusion_connect:authorize' %}" class="btn btn-block btn-ico btn-outline-primary justify-content-center">
-                            <i class="ri-login-box-line ri-lg" aria-hidden="true"></i>
-                            <span>
-                                Je me connecte pour accéder à toutes mes thématiques
-                            </span>
-                        </a>
+    <section class="s-section mt-0">
+        <div class="s-section__container container">
+            <div class="s-section__row row">
+                <div class="s-section__col col-6">
+                    <div class="c-box mt-3">
+                        <h3>Les dernières questions</h3>
+                        <ul>
+                            {% for topic in topics_public %}
+                                <li>
+                                    <a href="{% url 'forum_conversation:topic' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
+                                        class="matomo-event"
+                                        data-matomo-category="engagement"
+                                        data-matomo-action="view"
+                                        data-matomo-option="topic">
+                                        {{ topic.subject }}
+                                    </a>
+                                </li>
+                            {% endfor %}
+                        </ul>
+                    </div>
+                </div>
+                <div class="s-section__col col-6">
+                    <div class="c-box mt-3">
+                        <h3>Les dernières fiches techniques</h3>
+                        <ul>
+                            {% for forum in forums_category %}
+                                <li>
+                                    <a href="{% url 'forum_extension:forum' forum.slug forum.pk %}"
+                                        class="matomo-event"
+                                        data-matomo-category="engagement"
+                                        data-matomo-action="view"
+                                        data-matomo-option="forum">
+                                        [{{ forum.parent.name }}] {{ forum.name }}
+                                    </a>
+                                </li>
+                            {% endfor %}
+                        </ul>
+                    </div>
+                </div>
+                <div class="s-section__col col-6">
+                    <div class="c-box mt-3">
+                        <h3>Les dernières actus</h3>
+                        <ul>
+                            {% for topic in topics_newsfeed %}
+                                <li>
+                                    <a href="{% url 'forum_conversation:topic' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
+                                        class="matomo-event"
+                                        data-matomo-category="engagement"
+                                        data-matomo-action="view"
+                                        data-matomo-option="news">
+                                        {{ topic.subject }}
+                                    </a>
+                                </li>
+                            {% endfor %}
+                        </ul>
                     </div>
                 </div>
             </div>
-        </section>
-    {% endif %}
+        </div>
+    </div>
+    </div>
+    </section>
+
+
+
+
 {% endblock %}
 
 {% block extra_js %}
diff --git a/lacommunaute/templates/partials/ask_a_question.html b/lacommunaute/templates/partials/ask_a_question.html
index 4e6fc6c7e..4f7c7fe82 100644
--- a/lacommunaute/templates/partials/ask_a_question.html
+++ b/lacommunaute/templates/partials/ask_a_question.html
@@ -1,21 +1,31 @@
-<div class="dropdown">
-    <button type="button" class="btn btn-primary btn-block w-100 w-lg-auto dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-controls="AskQuestionDropdown" aria-expanded="false">
-        Poser une question
-    </button>
-    <div class="dropdown-menu" id="AskQuestionDropdown">
-        <ul class="list-unstyled">
-            {% for forum in request.session.upper_visible_forums %}
-                <li>
-                    <a href="{% url 'forum_conversation:topic_create' forum.slug forum.pk %}"
-                       class="dropdown-item matomo-event"
-                       data-matomo-category="engagement"
-                       data-matomo-action="contribute"
-                       data-matomo-option="new_topic">
-                        {{ forum.name }}
-                    </a>
-                </li>
-            {% endfor %}
-        </ul>
+{% load i18n %}
+
+
+{% if forum %}
+    <div class="row">
+        <div class="col-12 col-lg-auto">
+            <a href="{% url 'forum_conversation:topic_create' forum.slug forum.pk %}"
+                class="btn btn-primary btn-ico matomo-event"
+                data-matomo-category="engagement"
+                data-matomo-action="contribute"
+                data-matomo-option="new_topic">
+                <i class="ri-chat-new-line ri-lg"></i>
+                <span>{% trans "New topic" %}</span>
+            </a>
+        </div>
+        <div class="col-12 col-lg-auto">
+            ou
+        </div>
+        <div class="col-12 col-lg-auto">
+            <a href="{% url 'forum_search_extension:search' %}"
+                class="btn btn-outline-primary btn-ico matomo-event"
+                data-matomo-category="engagement"
+                data-matomo-action="search"
+                data-matomo-option="query">
+                <i class="ri-chat-new-line ri-lg"></i>
+                <span>{% trans "Search forums" %}</span>
+            </a>
+        </div>
     </div>
-</div>
+{% endif %}
 
diff --git a/lacommunaute/templates/partials/footer.html b/lacommunaute/templates/partials/footer.html
index b5354189b..074ad7617 100644
--- a/lacommunaute/templates/partials/footer.html
+++ b/lacommunaute/templates/partials/footer.html
@@ -11,33 +11,55 @@
                 <div class="s-footer-quick__col col-12 col-md-6 col-lg-auto">
                     <strong>Accès rapides</strong>
                     <ul>
-                        <li><a href="{% url 'forum_conversation_extension:home' %}{% if not user.is_authenticated %}#community{% endif %}">Dernières questions/réponses</a></li>
-                        <li><a href="{% url 'event:calendar' %}">Évènements publics</a></li>
-                        <li><a href="{% url 'forum_search_extension:search' %}">{% trans "Search forums" %}</a></li>
+                        <li>
+                            <a href="{% url 'forum_conversation_extension:publicforum' %}">
+                                Espace d'échanges
+                            </a>
+                        </li>
+                        <li>
+                            <a href="{% url 'forum_conversation_extension:newsfeed' %}">
+                                Actualités
+                            </a>
+                        </li>
+                        <li>
+                            <a href="{% url 'forum_extension:documentation' %}">
+                                Documentations
+                            </a>
+                        </li>
+                        <li>
+                            <a href="{% url 'event:calendar' %}">
+                                Évènements publics
+                            </a>
+                        </li>
+                        <li>
+                            <a href="{% url 'forum_search_extension:search' %}">
+                                {% trans "Search forums" %}
+                            </a>
+                        </li>
                     </ul>
                 </div>
                 <div class="s-footer-quick__col col-12 col-md-6 col-lg-auto">
-                    <strong>Documentation</strong>
+                    <strong>Liens externes</strong>
                     <ul>
                         <li>
                             <a href="/glossaire/"
-                               target="_blank"
-                               aria-label="glossaire des mots de l'inclusion"
-                               class="matomo-event"
-                               data-matomo-category="landing"
-                               data-matomo-action="glossaire"
-                               data-matomo-option="footer">
+                                target="_blank"
+                                aria-label="glossaire des mots de l'inclusion"
+                                class="matomo-event"
+                                data-matomo-category="landing"
+                                data-matomo-action="glossaire"
+                                data-matomo-option="footer">
                                 Glossaire de l'inclusion
                             </a>
                         </li>
                         <li>
                             <a href="https://documentation.inclusion.beta.gouv.fr/aide/emplois/"
-                               target="_blank"
-                               aria-label="Posez votre question sur la page du support des emplois de l'inclusion (lien externe)"
-                               class="matomo-event"
-                               data-matomo-category="support"
-                               data-matomo-action="site_emplois"
-                               data-matomo-option="footer">
+                                target="_blank"
+                                aria-label="Posez votre question sur la page du support des emplois de l'inclusion (lien externe)"
+                                class="matomo-event"
+                                data-matomo-category="support"
+                                data-matomo-action="site_emplois"
+                                data-matomo-option="footer">
                                 Support des emplois de l'inclusion
                             </a>
                         </li>
diff --git a/lacommunaute/templates/partials/header.html b/lacommunaute/templates/partials/header.html
index 0e38f56db..a04ed6c68 100644
--- a/lacommunaute/templates/partials/header.html
+++ b/lacommunaute/templates/partials/header.html
@@ -8,10 +8,10 @@
         <div class="s-header__container container">
             <div class="s-header__row row">
                 <div class="s-header__col s-header__col--logo-ministere col col-md-auto d-flex align-items-center pr-0">
-                    <a href="{% url 'forum_conversation_extension:home' %}" class="s-header__logo-ministere"><img src="{% static_theme_images 'logo-republique-francaise.svg' %}" height="90" alt="Rébublique Française"></a>
+                    <a href="{% url 'pages:home' %}" class="s-header__logo-ministere"><img src="{% static_theme_images 'logo-republique-francaise.svg' %}" height="90" alt="Rébublique Française"></a>
                 </div>
                 <div class="s-header__col s-header__col--logo-service col-auto d-flex align-items-center px-0">
-                    <a href="{% url 'forum_conversation_extension:home' %}"><img src="{% static_theme_images 'logo-communaute-inclusion.svg' %}" height="60" alt="La communauté de l'inclusion"></a>
+                    <a href="{% url 'pages:home' %}"><img src="{% static_theme_images 'logo-communaute-inclusion.svg' %}" height="60" alt="La communauté de l'inclusion"></a>
                 </div>
                 <div class="s-header__col s-header__col--nav col d-none d-xl-inline-flex d-xl-flex align-items-center justify-content-end">
                     <nav role="navigation" id="nav-primary" aria-label="Navigation principale">
diff --git a/lacommunaute/templates/partials/header_nav_secondary_items.html b/lacommunaute/templates/partials/header_nav_secondary_items.html
index 78f96d231..7ac2adc7c 100644
--- a/lacommunaute/templates/partials/header_nav_secondary_items.html
+++ b/lacommunaute/templates/partials/header_nav_secondary_items.html
@@ -3,30 +3,33 @@
 {% load theme_inclusion %}
 <ul>
     <li class="col-12 col-lg-auto">
-        <a href="{% url 'forum_conversation_extension:home' %}{% if not user.is_authenticated %}#community{% endif %}">
-            Accéder aux dernières questions-réponses
+        <a href="{% url 'pages:home' %}">
+            Accueil
         </a>
     </li>
-    <li>
-        <a href="" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-controls="communautesDropdown" aria-expanded="false">Accéder aux {% trans "Forums"|lower %}</a>
-        <div class="dropdown-menu" id="communautesDropdown">
-            <ul class="list-unstyled">
-                {% for forum in request.session.upper_visible_forums %}
-                    <li>
-                        <a class="dropdown-header matomo-event" href="{% url 'forum_extension:forum' forum.slug forum.pk %}"
-                           data-matomo-category="engagement"
-                           data-matomo-action="view"
-                           data-matomo-option="forum">
-                            {{ forum.name }}
-                        </a>
-                    </li>
-                {% endfor %}
-            </ul>
-        </div>
+    <li class="col-12 col-lg-auto">
+        <a href="{% url 'forum_conversation_extension:publicforum' %}">
+            Espace d'échanges
+        </a>
+    </li>
+    <li class="col-12 col-lg-auto mt-3 mt-lg-0">
+        <a href="{% url 'forum_conversation_extension:newsfeed' %}">
+            Actualités
+        </a>
+    </li>
+    <li class="col-12 col-lg-auto mt-3 mt-lg-0">
+        <a href="{% url 'forum_extension:documentation' %}">
+            Documentations
+        </a>
     </li>
     <li class="col-12 col-lg-auto mt-3 mt-lg-0">
         <a href="{% url 'event:calendar' %}">
-            Accéder aux évènements publics
+            Évènements publics
+        </a>
+    </li>
+    <li class="col-12 col-lg-auto mt-3 mt-lg-0">
+        <a href="{% url 'forum_search_extension:search' %}">
+            {% trans "Search forums" %}
         </a>
     </li>
 </ul>
diff --git a/lacommunaute/utils/middleware.py b/lacommunaute/utils/middleware.py
deleted file mode 100644
index 2a869bf81..000000000
--- a/lacommunaute/utils/middleware.py
+++ /dev/null
@@ -1,35 +0,0 @@
-from django.utils.deprecation import MiddlewareMixin
-from machina.core.loading import get_class
-
-from lacommunaute.forum.models import Forum
-
-
-ForumVisibilityContentTree = get_class("forum.visibility", "ForumVisibilityContentTree")
-PermissionHandler = get_class("forum_permission.handler", "PermissionHandler")
-
-# session key
-UPPER_VISIBLE_FORUMS = "upper_visible_forums"
-
-
-def store_upper_visible_forums(request, nodes):
-    request.session[UPPER_VISIBLE_FORUMS] = [
-        {
-            "name": node.obj.name,
-            "slug": node.obj.slug,
-            "pk": node.obj.id,
-        }
-        for node in nodes
-    ]
-
-
-class VisibleForumsMiddleware(MiddlewareMixin):
-    def process_request(self, request):
-        forum_visibility_content_tree = request.session.get(UPPER_VISIBLE_FORUMS, None)
-        if not forum_visibility_content_tree:
-            forum_visibility_content_tree = ForumVisibilityContentTree.from_forums(
-                request.forum_permission_handler.forum_list_filter(
-                    Forum.objects.exclude(type=Forum.FORUM_CAT),
-                    request.user,
-                ),
-            )
-            store_upper_visible_forums(request, forum_visibility_content_tree.top_nodes)
diff --git a/lacommunaute/utils/tests.py b/lacommunaute/utils/tests.py
index d3d6f92df..4607f60f8 100644
--- a/lacommunaute/utils/tests.py
+++ b/lacommunaute/utils/tests.py
@@ -20,7 +20,6 @@
 from lacommunaute.forum_conversation.forum_attachments.factories import AttachmentFactory
 from lacommunaute.users.factories import UserFactory
 from lacommunaute.utils.matomo import get_matomo_data, get_matomo_events_data, get_matomo_visits_data
-from lacommunaute.utils.middleware import store_upper_visible_forums
 from lacommunaute.utils.urls import urlize
 
 
@@ -370,101 +369,3 @@ def test_get_matomo_events_data_with_label(self):
                 get_matomo_events_data(period="day", search_date=self.today, label=label),
                 expected_res,
             )
-
-
-class UtilsMiddlewareStoreUpperVisibleForumTest(TestCase):
-    def test_store_upper_visible_forums(self):
-        request = RequestFactory().get("/")
-        middleware = SessionMiddleware(lambda x: x)
-        middleware.process_request(request)
-        request.session.save()
-        request.user = UserFactory()
-        request.forum_permission_handler = PermissionHandler()
-
-        upper_forums = ForumFactory.create_batch(2)
-        forums = [
-            {
-                "name": forum.name,
-                "slug": forum.slug,
-                "pk": forum.id,
-            }
-            for forum in upper_forums
-        ]
-
-        for forum in upper_forums:
-            assign_perm("can_see_forum", request.user, forum)
-            assign_perm("can_read_forum", request.user, forum)
-
-        content_tree = ForumVisibilityContentTree.from_forums(
-            request.forum_permission_handler.forum_list_filter(
-                Forum.objects.all(),
-                request.user,
-            )
-        )
-
-        store_upper_visible_forums(request, content_tree.nodes)
-
-        self.assertEqual(request.session["upper_visible_forums"], forums)
-
-
-class UtilsMiddlewareVisibleForumsMiddlewareTest(TestCase):
-    def test_upper_visible_forums_key_in_request_session(self):
-        user = UserFactory()
-        self.client.force_login(user)
-
-        visible_forum = ForumFactory()
-        descendant_visible_forum = ForumFactory(parent=visible_forum)
-        categ_forum = ForumFactory(type=Forum.FORUM_CAT)
-        ForumFactory()
-
-        assign_perm("can_see_forum", user, visible_forum)
-        assign_perm("can_read_forum", user, visible_forum)
-        assign_perm("can_see_forum", user, descendant_visible_forum)
-        assign_perm("can_read_forum", user, descendant_visible_forum)
-        assign_perm("can_see_forum", user, categ_forum)
-        assign_perm("can_read_forum", user, categ_forum)
-
-        response = self.client.get("/")
-
-        self.assertEqual(response.status_code, 200)
-        self.assertIn("upper_visible_forums", response.wsgi_request.session.keys())
-        self.assertEqual(
-            response.wsgi_request.session["upper_visible_forums"],
-            [
-                {
-                    "name": visible_forum.name,
-                    "slug": visible_forum.slug,
-                    "pk": visible_forum.id,
-                }
-            ],
-        )
-
-    def test_upper_visible_forums_key_loaded_without_going_indexview(self):
-        topic = TopicFactory(with_post=True)
-        assign_perm("can_see_forum", AnonymousUser(), topic.forum)
-        assign_perm("can_read_forum", AnonymousUser(), topic.forum)
-
-        response = self.client.get(
-            reverse(
-                "forum_conversation:topic",
-                kwargs={
-                    "forum_slug": topic.forum.slug,
-                    "forum_pk": topic.forum.pk,
-                    "slug": topic.slug,
-                    "pk": topic.id,
-                },
-            )
-        )
-
-        self.assertEqual(response.status_code, 200)
-        self.assertIn("upper_visible_forums", response.wsgi_request.session.keys())
-        self.assertEqual(
-            response.wsgi_request.session["upper_visible_forums"],
-            [
-                {
-                    "name": topic.forum.name,
-                    "slug": topic.forum.slug,
-                    "pk": topic.forum.id,
-                }
-            ],
-        )