nav+maj

user/plugins/form/CHANGELOG.md

@@ -1,3 +1,12 @@
+# v2.16.2
+## 08/23/2018
+
+1. [](#improved)
+    * Switched to new Grav `Yaml` class to support Native + Fallback YAML libraries
+    * Simple styling fixes for `array` field
+1. [](#bugfix)
+    * Fixed issue with translations of placeholder text in `array` field
+
 # v2.16.1
 ## 08/20/2018
 

user/plugins/form/assets/form-styles.css

@@ -23,8 +23,6 @@
     margin: 0;
 }
 
-
-
 .form-input-file input {
     display: none;
 }
@@ -122,3 +120,17 @@
     justify-content: space-between;
     margin-top: 8px;
 }
+
+[data-grav-field="array"] .form-row {
+    display: flex;
+    align-items: center;
+    margin-bottom: 0.5rem;
+}
+
+[data-grav-field="array"] .form-row > input,
+[data-grav-field="array"] .form-row > textarea
+{
+    margin: 0 0.5rem;
+    display: inline-block;
+}
+

user/plugins/form/blueprints.yaml

@@ -1,5 +1,5 @@
 name: Form
-version: 2.16.1
+version: 2.16.2
 description: Enables the forms handling
 icon: check-square
 author:
@@ -12,7 +12,7 @@ bugs: https://github.com/getgrav/grav-plugin-form/issues
 license: MIT
 
 dependencies:
-    - { name: grav, version: '>=1.4.5' }
+    - { name: grav, version: '>=1.5.1' }
 
 form:
   validation: strict

user/plugins/form/form.php

@@ -11,10 +11,10 @@ use Grav\Common\Plugin;
 use Grav\Common\Twig\Twig;
 use Grav\Common\Utils;
 use Grav\Common\Uri;
+use Grav\Common\Yaml;
 use Grav\Plugin\Form\Form;
 use RocketTheme\Toolbox\File\JsonFile;
 use RocketTheme\Toolbox\File\YamlFile;
-use Symfony\Component\Yaml\Yaml;
 use RocketTheme\Toolbox\File\File;
 use RocketTheme\Toolbox\Event\Event;
 

user/plugins/form/templates/forms/fields/array/array.html.twig

@@ -5,8 +5,8 @@
 
 {% block global_attributes %}
     data-grav-array-name="{{ (scope ~ field.name)|fieldName }}"
-    data-grav-array-keyname="{{ field.placeholder_key|e|tu }}"
-    data-grav-array-valuename="{{ field.placeholder_value|e|tu }}"
+    data-grav-array-keyname="{{ field.placeholder_key|e|t }}"
+    data-grav-array-valuename="{{ field.placeholder_value|e|t }}"
     data-grav-array-textarea="{{ field.value_type == 'textarea' }}"
     {{ parent() }}
 {% endblock %}
@@ -26,21 +26,21 @@
                         data-grav-array-type="key"
                         type="text" value="{{ key }}"
                         {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
-                        placeholder="{{ field.placeholder_key|e|tu }}" />
+                        placeholder="{{ field.placeholder_key|e|t }}" />
             {% endif %}
 
             {% if field.value_type == 'textarea' %}
                 <textarea
                         data-grav-array-type="value"
                         name="{{ ((scope ~ field.name)|fieldName) ~ '[' ~ key ~ ']' }}"
-                        placeholder="{{ field.placeholder_value|e|tu }}"
+                        placeholder="{{ field.placeholder_value|e|t }}"
                         {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}>{{ text }}</textarea>
             {% else %}
                 <input
                         data-grav-array-type="value"
                         type="text"
                         name="{{ ((scope ~ field.name)|fieldName) ~ '[' ~ key ~ ']' }}"
-                        placeholder="{{ field.placeholder_value|e|tu }}"
+                        placeholder="{{ field.placeholder_value|e|t }}"
                         {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
                         value={% if text == 'true' %}true{% elseif text == 'false' %}false{% else %}"{{ text|join(', ')|e }}"{% endif %} />
             {% endif %}
@@ -74,21 +74,21 @@
                             data-grav-array-type="key"
                             type="text"
                             {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
-                            placeholder="{{ field.placeholder_key|e|tu }}" />
+                            placeholder="{{ field.placeholder_key|e|t }}" />
                 {% endif %}
                 {% if field.value_type == 'textarea' %}
                     <textarea
                             data-grav-array-type="value"
                             name="{{ (scope ~ field.name)|fieldName }}"
                             {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
-                            placeholder="{{ field.placeholder_value|e|tu }}"></textarea>
+                            placeholder="{{ field.placeholder_value|e|t }}"></textarea>
                 {% else %}
                     <input
                             data-grav-array-type="value"
                             type="text"
                             name="{{ (scope ~ field.name)|fieldName }}"
                             {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
-                            placeholder="{{ field.placeholder_value|e|tu }}" />
+                            placeholder="{{ field.placeholder_value|e|t }}" />
                 {% endif %}
                 <span data-grav-array-action="rem" class="fa fa-minus"></span>
                 <span data-grav-array-action="add" class="fa fa-plus"></span>