Move date format example in input's placehoder

diff --git a/galette/templates/default/components/dynamic_fields.html.twig b/galette/templates/default/components/dynamic_fields.html.twig
index 5536a4f623614c896cbb706ab40a87eb364062dd..342dc050e435caadf3fe1fa4e7bc8e58752ef948 100644 (file)
--- a/galette/templates/default/components/dynamic_fields.html.twig
+++ b/galette/templates/default/components/dynamic_fields.html.twig
@@ -76,14 +76,11 @@
                     {% endfor %}
                 </select>
             {% elseif get_class(field) == 'Galette\\DynamicFields\\Date' %}
-                {% if preferences.pref_field_information_position == 'above' %}
-                    <div class="exemple">{{ _T("(yyyy-mm-dd format)") }}</div>
-                {% endif %}
                 <div id="dynamic_date_{{ field.getId() }}_rangestart" class="ui calendar">
                     <div class="ui fluid input left icon">
                         <i class="calendar icon" aria-hidden="true"></i>
                         <input type="text" name="info_field_{{ field.getId() }}_{{ loop }}" id="info_field_{{ field.getId() }}_{{ loop }}" maxlength="10"
-                            value="{{ valuedata }}" class="dynamic_date modif_date"
+                            value="{{ valuedata }}" class="dynamic_date modif_date" placeholder="{{ _T("(yyyy-mm-dd format)") }}"
                             {% if field.isRepeatable() %} data-maxrepeat="{field.getRepeat()}"{% endif %}
                         {% if not masschange %}
                             {% if field.isRequired() %} required="required"{% endif %}
@@ -92,9 +89,6 @@
                         />
                     </div>
                 </div>
-                {% if preferences.pref_field_information_position == 'below' %}
-                    <div class="exemple">{{ _T("(yyyy-mm-dd format)") }}</div>
-                {% endif %}
             {% elseif get_class(field) == 'Galette\\DynamicFields\\Boolean' %}
                 <div class="ui toggle checkbox">
                     <input type="checkbox" name="info_field_{{ field.getId() }}_{{ loop }}" id="info_field_{{ field.getId() }}_{{ loop }}" value="1"

diff --git a/galette/templates/default/components/forms/date.html.twig b/galette/templates/default/components/forms/date.html.twig
index fe4e35221a4e4a345742d43f5e8889060a74bd3e..54955a2969a1ebff6cd8ec1b76a4505479e72178 100644 (file)
--- a/galette/templates/default/components/forms/date.html.twig
+++ b/galette/templates/default/components/forms/date.html.twig
@@ -22,9 +22,9 @@
 
 {% block component %}
     {% set type = "text" %}
-    {% set example = _T("(yyyy-mm-dd format)") %}
+    {% set placeholder = _T("(yyyy-mm-dd format)") %}
     {% if id == 'ddn_adh' and member.id != '' and member.birthdate != '' %}
-        {% set example = _T("(yyyy-mm-dd format)") ~ "<span id=\"member_age\">" ~ member.getAge() ~ "</span>" %}
+        {% set example = "<span id=\"member_age\">" ~ member.getAge() ~ "</span>" %}
     {% endif %}
     {{ parent() }}
 {% endblock %}

diff --git a/galette/templates/default/components/forms/input.html.twig b/galette/templates/default/components/forms/input.html.twig
index 7aa67b20be0401d141b0a9339a37bc2111a3afd3..2d8d8523d49cc3068a1be202aa543787681f8752 100644 (file)
--- a/galette/templates/default/components/forms/input.html.twig
+++ b/galette/templates/default/components/forms/input.html.twig
@@ -65,6 +65,7 @@
                     {% if autofocus is defined %} autofocus{% endif %}
                     {% if size is defined %} size="{{ size }}"{% endif %}
                     {% if checked is defined and checked == true %} checked{% endif %}
+                    {% if placeholder is defined %} placeholder="{{ placeholder }}"{% endif %}
                 />
     {% endblock %}
     {% if search_id is defined %}