Drop required fields on member cards; closes #781

Also show a missing required field on preferences form

diff --git a/galette/lib/Galette/Controllers/GaletteController.php b/galette/lib/Galette/Controllers/GaletteController.php
index 1d3b830effd596cc8d5ef85ecd4684a3d3946bce..43c6e73271a78365a48fc3e12fa14a10bcceae1f 100644 (file)
--- a/galette/lib/Galette/Controllers/GaletteController.php
+++ b/galette/lib/Galette/Controllers/GaletteController.php
@@ -182,8 +182,6 @@ class GaletteController extends AbstractController
             'pref_etiq_cols'        => 1,
             'pref_etiq_rows'        => 1,
             'pref_etiq_corps'       => 1,
-            'pref_card_abrev'       => 1,
-            'pref_card_strip'       => 1,
             'pref_card_marges_v'    => 1,
             'pref_card_marges_h'    => 1,
             'pref_card_hspace'      => 1,

diff --git a/galette/lib/Galette/Core/Preferences.php b/galette/lib/Galette/Core/Preferences.php
index ab72ae8f6f6c58cd0ee48e35f6f492567d3ef3c5..60d18d9aa2b1f7db97d5461e15fde99893c09517 100644 (file)
--- a/galette/lib/Galette/Core/Preferences.php
+++ b/galette/lib/Galette/Core/Preferences.php
@@ -296,6 +296,7 @@ class Preferences
         'pref_lang',
         'pref_numrows',
         'pref_log',
+        'pref_statut',
         'pref_etiq_marges_v',
         'pref_etiq_marges_h',
         'pref_etiq_hspace',
@@ -305,8 +306,6 @@ class Preferences
         'pref_etiq_cols',
         'pref_etiq_rows',
         'pref_etiq_corps',
-        'pref_card_abrev',
-        'pref_card_strip',
         'pref_card_marges_v',
         'pref_card_marges_h',
         'pref_card_hspace',

diff --git a/galette/templates/default/pages/preferences.html.twig b/galette/templates/default/pages/preferences.html.twig
index e3d58e97393b2dbe3174b806ccd92b76047b68fa..8f82aa4fe345aca27e51d894a3bb5a91bbed0619 100644 (file)
--- a/galette/templates/default/pages/preferences.html.twig
+++ b/galette/templates/default/pages/preferences.html.twig
@@ -285,9 +285,9 @@
             </div>{# /column grid #}
             <div class="ui stackable two column grid">
                 <div class="column">
-                    <div class="field">
+                    <div class="field{% if required.pref_statut is defined and required.pref_statut == 1 %} required{% endif %}">
                         <label for="pref_statut">{{ _T("Default membership status:") }}</label>
-                        <select name="pref_statut" id="pref_statut" class="ui search dropdown nochosen">
+                        <select name="pref_statut" id="pref_statut" class="ui search dropdown nochosen"{% if required.pref_statut is defined and required.pref_statut == 1 %} required="required"{% endif %}>
                             {% for key, value in statuts %}
                                 <option value="{{ key }}"{% if key == pref.pref_statut %} selected="selected"{% endif %}>{{ value }}</option>
                             {% endfor %}
@@ -610,13 +610,13 @@
             </div>
             <div class="ui two column grid">
                 <div class="column">
-                    <div class="ui field{% if required.pref_card_abrev is defined and required.pref_card_abrev == 1 %} required{% endif %}">
+                    <div class="field">
                         <label for="pref_card_abrev">{{ _T("Short Text (Card Center):") }}</label>
                         <div class="ui action input">
-                            <input type="text" name="pref_card_abrev" id="pref_card_abrev" value="{{ pref.pref_card_abrev }}" size="10" maxlength="10"{% if required.pref_card_abrev is defined and required.pref_card_abrev == 1 %} required="required"{% endif %}/>
+                            <input type="text" name="pref_card_abrev" id="pref_card_abrev" value="{{ pref.pref_card_abrev }}" size="10" maxlength="10"/>
                             <a
                                 href="{{ url_for("dynamicTranslations", {"text_orig": pref.pref_card_abrev|escape}) }}"
-                                class="tooltip ui icon button"
+                                class="tooltip ui icon button{% if pref.pref_card_abrev is empty %} disabled{% endif %}"
                                 title="{{ _T("Translate '%s'")|replace({"%s": pref.pref_card_abrev}) }}"
                             >
                                 <i class="language icon"></i>
@@ -625,13 +625,13 @@
                         </div>
                         <span class="exemple">{{ _T("(10 characters max)") }}</span>
                     </div>
-                    <div class="{% if required.pref_card_strip is defined and required.pref_card_strip == 1 %}required {% endif %}field">
+                    <div class="field">
                         <label for="pref_card_strip">{{ _T("Long Text (Bottom Line):") }}</label>
                         <div class="ui action input">
-                            <input type="text" name="pref_card_strip" id="pref_card_strip" value="{{ pref.pref_card_strip }}" size="40" maxlength="65"{% if required.pref_card_strip is defined and required.pref_card_strip == 1 %} required="required"{% endif %}/>
+                            <input type="text" name="pref_card_strip" id="pref_card_strip" value="{{ pref.pref_card_strip }}" size="40" maxlength="65"/>
                             <a
                                 href="{{ url_for("dynamicTranslations", {"text_orig": pref.pref_card_strip|escape}) }}"
-                                class="tooltip ui icon button "
+                                class="tooltip ui icon button{% if pref.pref_card_strip is empty %} disabled{% endif %}"
                                 title="{{ _T("Translate '%s'")|replace({"%s": pref.pref_card_strip}) }}"
                             >
                                 <i class="language icon"></i>