Merge branch 'master' into bugfix/ie8-fixes-6417

application/views/scripts/config/authentication/reorder.phtml

@@ -1,4 +1,4 @@
-<div class="controls">
+<div class="controls" data-base-target="_main">
   <?= $tabs; ?>
 </div>
 <div class="content" data-base-target="_next">

application/views/scripts/config/index.phtml

@@ -1,4 +1,4 @@
-<div class="controls">
+<div class="controls" data-base-target="_main">
 <?= $this->tabs->render($this); ?>
 </div>
 

application/views/scripts/config/logging.phtml

@@ -1,35 +0,0 @@
-<div class="controls">
-<?= $this->tabs->render($this); ?>
-</div>
-
-<div class="content">
-<?php $errors = $this->form->getErrorMessages(); ?>
-
-<?php if (isset($this->messageBox)): ?>
-  <?= $this->messageBox->render() ?>
-<?php endif ?>
-
-<?php if ($this->successMessage): ?>
-<div>
-  <i class="icinga-icon-success"></i>
-  <strong><?= $this->escape($this->successMessage); ?></strong>
-</div>
-<?php endif; ?>
-
-<?php if (!empty($errors)) : ?>
-<div>
-  <h4>Errors occured when trying to save the project.</h4>
-  <p>
-      The following errors occured when trying to save the configuration:
-  </p>
-  <ul>
-    <?php foreach($errors as $error): ?>
-    <li><?= $this->escape($error) ?></li>
-    <?php endforeach; ?>
-  </ul>
-</div>
-
-<?php endif; ?>
-<?= $this->form ?>
-</div>
-

application/views/scripts/config/module.phtml

@@ -1,4 +1,4 @@
-<div class="controls">
+<div class="controls" data-base-target="_right">
 <?= $this->tabs ?>
 <h1><?= $this->escape($module->getTitle()) ?></h1>
 </div>

application/views/scripts/config/resource.phtml

@@ -1,4 +1,4 @@
-<div class="controls">
+<div class="controls" data-base-target="_main">
   <?= $tabs; ?>
 </div>
 <div class="content" data-base-target="_next">

application/views/scripts/roles/index.phtml

@@ -1,4 +1,4 @@
-<div class="controls">
+<div class="controls" data-base-target="_main">
     <?= $tabs ?>
     <h1><?= $this->translate('Roles') ?></h1>
 </div>

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/config/index.phtml

@@ -1,4 +1,4 @@
-<div class="controls">
+<div class="controls" data-base-target="_right">
   <?= $tabs; ?>
   <h1><?= $this->translate('Monitoring Backends') ?></h1>
 </div>

modules/monitoring/application/views/scripts/config/security.phtml

@@ -1,4 +1,4 @@
-<div class="controls">
+<div class="controls" data-base-target="_right">
     <?= $this->tabs ?>
 </div>
 <div class="content">

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>

public/js/icinga/events.js

@@ -482,6 +482,16 @@
                     targetId = 'col1';
                     $target = $('#' + targetId);
                     self.icinga.ui.layout1col();
+                } else if (targetId === '_right') {
+                    // Ensure that the content is displayed in the rightmost column
+                    $target = $el.closest('.container');
+                    if ($target.attr('id') === 'col1') {
+                        // As it's not possible to detect what's preceding the current state in the
+                        // history stack this just simulates _main in case the respective element
+                        // is not part of the rightmost column
+                        $target = $('#col1');
+                        self.icinga.ui.layout1col();
+                    }
                 } else {
                     $target = $('#' + targetId);
                 }