From 80d47d0aced5fc54a4aece719479822e89eb97bc Mon Sep 17 00:00:00 2001
From: Thierry Bugier <tbugier@teclib.com>
Date: Fri, 7 Jan 2022 14:21:13 +0100
Subject: [PATCH] fix(form): display user form spacing problem

when the last question fills a row then spaces between questions overflow the row then
the question is positionned in a new row instead of being side by side the previous question
---
 inc/question.class.php             | 4 ++--
 templates/pages/userform.html.twig | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/inc/question.class.php b/inc/question.class.php
index b24160582..becd8c89b 100644
--- a/inc/question.class.php
+++ b/inc/question.class.php
@@ -287,8 +287,8 @@ public function getRenderedHtml($domain, $canEdit = true, $value = [], $isVisibl
       $width = $this->fields['width'];
       $hiddenAttribute = $isVisible ? '' : 'hidden=""';
       $html .= '<div'
-         . ' data-gs-x="' . $x . '"'
-         . ' data-gs-width="' . $width . '"'
+         . ' gs-x="' . $x . '"'
+         . ' gs-w="' . $width . '"'
          . ' data-itemtype="' . self::class . '"'
          . ' data-id="' . $this->getID() . '"'
          . " $hiddenAttribute"
diff --git a/templates/pages/userform.html.twig b/templates/pages/userform.html.twig
index 26bd5eec8..5deaf08dc 100644
--- a/templates/pages/userform.html.twig
+++ b/templates/pages/userform.html.twig
@@ -34,10 +34,11 @@
 	{% set widthPercent = 100 / options.columns %}
 	{% for i in range(1, options.columns ) %}
 		{% set width = i * widthPercent %}
-            #plugin_formcreator_form.plugin_formcreator_form [data-itemtype = "PluginFormcreatorQuestion"][data-gs-width="{{ i }}"],
-            #plugin_formcreator_form.plugin_formcreator_form .plugin_formcreator_gap[data-gs-width="{{ i }}"] {
+            #plugin_formcreator_form.plugin_formcreator_form [data-itemtype = "PluginFormcreatorQuestion"][gs-w="{{ i }}"],
+            #plugin_formcreator_form.plugin_formcreator_form .plugin_formcreator_gap[gs-w="{{ i }}"] {
                 min-width: {{ widthPercent }}%;
                 width: {{ width }}%;
+                margin-left: -0.25em;
             }
 	{% endfor %}
 </style>
@@ -82,7 +83,7 @@
                                 {% set x = lastQuestion.fields['col'] + lastQuestion.fields['width'] %}
                                 {% set width = question.fields['col'] - x %}
                                 {% if x < question.fields['col'] %}
-                                    <div class="plugin_formcreator_gap" data-gs-x="{{ x }}" data-gs-width="{{ width }}"></div>
+                                    <div class="plugin_formcreator_gap" gs-x="{{ x }}" gs-w="{{ width }}"></div>
                                 {% endif %}
                             {% endif %}
                         {% endif %}