EventRuleConfigForm: Modify the HTML structure of filter wrapper and escalations

Author: raviks789

application/forms/EventRuleConfigForm.php

@@ -221,15 +221,16 @@ protected function assemble(): void
         $this->getElement('zero-condition-escalation')->setValue($zeroConditionEscalation);
 
         $this->addHtml(
-            (new HtmlElement('ul', Attributes::create(['class' => 'filter-wrapper'])))
+            (new HtmlElement('div', Attributes::create(['class' => 'filter-wrapper'])))
                 ->addHtml(
-                    new HtmlElement('li', null, (new FlowLine())->getRightArrow()),
-                    new HtmlElement('li', null, $configFilter),
-                    new HtmlElement('li', null, (new FlowLine())->getHorizontalLine())
+                    (new FlowLine())->getRightArrow(),
+                    $configFilter,
+                    (new FlowLine())->getHorizontalLine()
                 )
         );
 
-        $this->add(new Escalations($escalations, $addEscalationButton));
+        $escalationWrapper = (new HtmlElement('div'))->addHtml(new Escalations($escalations), $addEscalationButton);
+        $this->addHtml($escalationWrapper);
     }
 
     /**

library/Notifications/Widget/ItemList/Escalations.php

@@ -5,7 +5,6 @@
 namespace Icinga\Module\Notifications\Widget\ItemList;
 
 use ipl\Html\BaseHtmlElement;
-use ipl\Html\FormElement\SubmitButtonElement;
 
 class Escalations extends BaseHtmlElement
 {
@@ -16,24 +15,18 @@ class Escalations extends BaseHtmlElement
     /** @var Escalation[] Escalation list items */
     protected $escalations;
 
-    /** @var SubmitButtonElement Escalation add button */
-    protected $addButton;
-
     /**
      * Create the escalations list
      *
      * @param Escalation[] $escalations
-     * @param SubmitButtonElement  $addButton
      */
-    public function __construct(array $escalations, SubmitButtonElement $addButton)
+    public function __construct(array $escalations)
     {
         $this->escalations = $escalations;
-        $this->addButton = $addButton;
     }
 
     protected function assemble(): void
     {
         $this->addHtml(...$this->escalations);
-        $this->addHtml($this->addButton);
     }
 }

public/css/event-rule-config.less

@@ -116,6 +116,7 @@
 
   .config-filter {
     align-self: flex-start;
+    padding-top: 0.5em;
   }
 
   .search-controls {