Fix UX

glpi-project · Sep 19, 2024 · 34f2ef2 · 34f2ef2
1 parent acfa36a
commit 34f2ef2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/CommonITILValidation.php b/src/CommonITILValidation.php
@@ -1018,14 +1018,17 @@ public function showSummary(CommonDBTM $item)
                 "items_id"           => $this->getID(),
                 "timeline_position"  => ['>', CommonITILObject::NO_TIMELINE]
             ]);
-                $document = "";
+
+            $document = "";
             foreach ($docs as $docs_values) {
                     $doc = new Document();
                     $doc->getFromDB($docs_values['documents_id']);
                     $document  .= "<a ";
                     $document .= "href=\"" . Document::getFormURLWithID($docs_values['documents_id']) . "\">";
                     $document .= $doc->getField('name') . "</a><br>";
             }
+
+            $script = "";
             if ($canedit) {
                 $params = ['type'             => $this->getType(),
                     'parenttype'       => static::$itemtype,
@@ -1042,8 +1045,9 @@ public function showSummary(CommonDBTM $item)
                 $script .= "};";
                 $script .= "</script>\n";
             }
+
             $values[] = [
-                'edit'                  => $script ?? '',
+                'edit'                  => $script,
                 'status'                => $status,
                 'type_name'             => $type_name,
                 'target_name'           => $target_name,

diff --git a/templates/components/itilobject/validation.html.twig b/templates/components/itilobject/validation.html.twig
@@ -34,7 +34,7 @@
     <form method='post' name="form" action={{ call(itemtype ~ '::getFormURL') }}>
 {% endif %}
 <div class="card border-0 shadow-none p-0 m-0 mt-3">
-    <div class="card-header mb-3 pt-2">
+    <div class="card-header mb-1 pt-2">
         <h4 class="card-title ">
             {{ call(self ~ '::getTypeName', [call('Session::getPluralNumber')]) }}
         </h4>
@@ -64,9 +64,6 @@
                         </div>
                     </div>
 
-                    <div class="card border-0 shadow-none p-0 m-0">
-                        <div class="card-header mb-3 p-0"></div>
-                    </div>
                     {% if canadd %}
                         <div class="form-field row align-items-center col-12 col-sm-6  mb-2">
                             <label class="col-form-label col-xxl-5 text-xxl-end">
@@ -90,11 +87,11 @@
                         </div>
                     {% else %}
                         <div class="form-field row align-items-center col-12 col-sm-6  mb-2">
-                            <label class="col-form-label col-xxl-7 text-xxl-end">
+                            <label class="col-form-label col-xxl-5 text-xxl-end">
                                 {{ __('Minimum validation required') }}
                             </label>
-                            <div class="col-xxl-5 field-container">
-                                {% do call('Dropdown::getValueWithUnit', [item.fields["validation_percent"], "%"]) %};
+                            <div class="col-xxl-7 field-container">
+                                {{ call('Dropdown::getValueWithUnit', [item.fields["validation_percent"], "%"]) }}
                             </div>
                         </div>
                     {% endif %}