Improvements on entitleds' configuration templates

diff --git a/galette/templates/default/pages/configuration_entitled_form.html.twig b/galette/templates/default/pages/configuration_entitled_form.html.twig
index c993bf11361727e58f1f70212fa3021c7727edca..eee70bb5a345914559886dbdd2998434ad4bb2bc 100644 (file)
--- a/galette/templates/default/pages/configuration_entitled_form.html.twig
+++ b/galette/templates/default/pages/configuration_entitled_form.html.twig
@@ -13,20 +13,21 @@
                 <input type="text" name="{{ name }}" id="{{ name }}" value="{% if class == 'Status' %}{{ entry.libelle_statut }}{% else %}{{ entry.libelle_type_cotis }}{% endif %}" />
             </div>
             <div class="field inline">
-                <label for="{{ field }}">
 {% if class == 'Status' %}
+                <label for="{{ field }}">
                     {{ _T("Priority:") }}
-{% elseif class == 'ContributionsTypes' %}
-                    {{ _T("Extends membership?") }}
-{% endif %}
                 </label>
-{% if class == 'Status' %}
                 <input type="text" size="4" name="{{ field }}" id="{{ field }}" value="{{ entry.priorite_statut }}" />
-                <span class="exemple">{{ _T("Note: members with a status priority lower than %priority are staff members.")|replace({'%priority': non_staff_priority}) }}</span>
+            </div>
+            <p class="exemple">{{ _T("Note: members with a status priority lower than %priority are staff members.")|replace({'%priority': non_staff_priority}) }}</p>
 {% elseif class == 'ContributionsTypes' %}
+            <div class="ui toggle checkbox">
                 <input type="checkbox" name="{{ field }}" id="{{ field }}" value="1"{% if entry.cotis_extension == 1 %} checked="checked"{% endif %} />
-{% endif %}
+                <label for="{{ field }}">
+                    {{ _T("Extends membership?") }}
+                </label>
             </div>
+{% endif %}
         </div>
 
         <input type="hidden" name="mod" id="mod" value="{% if class == 'Status' %}{{ entry.id_statut }}{% else %}{{ entry.id_type_cotis }}{% endif %}"/>

diff --git a/galette/templates/default/pages/configuration_entitleds.html.twig b/galette/templates/default/pages/configuration_entitleds.html.twig
index 8994d568af8e4f171bf3e8a633cee4c1f7868c75..b50a0cf8ff1cd28a67c5d240f739dd387b8c5b99 100644 (file)
--- a/galette/templates/default/pages/configuration_entitleds.html.twig
+++ b/galette/templates/default/pages/configuration_entitleds.html.twig
@@ -2,10 +2,8 @@
 
 {% block content %}
     <form action="{{ url_for('doAddEntitled', {'class': url_class}) }}" method="post" class="tabbed ui form">
-        <div id="intitules_tabs">
-            {% include 'elements/edit_entitleds.html.twig' %}
-            {% include 'components/forms/csrf.html.twig' %}
-        </div>
+        {% include 'elements/edit_entitleds.html.twig' %}
+        {% include 'components/forms/csrf.html.twig' %}
     </form>
 {% endblock %}
 
@@ -20,7 +18,7 @@
             {% include "elements/js/modal_action.js.twig" with {
                 selector: ".single-edit",
                 modaltitle: modaltitle,
-                modal_class: "mini",
+                modal_class: "tiny"
             } %}
 
             {% include "elements/js/removal.js.twig" with {