From 9a872495daa6d4677eaf067f2db48bb35d8bce14 Mon Sep 17 00:00:00 2001
From: Guillaume AGNIERAY <dev@agnieray.net>
Date: Fri, 29 Sep 2023 16:51:13 +0200
Subject: [PATCH] Fix member form layout display issues

---
 .../default/pages/member_form.html.twig       | 92 ++++++++++---------
 1 file changed, 49 insertions(+), 43 deletions(-)

diff --git a/galette/templates/default/pages/member_form.html.twig b/galette/templates/default/pages/member_form.html.twig
index 1e700d789..c42feb744 100644
--- a/galette/templates/default/pages/member_form.html.twig
+++ b/galette/templates/default/pages/member_form.html.twig
@@ -2,11 +2,12 @@
 
 {% block content %}
 <form action="{% if self_adh %}{{ url_for("storeselfmembers") }}{% elseif not member.id %}{{ url_for("doAddMember") }}{% else %}{{ url_for("doEditMember", {"id": member.id}) }}{% endif %}" method="post" enctype="multipart/form-data" id="form" class="ui form{% if member.id %} edit-member{% endif %}">
-    {% if member.id %}
+    {% if member.id or not self_adh %}
 <div class="ui stackable grid">
     <div class="row">
         <div class="sixteen wide tablet six wide computer five wide widescreen column order-2">
             <div class="position-sticky">
+        {% if member.id %}
                 <div class="ui basic clearing horizontally fitted segment">
 
                     <div class="ui left floated basic fitted segment">
@@ -31,70 +32,75 @@
                     </div>
                 </div>
                 {% include "elements/member_card.html.twig" %}
+        {% endif %}
     {% endif %}
 
     {% if not self_adh %}
-                <div class="ui{% if not member.id %} compact{% endif %} segment">
+                <div class="ui basic horizontally fitted segment">
+                    <div class="ui segment">
         {% if member.hasParent() and not member.isDuplicate() %}
-                    <div class="field">
-                        <div class="ui label">
-                            <i class="linkify icon"></i>
-                            {{ _T("Attached to:") }}
-                        </div>
-                        <div class="ui celled list">
-                            <a href="{{ url_for("member", {"id": member.parent.id}) }}" class="item">{{ member.parent.sfullname }}</a>
-                        </div>
+                        <div class="field">
+                            <div class="ui label">
+                                <i class="linkify icon"></i>
+                                {{ _T("Attached to:") }}
+                            </div>
+                            <div class="ui celled list">
+                                <a href="{{ url_for("member", {"id": member.parent.id}) }}" class="item">{{ member.parent.sfullname }}</a>
+                            </div>
             {% if not member.id %}
-                        <input type="hidden" name="parent_id" value="{{ member.parent.id }}"/>
+                            <input type="hidden" name="parent_id" value="{{ member.parent.id }}"/>
             {% endif %}
-                    </div>
+                        </div>
             {% if login.isAdmin() or login.isStaff() and (addchild is not defined or not addchild) %}
-                    <div class="field">
-                        <div class="ui toggle checkbox">
-                            <input type="checkbox" name="detach_parent" id="detach_parent" value="1"/>
-                            <label for="detach_parent">{{ _T("Detach?") }}</label>
+                        <div class="field">
+                            <div class="ui toggle checkbox">
+                                <input type="checkbox" name="detach_parent" id="detach_parent" value="1"/>
+                                <label for="detach_parent">{{ _T("Detach?") }}</label>
+                            </div>
                         </div>
-                    </div>
             {% endif %}
         {% elseif (login.isAdmin() or login.isStaff()) and not member.hasChildren() and members.list is defined %}
-                    <div id="attach-checkbox" class="ui{% if member.isDuplicate() %} checked{% endif %} toggle checkbox">
-                        <input type="checkbox" name="attach" id="attach" value="1"{% if member.isDuplicate() %} checked="checked"{% endif %}/>
-                        <label for="attach"><i class="linkify icon"></i> {{ _T("Attach member") }}</label>
-                    </div>
-                    <span id="parent_id_elt" class="">
-                        <div id="parent_id" class="jsonly search-dropdown ui input nochosen paginated">
-                            <input id="parent_id_input" type="text" name="parent_id" value="{{ member.isDuplicate() and member.parent is defined and member.parent is not null ? member.parent.id }}" placeholder="{{ _T("Member ID") }}">
-                            <i class="jsonly displaynone dropdown icon"></i>
-                            <span class="ui mini compact icon disabled button prev-results"><i class="jsonly displaynone chevron circle left icon disabled button tooltip" title="{{ _T("Load previous members...") }}"></i></span>
-                            <span class="ui mini compact icon disabled button next-results"><i class="jsonly displaynone chevron circle right icon disabled button tooltip" title="{{ _T("Load following members...") }}"></i></span>
-                            <div class="jsonly displaynone default text">{{ _T("Search for name or ID and pick member") }}</div>
-                            <div class="jsonly displaynone menu">
+                        <div class="field">
+                            <div id="attach-checkbox" class="ui{% if member.isDuplicate() %} checked{% endif %} toggle checkbox">
+                                <input type="checkbox" name="attach" id="attach" value="1"{% if member.isDuplicate() %} checked="checked"{% endif %}/>
+                                <label for="attach"><i class="linkify icon"></i> {{ _T("Attach member") }}</label>
+                            </div>
+                        </div>
+                        <span id="parent_id_elt" class="">
+                            <div id="parent_id" class="jsonly search-dropdown ui input nochosen paginated">
+                                <input id="parent_id_input" type="text" name="parent_id" value="{{ member.isDuplicate() and member.parent is defined and member.parent is not null ? member.parent.id }}" placeholder="{{ _T("Member ID") }}">
+                                <i class="jsonly displaynone dropdown icon"></i>
+                                <span class="ui mini compact icon disabled button prev-results"><i class="jsonly displaynone chevron circle left icon disabled button tooltip" title="{{ _T("Load previous members...") }}"></i></span>
+                                <span class="ui mini compact icon disabled button next-results"><i class="jsonly displaynone chevron circle right icon disabled button tooltip" title="{{ _T("Load following members...") }}"></i></span>
+                                <div class="jsonly displaynone default text">{{ _T("Search for name or ID and pick member") }}</div>
+                                <div class="jsonly displaynone menu">
             {% for k, v in members.list %}
-                                <div class="item" data-value="{{ k }}">{{ v }}</div>
+                                    <div class="item" data-value="{{ k }}">{{ v }}</div>
             {% endfor %}
+                                </div>
                             </div>
-                        </div>
-                    </span>
+                        </span>
             {% if member.isDuplicate() %}
-                    <input type="hidden" name="duplicate" value="1" />
+                        <input type="hidden" name="duplicate" value="1" />
             {% endif %}
         {% elseif member.hasChildren() %}
-                    <div class="field">
-                        <div class="ui label">
-                            <i class="linkify icon"></i>
-                            {{ _T("Parent of:") }}
-                        </div>
-                        <div class="ui celled list">
+                        <div class="field">
+                            <div class="ui label">
+                                <i class="linkify icon"></i>
+                                {{ _T("Parent of:") }}
+                            </div>
+                            <div class="ui celled list">
             {% for child in member.children %}
-                            <a href="{{ url_for("member", {"id": child.id}) }}" class="item">{{ child.sfullname }}</a>
+                                <a href="{{ url_for("member", {"id": child.id}) }}" class="item">{{ child.sfullname }}</a>
             {% endfor %}
+                            </div>
                         </div>
-                    </div>
         {% endif %}
+                    </div>
                 </div>
     {% endif %}
 
-    {% if member.id %}
+    {% if member.id or not self_adh %}
             </div>
         </div>
         <div class="sixteen wide tablet ten wide computer eleven wide widescreen column">
@@ -181,7 +187,7 @@
             {% include "components/forms/csrf.html.twig" %}
             </div>
 
-    {% if member.id %}
+    {% if member.id or not self_adh %}
         </div>
     </div>
 </div>
-- 
2.39.2