Merge pull request #40 from m-vo/feature/misc

Small tweaks (1)
m-vo · Mar 9, 2021 · 7bddc3e · 7bddc3e
2 parents 75153f4 + 2764e59
commit 7bddc3e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/src/Resources/translations/MvoContaoSurveyBundle.de.yml b/src/Resources/translations/MvoContaoSurveyBundle.de.yml
@@ -1,7 +1,7 @@
 form:
   button:
     clear_current: '↺'
-    clear_current_title: 'Diesen Schritt zurücksetzen'
+    clear_current_title: 'Diese Frage zurücksetzen'
     next: 'Weiter'
     previous: 'Zurück'
     submit: 'Absenden'

diff --git a/src/Resources/translations/MvoContaoSurveyBundle.en.yml b/src/Resources/translations/MvoContaoSurveyBundle.en.yml
@@ -1,7 +1,7 @@
 form:
   button:
     clear_current: '↺'
-    clear_current_title: 'Reset this step'
+    clear_current_title: 'Reset this question'
     next: 'Next'
     previous: 'Previous'
     submit: 'Submit'

diff --git a/src/Resources/views/Form/Matrix.html.twig b/src/Resources/views/Form/Matrix.html.twig
@@ -2,18 +2,21 @@
 {% extends '@MvoContaoSurvey/Form/Question.html.twig' %}
 
 {% block form_row %}
-    <div class="{% block answer_classes %}survey_answer survey_answer--matrix{% endblock %}" x-data>
-        <table>
+    <div class="{% block answer_classes %}survey_answer survey_answer--matrix{% endblock %}"
+         x-data x-init="checkSize=()=>{$refs.scroll.classList.toggle('hidden',$el.scrollWidth<=$el.clientWidth)}; (new ResizeObserver(checkSize)).observe($el); checkSize()">
+        <table class="hyphenate">
             <thead>
-                <tr>
-                    <td><span class="note_scroll hidden">{{ 'element.scroll_note'|trans() }}</span></td>
-                    {% for option in form.vars.matrix_columns %}
-                        <td class="option" data-option="{{ loop.index0 }}"
-                            @click="$el.querySelectorAll('[data-option=\'{{ loop.index0 }}\'] input').forEach(i => {i.checked = true})">
-                            {{ option|raw }}
-                        </td>
-                    {% endfor %}
-                </tr>
+            <tr>
+                <td>
+                    <div class="note_scroll hidden text-sm italic text-gray-500" x-ref="scroll">{{ 'element.scroll_note'|trans() }}</div>
+                </td>
+                {% for option in form.vars.matrix_columns %}
+                    <td class="option" data-option="{{ loop.index0 }}"
+                        @click="$el.querySelectorAll('[data-option=\'{{ loop.index0 }}\'] input').forEach(i => {i.checked = true})">
+                        {{ option|raw }}
+                    </td>
+                {% endfor %}
+            </tr>
             </thead>
             <tbody>
             {% for row in form.children %}

diff --git a/src/Resources/views/Form/Select.html.twig b/src/Resources/views/Form/Select.html.twig
@@ -15,7 +15,7 @@
                 {% else %}
                     {% set placeholder = 'element.user_option_placeholder'|trans() %}
                     {% set user_option_labels = form.vars.data.question.userOptionLabels %}
-                    <div class="inline-flex flex-row user_option{% if form.user_option.vars.errors|length > 0 %} error{% endif %}"
+                    <div class="inline-flex flex-row items-baseline user_option{% if form.user_option.vars.errors|length > 0 %} error{% endif %}"
                         @click="$refs.s_{{ loop.index0 }}.querySelector('input').checked=true">
                         {% if user_option_labels[0] -%}
                             <span class="mr-2 user_option--prefix">{{ user_option_labels[0] }}</span>