From ebb0db3800ed5ada1cac90c3bfff940c1cabc273 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 1 Oct 2015 00:42:32 +0200
Subject: [PATCH] monitoring: Re-add support for displaying ipv6 addresses

refs #5543
---
 .../scripts/partials/object/host-header.phtml    | 14 +++++++++++---
 .../scripts/partials/object/service-header.phtml | 16 ++++++++++++----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/partials/object/host-header.phtml b/modules/monitoring/application/views/scripts/partials/object/host-header.phtml
index 9ca251a8d5..35f17489a7 100644
--- a/modules/monitoring/application/views/scripts/partials/object/host-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/object/host-header.phtml
@@ -14,13 +14,21 @@ use Icinga\Module\Monitoring\Object\Host;
         <td>
             <p>
                 <?= $this->iconImage()->host($object) ?>
-                <?= $this->escape($object->host_display_name) ?>
+                <span class="selectable"><?= $this->escape($object->host_display_name) ?></span>
             <?php if ($object->host_display_name !== $object->host_name): ?>
-                (<?= $this->escape($object->host_name) ?>)
+                <span class="selectable text-small">&#40;<?= $this->escape($object->host_name) ?>&#41;</span>
+            <?php endif ?>
+            <?php if ($object->host_address6 && $object->host_address6 !== $object->host_name): ?>
+                <br>
+                <span class="selectable text-small" title="<?= $this->translate('IPv6 address') ?>">
+                    <?= $this->escape($object->host_address6) ?>
+                </span>
             <?php endif ?>
             <?php if ($object->host_address && $object->host_address !== $object->host_name): ?>
                 <br>
-                <?= $this->escape($object->host_address) ?>
+                <span class="selectable text-small" title="<?= $this->translate('IPv4 address') ?>">
+                    <?= $this->escape($object->host_address) ?>
+                </span>
             <?php endif ?>
                 <?= $this->render('partials/host/statusicons.phtml') ?>
             </p>
diff --git a/modules/monitoring/application/views/scripts/partials/object/service-header.phtml b/modules/monitoring/application/views/scripts/partials/object/service-header.phtml
index ee8563645d..4a34113fed 100644
--- a/modules/monitoring/application/views/scripts/partials/object/service-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/object/service-header.phtml
@@ -15,13 +15,21 @@ use Icinga\Module\Monitoring\Object\Service;
         <td>
             <p>
                 <?= $this->iconImage()->service($object) ?>
-                <?= $this->escape($object->host_display_name) ?>
+                <span class="selectable"><?= $this->escape($object->host_display_name) ?></span>
             <?php if ($object->host_display_name !== $object->host_name): ?>
-                (<?= $this->escape($object->host_name) ?>)
+                <span class="selectable text-small">&#40;<?= $this->escape($object->host_name) ?>&#41;</span>
+            <?php endif ?>
+            <?php if ($object->host_address6 && $object->host_address6 !== $object->host_name): ?>
+                <br>
+                <span class="selectable text-small" title="<?= $this->translate('IPv6 address') ?>">
+                <?= $this->escape($object->host_address6) ?>
+            </span>
             <?php endif ?>
             <?php if ($object->host_address && $object->host_address !== $object->host_name): ?>
                 <br>
+                <span class="selectable text-small" title="<?= $this->translate('IPv4 address') ?>">
                 <?= $this->escape($object->host_address) ?>
+            </span>
             <?php endif ?>
             <?= $this->render('partials/host/statusicons.phtml') ?>
             </p>
@@ -38,9 +46,9 @@ use Icinga\Module\Monitoring\Object\Service;
         <td>
             <p>
                 <?= $this->iconImage()->host($object) ?>
-                <?= $this->translate('Service') ?>: <?= $this->escape($object->service_display_name) ?>
+                <?= $this->translate('Service') ?>&#58; <span class="selectable"><?= $this->escape($object->service_display_name) ?></span>
             <?php if ($object->service_display_name !== $object->service_description): ?>
-                (<?= $this->escape($object->service_description) ?>)
+                <span class="selectable text-small">&#40;<?= $this->escape($object->service_description) ?>&#41;</span>
             <?php endif ?>
                 <?= $this->render('partials/service/statusicons.phtml') ?>
             </p>