From 11cab3a63e2400badd944fb527b9aec2e5a9411b Mon Sep 17 00:00:00 2001
From: Reto Tschuppert <reto.tschuppert@seantis.ch>
Date: Fri, 21 Mar 2025 13:27:27 +0100
Subject: [PATCH 01/10] Render  fields as markdown

---
 src/onegov/org/views/directory.py        | 4 +++-
 src/onegov/town6/templates/directory.pt  | 3 ++-
 src/onegov/town6/theme/styles/town6.scss | 5 +++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/onegov/org/views/directory.py b/src/onegov/org/views/directory.py
index 749ad3ce7c..d22eed7db7 100644
--- a/src/onegov/org/views/directory.py
+++ b/src/onegov/org/views/directory.py
@@ -7,6 +7,7 @@
 
 from collections import defaultdict
 from onegov.core.html import html_to_text
+from onegov.core.markdown import render_untrusted_markdown
 from onegov.core.security import Public, Private, Secret
 from onegov.core.templates import render_template
 from onegov.core.utils import render_file
@@ -493,7 +494,8 @@ def view_directory(
         'submit': request.link(self, name='+submit'),
         'show_thumbnails': layout.thumbnail_field_id and True or False,
         'thumbnail_link': layout.thumbnail_link,
-        'overview_two_columns': self.directory.overview_two_columns
+        'overview_two_columns': self.directory.overview_two_columns,
+        'render_untrusted_markdown': render_untrusted_markdown,
     }
 
 
diff --git a/src/onegov/town6/templates/directory.pt b/src/onegov/town6/templates/directory.pt
index 922e70ceac..3eac9df787 100644
--- a/src/onegov/town6/templates/directory.pt
+++ b/src/onegov/town6/templates/directory.pt
@@ -36,8 +36,9 @@
                         </a>
                         <div class="accordion-content" data-tab-content>
                             <ul tal:repeat="field directory.fields" style="list-style: none; margin-left: 0">
+                                <li tal:condition="field.type == 'code'" tal:define="key field.human_id; value entry.values[field.id]" tal:content="Markup('<strong>{}</strong>: {}').format(key, render_untrusted_markdown(value))"></li>
                                 <li tal:condition="field.type == 'textarea'" tal:define="key field.human_id; value entry.values[field.id]" tal:content="Markup('<strong>{}</strong>: <br>{}').format(key, value)" style="white-space: pre-wrap;"></li>
-                                <li tal:condition="field.type != 'textarea'" tal:define="key field.human_id; value entry.values[field.id]" tal:content="Markup('<strong>{}</strong>: {}').format(key, value)"></li>
+                                <li tal:condition="field.type not in ['textarea', 'code']" tal:define="key field.human_id; value entry.values[field.id]" tal:content="Markup('<strong>{}</strong>: {}').format(key, value)"></li>
                             </ul>
                             <ul style="list-style: none; margin-left: 0">
                                 <li>
diff --git a/src/onegov/town6/theme/styles/town6.scss b/src/onegov/town6/theme/styles/town6.scss
index db3045e4a5..cfb728e048 100644
--- a/src/onegov/town6/theme/styles/town6.scss
+++ b/src/onegov/town6/theme/styles/town6.scss
@@ -1219,7 +1219,12 @@ ul.recipients {
 
     .accordion-content {
         border-bottom: 1px solid $gray;
+
+        li li {
+            padding-bottom: 0;
+        }
     }
+
 }
 
 .courses {

From b6cee6ab7ac0110ce8bfe1da745dcb6e933758af Mon Sep 17 00:00:00 2001
From: Reto Tschuppert <reto.tschuppert@seantis.ch>
Date: Fri, 21 Mar 2025 15:29:28 +0100
Subject: [PATCH 02/10] Extend tests

---
 tests/onegov/town6/test_views_directory.py | 94 +++++++++++++++++-----
 1 file changed, 72 insertions(+), 22 deletions(-)

diff --git a/tests/onegov/town6/test_views_directory.py b/tests/onegov/town6/test_views_directory.py
index a0d09ac407..a7f2d4bb5d 100644
--- a/tests/onegov/town6/test_views_directory.py
+++ b/tests/onegov/town6/test_views_directory.py
@@ -178,34 +178,84 @@ def test_directory_entry_subscription(client):
 
 def test_create_directory_accordion_layout(client):
 
-    def create_directory(client, title):
-        page = (client.get('/directories').
-                click('Verzeichnis'))
+    def create_directory(client, title, structure):
+        page = (client.get('/directories').click('Verzeichnis'))
         page.form['title'] = title
-        page.form['structure'] = "Question *= ___\nAnswer *= ___"
+        page.form['structure'] = structure
         page.form['title_format'] = '[Question]'
+        page.form['content_fields'] = 'Question\nAnswer'
         page.form['layout'] = 'accordion'
         return page.form.submit().follow()
 
+    def edit_directory(client, dir_url_name, structure):
+        page = client.get(f'/directories/{dir_url_name}')
+        page = page.click('Konfigurieren')
+        page.form['structure'] = structure
+        return page.form.submit().form.submit().follow()
+
+    def create_directory_entry(directory, question, answer):
+        page = directory.click('Eintrag')
+        page.form['question'] = question
+        page.form['answer'] = answer
+        return page.form.submit().follow()
+
     client.login_admin()
-    title = "Questions and Answers about smurfs"
 
-    faq_dir = create_directory(client, title)
+    title = "Questions and Answers about smurfs"
+    structure = "Question *= ___\nAnswer *= ___"
+    faq_dir = create_directory(client, title, structure)
     assert title in faq_dir
 
-    question = "Are smurfs real?"
-    answer = "Yes, they are."
-    q1 = faq_dir.click('Eintrag')
-    q1.form['question'] = question
-    q1.form['answer'] = answer
-    q1 = q1.form.submit().follow()
-    assert question in q1
-    assert answer not in q1
-
-    question = "Who is the boss of the smurfs?"
-    q2 = faq_dir.click('Eintrag')
-    q2.form['question'] = question
-    q2.form['answer'] = 'Papa Schlumpf'
-    q2 = q2.form.submit().follow()
-    assert question in q2
-    assert answer not in q2
+    question_1 = "Are smurfs real?"
+    answer_1 = "Yes, they are."
+    page = create_directory_entry(faq_dir, question_1, answer_1)
+    assert question_1 in page
+    assert answer_1 in page
+
+    question_2 = "Who is the boss of the smurfs?"
+    answer_2 = "Papa Smurf"
+    page = create_directory_entry(faq_dir, question_2, answer_2)
+    assert question_2 in page
+    assert answer_2 in page
+
+    question_3 = "How many smurfs are there?"
+    answer_3 = '- Papa Smurf\n- Smurfette\n- Brainy Smurf\n- Grouchy Smurf'
+    q3 = create_directory_entry(faq_dir, question_3, answer_3)
+    assert question_3 in q3
+    for smurf in answer_3.split('\n'):
+        assert smurf in q3
+
+    page = client.get('/directories/questions-and-answers-about-smurfs')
+    assert question_1 in page
+    assert answer_1 in page
+    assert question_2 in page
+    assert answer_2 in page
+    assert question_3 in page
+    for smurf in answer_3.split('\n'):
+        assert smurf in page
+
+    # with multiline answers
+    structure = "Question *= ___\nAnswer *= ...[10]"
+    page = edit_directory(
+        client, 'questions-and-answers-about-smurfs', structure)
+    assert question_1 in page
+    assert answer_1 in page
+    assert question_2 in page
+    assert answer_2 in page
+    assert question_3 in page
+    for smurf in answer_3.split('\n'):
+        assert smurf in page
+
+    # with markdown answers
+    structure = "Question *= ___\nAnswer *= <markdown>"
+    page = edit_directory(
+        client, 'questions-and-answers-about-smurfs', structure)
+    assert question_1 in page
+    assert answer_1 in page
+    assert question_2 in page
+    assert answer_2 in page
+    assert question_3 in page
+    for smurf in answer_3.replace('- ', '').split('\n'):
+        assert smurf in page
+        # ensure markdown rendered each smurf in separate li tag
+        assert f'<li>{smurf}</li>' in page

From 034ac076ed05c7a3a4059f168f6309f814b1aeb7 Mon Sep 17 00:00:00 2001
From: Reto Tschuppert <reto.tschuppert@seantis.ch>
Date: Fri, 21 Mar 2025 15:30:43 +0100
Subject: [PATCH 03/10] Improve style

---
 src/onegov/town6/templates/directory.pt  | 2 +-
 src/onegov/town6/theme/styles/town6.scss | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/onegov/town6/templates/directory.pt b/src/onegov/town6/templates/directory.pt
index 3eac9df787..1e5d9b81a0 100644
--- a/src/onegov/town6/templates/directory.pt
+++ b/src/onegov/town6/templates/directory.pt
@@ -36,7 +36,7 @@
                         </a>
                         <div class="accordion-content" data-tab-content>
                             <ul tal:repeat="field directory.fields" style="list-style: none; margin-left: 0">
-                                <li tal:condition="field.type == 'code'" tal:define="key field.human_id; value entry.values[field.id]" tal:content="Markup('<strong>{}</strong>: {}').format(key, render_untrusted_markdown(value))"></li>
+                                <li tal:condition="field.type == 'code'" tal:define="key field.human_id; value entry.values[field.id]" tal:content="Markup('<strong>{}:</strong> {}').format(key, render_untrusted_markdown(value))"></li>
                                 <li tal:condition="field.type == 'textarea'" tal:define="key field.human_id; value entry.values[field.id]" tal:content="Markup('<strong>{}</strong>: <br>{}').format(key, value)" style="white-space: pre-wrap;"></li>
                                 <li tal:condition="field.type not in ['textarea', 'code']" tal:define="key field.human_id; value entry.values[field.id]" tal:content="Markup('<strong>{}</strong>: {}').format(key, value)"></li>
                             </ul>
diff --git a/src/onegov/town6/theme/styles/town6.scss b/src/onegov/town6/theme/styles/town6.scss
index cfb728e048..eb4e7a34c8 100644
--- a/src/onegov/town6/theme/styles/town6.scss
+++ b/src/onegov/town6/theme/styles/town6.scss
@@ -1223,6 +1223,9 @@ ul.recipients {
         li li {
             padding-bottom: 0;
         }
+        li p, ul {
+            margin-bottom: .5rem;
+        }
     }
 
 }

From e5e54a49ccfda905b37fb3d740180d5fb1ad603f Mon Sep 17 00:00:00 2001
From: Reto Tschuppert <reto.tschuppert@seantis.ch>
Date: Mon, 24 Mar 2025 09:03:25 +0100
Subject: [PATCH 04/10] Linkify field content

---
 src/onegov/town6/templates/directory.pt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/onegov/town6/templates/directory.pt b/src/onegov/town6/templates/directory.pt
index 1e5d9b81a0..12c2eb223a 100644
--- a/src/onegov/town6/templates/directory.pt
+++ b/src/onegov/town6/templates/directory.pt
@@ -36,8 +36,8 @@
                         </a>
                         <div class="accordion-content" data-tab-content>
                             <ul tal:repeat="field directory.fields" style="list-style: none; margin-left: 0">
-                                <li tal:condition="field.type == 'code'" tal:define="key field.human_id; value entry.values[field.id]" tal:content="Markup('<strong>{}:</strong> {}').format(key, render_untrusted_markdown(value))"></li>
-                                <li tal:condition="field.type == 'textarea'" tal:define="key field.human_id; value entry.values[field.id]" tal:content="Markup('<strong>{}</strong>: <br>{}').format(key, value)" style="white-space: pre-wrap;"></li>
+                                <li tal:condition="field.type == 'code'" tal:define="key field.human_id; value entry.values[field.id]" tal:content="Markup('<strong>{}:</strong> {}').format(key, layout.linkify(render_untrusted_markdown(value)))"></li>
+                                <li tal:condition="field.type == 'textarea'" tal:define="key field.human_id; value entry.values[field.id]" tal:content="Markup('<strong>{}</strong>: <br>{}').format(key, layout.linkify(value))" style="white-space: pre-wrap;"></li>
                                 <li tal:condition="field.type not in ['textarea', 'code']" tal:define="key field.human_id; value entry.values[field.id]" tal:content="Markup('<strong>{}</strong>: {}').format(key, value)"></li>
                             </ul>
                             <ul style="list-style: none; margin-left: 0">

From dc9bc4548dcc37c06970599a8e622e77b4f54ba6 Mon Sep 17 00:00:00 2001
From: Reto Tschuppert <reto.tschuppert@seantis.ch>
Date: Mon, 24 Mar 2025 15:14:19 +0100
Subject: [PATCH 05/10] Rework using directory field types

---
 src/onegov/town6/templates/directory.pt | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/onegov/town6/templates/directory.pt b/src/onegov/town6/templates/directory.pt
index 12c2eb223a..5712987e66 100644
--- a/src/onegov/town6/templates/directory.pt
+++ b/src/onegov/town6/templates/directory.pt
@@ -28,21 +28,25 @@
                     <tal:b content="text"/>
                 </div>
 
-                <!-- displaying in accordion mode -->
+                <!-- display content fields of each entry in accordion mode -->
                 <ul tal:condition="directory.layout == 'accordion'" class="accordion more-list page-links" data-accordion>
                     <li tal:repeat="entry entries" class="accordion-item small-12-cell" data-accordion-item style="">
                         <a href="#" class="accordion-title">
                             <span class="h5">${entry.title}</span>
                         </a>
                         <div class="accordion-content" data-tab-content>
-                            <ul tal:repeat="field directory.fields" style="list-style: none; margin-left: 0">
-                                <li tal:condition="field.type == 'code'" tal:define="key field.human_id; value entry.values[field.id]" tal:content="Markup('<strong>{}:</strong> {}').format(key, layout.linkify(render_untrusted_markdown(value)))"></li>
-                                <li tal:condition="field.type == 'textarea'" tal:define="key field.human_id; value entry.values[field.id]" tal:content="Markup('<strong>{}</strong>: <br>{}').format(key, layout.linkify(value))" style="white-space: pre-wrap;"></li>
-                                <li tal:condition="field.type not in ['textarea', 'code']" tal:define="key field.human_id; value entry.values[field.id]" tal:content="Markup('<strong>{}</strong>: {}').format(key, value)"></li>
+                            <ul tal:repeat="field (field for field in directory.fields if field.id in (f.id for f in entry.content_fields))" style="list-style: none; margin-left: 0">
+                                <tal:b tal:define="value entry.values[field.id]; field_type field.type.lower(); url layout.field_download_link([f for f in entry.content_fields if f.id == field.id][0])">
+                                    <li tal:condition="field_type == 'code'" tal:content="layout.linkify(render_untrusted_markdown(value))"></li>
+                                    <li tal:condition="field_type in ('textarea', 'textareafield')" tal:content="layout.linkify(value)" style="white-space: pre-wrap;"></li>
+                                    <li tal:condition="field_type in ('fileinput') and url"><img
+                                        src="${url}" alt=""/></li>
+                                    <li tal:condition="field_type not in ('fileinput', 'textarea', 'textareafield', 'code')" tal:content="value"></li>
+                                </tal:b>
                             </ul>
-                            <ul style="list-style: none; margin-left: 0">
+                            <ul tal:condition="request.is_manager" style="list-style: none; margin-left: 0">
                                 <li>
-                                    <a tal:condition="request.is_manager" class="edit-link" tal:attributes="href request.link(entry, 'edit')">
+                                    <a class="edit-link" tal:attributes="href request.link(entry, 'edit')">
                                         <i class="far fa-edit"></i>
                                     </a>
                                 </li>

From c12c033ae9a0e11ee3b090694df60263db7ff0e6 Mon Sep 17 00:00:00 2001
From: Reto Tschuppert <reto.tschuppert@seantis.ch>
Date: Wed, 26 Mar 2025 08:58:56 +0100
Subject: [PATCH 06/10] Adjust for org

---
 src/onegov/org/templates/directory.pt | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/onegov/org/templates/directory.pt b/src/onegov/org/templates/directory.pt
index a6d810af49..731433ce10 100644
--- a/src/onegov/org/templates/directory.pt
+++ b/src/onegov/org/templates/directory.pt
@@ -25,16 +25,21 @@
                     <p tal:case="False">${directory.configuration.empty_notice}</p>
                 </tal:b>
 
-                <!--? display in accordion mode -->
+                <!-- display content fields of each entry in accordion mode -->
                 <ul tal:condition="directory.layout == 'accordion'" class="accordion" data-accordion>
                     <li tal:repeat="entry entries" class="accordion-navigation small-12-cell" style="">
                         <a tal:attributes="href python:'#panel'+str(repeat['entry'].index)">
                             <span class="h5">${entry.title}</span>
                         </a>
                         <div tal:attributes="id python:'panel'+str(repeat['entry'].index)" class="content">
-                            <ul tal:repeat="field directory.fields" style="list-style: none; margin-left: 0">
-                                <li tal:condition="field.type == 'textarea'" tal:define="key field.human_id; value entry.values[field.id]" tal:content="Markup('<strong>{}</strong>: <br>{}').format(key, value)" style="white-space: pre-wrap;"></li>
-                                <li tal:condition="field.type != 'textarea'" tal:define="key field.human_id; value entry.values[field.id]" tal:content="Markup('<strong>{}</strong>: {}').format(key, value)"></li>
+                            <ul tal:repeat="field (field for field in directory.fields if field.id in (f.id for f in entry.content_fields))" style="list-style: none; margin-left: 0">
+                                <tal:b tal:define="value entry.values[field.id]; field_type field.type.lower(); url layout.field_download_link([f for f in entry.content_fields if f.id == field.id][0])">
+                                    <li tal:condition="field_type == 'code'" tal:content="layout.linkify(render_untrusted_markdown(value))"></li>
+                                    <li tal:condition="field_type in ('textarea', 'textareafield')" tal:content="layout.linkify(value)" style="white-space: pre-wrap;"></li>
+                                    <li tal:condition="field_type in ('fileinput') and url"><img
+                                            src="${url}" alt=""/></li>
+                                    <li tal:condition="field_type not in ('fileinput', 'textarea', 'textareafield', 'code')" tal:content="value"></li>
+                                </tal:b>
                             </ul>
                             <ul style="list-style: none; margin-left: 0">
                                 <li>

From d969c2e0c84b09d597e7908aff61a61136d44d20 Mon Sep 17 00:00:00 2001
From: Reto Tschuppert <reto.tschuppert@seantis.ch>
Date: Wed, 26 Mar 2025 10:08:15 +0100
Subject: [PATCH 07/10] Reuse display fields macro for accordion mode

---
 src/onegov/org/layout.py                |  3 +++
 src/onegov/town6/templates/directory.pt | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/onegov/org/layout.py b/src/onegov/org/layout.py
index 3ef51dfbbb..fee565adfa 100644
--- a/src/onegov/org/layout.py
+++ b/src/onegov/org/layout.py
@@ -3348,6 +3348,9 @@ def __init__(
         elif self.directory.numbering == 'custom':
             self.custom_body_attributes['data-default-marker-icon'] = 'custom'
 
+    def show_label(self, field: Field) -> bool:
+        return False
+
     @cached_property
     def breadcrumbs(self) -> list[Link]:
         return [
diff --git a/src/onegov/town6/templates/directory.pt b/src/onegov/town6/templates/directory.pt
index 5712987e66..062ff1848c 100644
--- a/src/onegov/town6/templates/directory.pt
+++ b/src/onegov/town6/templates/directory.pt
@@ -35,16 +35,16 @@
                             <span class="h5">${entry.title}</span>
                         </a>
                         <div class="accordion-content" data-tab-content>
-                            <ul tal:repeat="field (field for field in directory.fields if field.id in (f.id for f in entry.content_fields))" style="list-style: none; margin-left: 0">
-                                <tal:b tal:define="value entry.values[field.id]; field_type field.type.lower(); url layout.field_download_link([f for f in entry.content_fields if f.id == field.id][0])">
-                                    <li tal:condition="field_type == 'code'" tal:content="layout.linkify(render_untrusted_markdown(value))"></li>
-                                    <li tal:condition="field_type in ('textarea', 'textareafield')" tal:content="layout.linkify(value)" style="white-space: pre-wrap;"></li>
-                                    <li tal:condition="field_type in ('fileinput') and url"><img
-                                        src="${url}" alt=""/></li>
-                                    <li tal:condition="field_type not in ('fileinput', 'textarea', 'textareafield', 'code')" tal:content="value"></li>
-                                </tal:b>
-                            </ul>
-                            <ul tal:condition="request.is_manager" style="list-style: none; margin-left: 0">
+                                <metal:b use-macro="layout.macros['display_fields']"
+                                    tal:define="
+                                        fields entry.content_fields;
+                                        allow_downloads True;
+                                        allow_views True;
+                                        form entry.directory.form_obj;
+                                        linkify_display True;
+                                    "
+                                />
+                                <ul tal:condition="request.is_manager" style="list-style: none; margin-left: 0">
                                 <li>
                                     <a class="edit-link" tal:attributes="href request.link(entry, 'edit')">
                                         <i class="far fa-edit"></i>

From b15945d9b8f669443ce433ea90c94a338c8feff7 Mon Sep 17 00:00:00 2001
From: Reto Tschuppert <reto.tschuppert@seantis.ch>
Date: Wed, 26 Mar 2025 12:14:23 +0100
Subject: [PATCH 08/10] Rework for org

---
 src/onegov/org/templates/directory.pt    | 22 +++++++++++-----------
 src/onegov/org/theme/styles/org.scss     |  8 ++++++++
 src/onegov/org/views/directory.py        |  2 --
 src/onegov/town6/theme/styles/town6.scss |  8 --------
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/onegov/org/templates/directory.pt b/src/onegov/org/templates/directory.pt
index 731433ce10..980f85ee3b 100644
--- a/src/onegov/org/templates/directory.pt
+++ b/src/onegov/org/templates/directory.pt
@@ -32,18 +32,18 @@
                             <span class="h5">${entry.title}</span>
                         </a>
                         <div tal:attributes="id python:'panel'+str(repeat['entry'].index)" class="content">
-                            <ul tal:repeat="field (field for field in directory.fields if field.id in (f.id for f in entry.content_fields))" style="list-style: none; margin-left: 0">
-                                <tal:b tal:define="value entry.values[field.id]; field_type field.type.lower(); url layout.field_download_link([f for f in entry.content_fields if f.id == field.id][0])">
-                                    <li tal:condition="field_type == 'code'" tal:content="layout.linkify(render_untrusted_markdown(value))"></li>
-                                    <li tal:condition="field_type in ('textarea', 'textareafield')" tal:content="layout.linkify(value)" style="white-space: pre-wrap;"></li>
-                                    <li tal:condition="field_type in ('fileinput') and url"><img
-                                            src="${url}" alt=""/></li>
-                                    <li tal:condition="field_type not in ('fileinput', 'textarea', 'textareafield', 'code')" tal:content="value"></li>
-                                </tal:b>
-                            </ul>
-                            <ul style="list-style: none; margin-left: 0">
+                            <metal:b use-macro="layout.macros['display_fields']"
+                                 tal:define="
+                                     fields entry.content_fields;
+                                     allow_downloads True;
+                                     allow_views True;
+                                     form entry.directory.form_obj;
+                                     linkify_display True;
+                                 "
+                            />
+                            <ul tal:condition="request.is_manager" style="list-style: none; margin-left: 0">
                                 <li>
-                                    <a tal:condition="request.is_manager" class="edit-link" tal:attributes="href request.link(entry, 'edit')">
+                                    <a class="edit-link" tal:attributes="href request.link(entry, 'edit')">
                                         <i class="fa fa-edit"></i>
                                     </a>
                                 </li>
diff --git a/src/onegov/org/theme/styles/org.scss b/src/onegov/org/theme/styles/org.scss
index 74f7344cf9..b29a46a069 100644
--- a/src/onegov/org/theme/styles/org.scss
+++ b/src/onegov/org/theme/styles/org.scss
@@ -3566,6 +3566,14 @@ button {
 
 }
 
+.accordion .accordion-navigation .field-display {
+    margin-bottom: 1rem;
+}
+.accordion .accordion-navigation .field-display dd a {
+    padding: 0;
+    display: inline;
+}
+
 /*
     Popup Menu
 */
diff --git a/src/onegov/org/views/directory.py b/src/onegov/org/views/directory.py
index d22eed7db7..9ceab76550 100644
--- a/src/onegov/org/views/directory.py
+++ b/src/onegov/org/views/directory.py
@@ -7,7 +7,6 @@
 
 from collections import defaultdict
 from onegov.core.html import html_to_text
-from onegov.core.markdown import render_untrusted_markdown
 from onegov.core.security import Public, Private, Secret
 from onegov.core.templates import render_template
 from onegov.core.utils import render_file
@@ -495,7 +494,6 @@ def view_directory(
         'show_thumbnails': layout.thumbnail_field_id and True or False,
         'thumbnail_link': layout.thumbnail_link,
         'overview_two_columns': self.directory.overview_two_columns,
-        'render_untrusted_markdown': render_untrusted_markdown,
     }
 
 
diff --git a/src/onegov/town6/theme/styles/town6.scss b/src/onegov/town6/theme/styles/town6.scss
index eb4e7a34c8..db3045e4a5 100644
--- a/src/onegov/town6/theme/styles/town6.scss
+++ b/src/onegov/town6/theme/styles/town6.scss
@@ -1219,15 +1219,7 @@ ul.recipients {
 
     .accordion-content {
         border-bottom: 1px solid $gray;
-
-        li li {
-            padding-bottom: 0;
-        }
-        li p, ul {
-            margin-bottom: .5rem;
-        }
     }
-
 }
 
 .courses {

From 8864191fa19256bbdc33d48efd82ba1a778d8d36 Mon Sep 17 00:00:00 2001
From: Reto Tschuppert <reto.tschuppert@seantis.ch>
Date: Wed, 26 Mar 2025 12:16:09 +0100
Subject: [PATCH 09/10] Cleanup

---
 src/onegov/org/views/directory.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/onegov/org/views/directory.py b/src/onegov/org/views/directory.py
index 9ceab76550..749ad3ce7c 100644
--- a/src/onegov/org/views/directory.py
+++ b/src/onegov/org/views/directory.py
@@ -493,7 +493,7 @@ def view_directory(
         'submit': request.link(self, name='+submit'),
         'show_thumbnails': layout.thumbnail_field_id and True or False,
         'thumbnail_link': layout.thumbnail_link,
-        'overview_two_columns': self.directory.overview_two_columns,
+        'overview_two_columns': self.directory.overview_two_columns
     }
 
 

From ac92189ac3817777e25d02256aaa1977539a6949 Mon Sep 17 00:00:00 2001
From: Reto Tschuppert <reto.tschuppert@seantis.ch>
Date: Fri, 28 Mar 2025 13:48:26 +0100
Subject: [PATCH 10/10] Rework org accordion style

---
 src/onegov/org/theme/styles/org.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/onegov/org/theme/styles/org.scss b/src/onegov/org/theme/styles/org.scss
index b29a46a069..5c6b933f67 100644
--- a/src/onegov/org/theme/styles/org.scss
+++ b/src/onegov/org/theme/styles/org.scss
@@ -122,6 +122,7 @@ h6,
 /*
     Disable hyphenation in e-mail links and make them breakable
 */
+
 a[href^="mailto:"] {
     @include prefix(hyphens, none);
     @include prefix(word-break, break-all);
@@ -3566,10 +3567,10 @@ button {
 
 }
 
-.accordion .accordion-navigation .field-display {
+.accordion .accordion-navigation dl {
     margin-bottom: 1rem;
 }
-.accordion .accordion-navigation .field-display dd a {
+.accordion .accordion-navigation dd a {
     padding: 0;
     display: inline;
 }