Merge branch 'bugfix/3157_radios_rendering' into support/2.13.0

pluginsGLPI · Mar 6, 2023 · 89bba81 · 89bba81
2 parents d9abe56 + f8fe93a
commit 89bba81
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/css/styles.scss b/css/styles.scss
@@ -320,6 +320,15 @@ form#plugin_formcreator_form {
             padding: initial;
             padding-left: 40px;
          }
+
+         .label-radio, .label-checkboxes {
+            display: inline;
+            margin-bottom: 0.2em;
+         }
+
+         .radio, .checkboxes {
+            padding-bottom: 1em;
+         }
       }
    }
 

diff --git a/inc/field/checkboxesfield.class.php b/inc/field/checkboxesfield.class.php
@@ -100,6 +100,7 @@ public function getRenderedHtml($domain, $canEdit = true): string {
          foreach ($values as $value) {
             if ((trim($value) != '')) {
                $i++;
+               $translated_value =  __($value, $domain);
                $html .= "<div class='checkbox'>";
                $html .= Html::getCheckbox([
                   'title'         => htmlentities($value, ENT_QUOTES),
@@ -109,8 +110,8 @@ public function getRenderedHtml($domain, $canEdit = true): string {
                   'zero_on_empty' => false,
                   'checked'       => in_array($value, $this->value)
                ]);
-               $html .= '<label for="' . $domId . '_' . $i . '">';
-               $html .= '&nbsp;' . __($value, $domain);
+               $html .= '<label for="' . $domId . '_' . $i . '" class="label-checkboxes" title="' . $translated_value . '">';
+               $html .= '&nbsp;' . $translated_value;
                $html .= '</label>';
                $html .= "</div>";
             }

diff --git a/inc/field/radiosfield.class.php b/inc/field/radiosfield.class.php
@@ -85,14 +85,13 @@ public function getRenderedHtml($domain, $canEdit = true): string {
                   'id'      => $domId . '_' . $i,
                   'value'   => $value
                ] + $checked);
-               $html .= '<label class="label-radio" title="' . $value . '" for="' . $domId . '_' . $i . '">';
+               $translated_value =  __($value, $domain);
+               $html .= '<label for="' . $domId . '_' . $i . '" class="label-radio" title="' . $translated_value . '">';
                $html .= '<span class="box"></span>';
                $html .= '<span class="check"></span>';
+               $html .= '&nbsp;' . $translated_value;
                $html .= '</label>';
                $html .= '</span>';
-               $html .= '<label for="' . $domId . '_' . $i . '">';
-               $html .= '&nbsp;' . __($value, $domain);
-               $html .= '</label>';
                $html .= '</div>';
             }
          }