Merge branch 'feature/context-sensitive-command-forms-8279'

resolves #8279

library/Icinga/Web/Widget/Tabs.php

@@ -218,6 +218,25 @@ EOT;
         return $this;
     }
 
+    /**
+     * Remove a tab
+     *
+     * @param   string  $name
+     *
+     * @return  self
+     */
+    public function remove($name)
+    {
+        if ($this->has($name)) {
+            unset($this->tabs[$name]);
+            if (($dropdownIndex = array_search($name, $this->dropdownTabs)) !== false) {
+                array_splice($this->dropdownTabs, $dropdownIndex, 2);
+            }
+        }
+
+        return $this;
+    }
+
     /**
      * Add a tab to the dropdown on the right side of the tab-bar.
      *

modules/monitoring/application/controllers/HostController.php

@@ -34,15 +34,7 @@ class Monitoring_HostController extends MonitoredObjectController
         }
         $this->object = $host;
         $this->createTabs();
-    }
-
-    /**
-     * Show a host
-     */
-    public function showAction()
-    {
         $this->getTabs()->activate('host');
-        parent::showAction();
     }
 
     /**

modules/monitoring/application/controllers/ServiceController.php

@@ -34,15 +34,7 @@ class Monitoring_ServiceController extends MonitoredObjectController
         }
         $this->object = $service;
         $this->createTabs();
-    }
-
-    /**
-     * Show a service
-     */
-    public function showAction()
-    {
         $this->getTabs()->activate('service');
-        parent::showAction();
     }
 
     /**

modules/monitoring/application/views/scripts/partials/command-form.phtml

@@ -1,5 +1,5 @@
 <div class="controls">
-    <?= $this->tabs->showOnlyCloseButton() ?>
+    <?= $this->tabs->remove('dashboard') ?>
 </div>
 <div class="content">
     <h1><?= $title ?> <?= /** @var \Icinga\Module\Monitoring\Forms\Command\CommandForm $form */ $this->icon('help', $form->getHelp()) ?></h1>

modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml

@@ -35,7 +35,7 @@ if ($object->acknowledged): ?>
                     );
                 }
             ?>
-            <a href="<?= $ackLink ?>">
+            <a href="<?= $ackLink ?>" data-base-target="_self">
                 <?= $this->icon('ok') ?> <?= $this->translate('Acknowledge') ?>
             </a>
             <?php } else {

modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml

@@ -39,7 +39,7 @@ if ($object->getType() === $object::TYPE_HOST) {
               );
           }
       ?>
-      <a href="<?= $reschedule ?>">
+      <a href="<?= $reschedule ?>" data-base-target="_self">
           <?= $this->icon('reschedule') ?>
           <?= $this->translate('Reschedule') ?>
       </a>

modules/monitoring/application/views/scripts/show/components/command.phtml

@@ -21,7 +21,7 @@ $command = array_shift($parts);
                     array('host' => $object->getHost()->getName(), 'service' => $object->getName())
                 );
             } ?>
-            <a href="<?= $processCheckResult ?>">
+            <a href="<?= $processCheckResult ?>" data-base-target="_self">
                 <?= $this->icon('reply') ?>
                 <?= $this->translate('Process check result') ?>
             </a>

modules/monitoring/application/views/scripts/show/components/comments.phtml

@@ -15,7 +15,7 @@
                 );
             }
         ?>
-        <a href="<?= $addCommentLink ?>">
+        <a href="<?= $addCommentLink ?>" data-base-target="_self">
             <?= $this->icon('comment') ?>
             <?= $this->translate('Add comment') ?>
         </a>

modules/monitoring/application/views/scripts/show/components/downtime.phtml

@@ -15,7 +15,7 @@
                 );
             }
         ?>
-        <a href="<?= $scheduleDowntimeLink ?>">
+        <a href="<?= $scheduleDowntimeLink ?>" data-base-target="_self">
             <?= $this->icon('plug') ?>
             <?= $this->translate('Schedule downtime') ?>
         </a>