Redesign non-empty schedule view

- Add button to the .overlay element
- Merge sidebar entry to the button row

Author: sukhwinder33445

library/Notifications/Widget/TimeGrid/BaseGrid.php

@@ -7,11 +7,15 @@
 use DateInterval;
 use DateTime;
 use Generator;
+use Icinga\Module\Notifications\Common\Links;
 use ipl\Html\Attributes;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\HtmlElement;
+use ipl\Html\Text;
 use ipl\I18n\Translation;
 use ipl\Web\Style;
+use ipl\Web\Url;
+use ipl\Web\Widget\ButtonLink;
 use ipl\Web\Widget\Link;
 use LogicException;
 use SplObjectStorage;
@@ -471,7 +475,7 @@ final protected function yieldFixedEntries(Traversable $entries): Generator
         }
 
         $this->style->addFor($this, [
-            '--primaryRows' => $lastRow === 1 ? 1 : $lastRow - $rowStartModifier + 1,
+            '--primaryRows' => $lastRow === 1 ? 1 : $lastRow - $rowStartModifier + 1 + 1, // +1 to create extra row for add rotation button
             '--rowsPerStep' => 1
         ]);
     }
@@ -490,11 +494,44 @@ protected function assembleGridOverlay(BaseHtmlElement $overlay): void
             $generator = $this->yieldFixedEntries($entries);
         }
 
+        $addButtonCreated = false;
         foreach ($generator as $gridArea => $entry) {
+            [$rowStart, $colStart, $rowEnd, $colEnd] = $gridArea;
+
+            if (! $addButtonCreated && $entry->getAttributes()->has('data-rotation-position')) {
+                $btn = new HtmlElement('div', new Attributes(['class' => 'btn-container']));
+
+                $btn->addHtml(
+                    (new ButtonLink(
+                        $this->translate('Add another Rotation'),
+                        Links::rotationAdd(Url::fromRequest()->getParam('id')),
+                        'plus'
+                    ))->openInModal(),
+                    new HtmlElement(
+                        'span',
+                        new Attributes(['class' => 'hint']),
+                        new Text($this->translate('to override rotations above'))
+                    )
+                );
+
+                // take up the entire row
+                $this->style->addFor($btn, [
+                    'grid-area' => sprintf('~"%d / %d / %d / %d"', $rowStart, 1, $rowEnd, -1)
+                ]);
+
+                $overlay->addHtml($btn);
+                $addButtonCreated = true;
+            }
+
+            if ($addButtonCreated) { // result row must be below
+                $rowStart++;
+                $rowEnd++;
+            }
+
             $this->style->addFor($entry, [
                 '--entry-bg' => $entry->getColor(10),
                 '--entry-border-color' => $entry->getColor(50),
-                'grid-area' => sprintf('~"%d / %d / %d / %d"', ...$gridArea)
+                'grid-area' => sprintf('~"%d / %d / %d / %d"', $rowStart, $colStart, $rowEnd, $colEnd)
             ]);
 
             $overlay->addHtml($entry);

library/Notifications/Widget/Timeline.php

@@ -254,7 +254,7 @@ protected function getGrid()
                 $this->grid = (new DynamicGrid($this, $this->getStyle(), $this->start))->setDays($this->days);
             }
 
-            if (! $this->minimalLayout) {
+            if (! $this->minimalLayout && $this->rotations) {
                 $rotations = $this->rotations;
                 usort($rotations, function (Rotation $a, Rotation $b) {
                     return $b->getPriority() <=> $a->getPriority();
@@ -266,6 +266,9 @@ protected function getGrid()
                         $this->grid->addToSideBar($this->assembleSidebarEntry($rotation));
                     }
                 }
+
+                // placeholder for new add button row
+                $this->grid->addToSideBar(new HtmlElement('div', new Attributes(['class' => 'placeholder'])));
             }
         }
 

public/css/timeline.less

@@ -49,6 +49,12 @@
       }
     }
 
+    .sidebar .placeholder {
+      background-color: @gray-lighter;
+      border-top: 1px solid @gray-lighter;
+      margin-top: -1px; // to cover the border-bottom area of the previous sibling
+    }
+
     .btn-container {
       display: flex;
       justify-content: center;
@@ -57,6 +63,22 @@
       height: var(--primaryRowHeight);
     }
 
+    .overlay .btn-container {
+      // Make the button gray and add the hint text
+      pointer-events: all; // allow to click on the buttons
+      padding-right: var(--sidebarWidth); // center the button taking the sidebar width into account
+
+      .button-link:not(:hover) {
+        color: @disabled-gray;
+        background: none;
+      }
+
+      .hint {
+        margin-left: .5em;
+        color: @text-color-light;
+      }
+    }
+
     .overlay .entry {
       margin-top: 1em;
       margin-bottom: 1em;