tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-09-21 17:07:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Host/service header: don't automatically select parentheses around monitored object's name

Browse Source 
refs #12208
This commit is contained in:
Alexander A. Klimov 2016-08-31 11:43:43 +02:00
parent 18b9412b62
commit 172929a72b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/monitoring/application/views/scripts/partials/object/host-header.phtml
View File

@ -17,7 +17,8 @@ use Icinga\Module\Monitoring\Object\Host;
echo $this->iconImage()->host($object); echo $this->iconImage()->host($object);
echo '<span class="selectable">' . $this->escape($object->host_display_name) . '</span>'; echo '<span class="selectable">' . $this->escape($object->host_display_name) . '</span>';
if ($object->host_display_name !== $object->host_name) { if ($object->host_display_name !== $object->host_name) {
echo ' <span class="selectable host-meta">&#40;' . $this->escape($object->host_name) . '&#41;</span>'; echo ' <span class="host-meta">&#40;<span class="selectable">' . $this->escape($object->host_name)
. '</span>&#41;</span>';
} }
if ($object->host_alias !== $object->host_display_name && $object->host_alias !== $object->host_name) { if ($object->host_alias !== $object->host_display_name && $object->host_alias !== $object->host_name) {
echo '<div class="selectable host-meta">' echo '<div class="selectable host-meta">'

6
modules/monitoring/application/views/scripts/partials/object/service-header.phtml
View File

@ -18,7 +18,8 @@ use Icinga\Module\Monitoring\Object\Service;
echo $this->iconImage()->host($object); echo $this->iconImage()->host($object);
echo '<span class="selectable">' . $this->escape($object->host_display_name) . '</span>'; echo '<span class="selectable">' . $this->escape($object->host_display_name) . '</span>';
if ($object->host_display_name !== $object->host_name) { if ($object->host_display_name !== $object->host_name) {
echo ' <span class="selectable host-meta">&#40;' . $this->escape($object->host_name) . '&#41;</span>'; echo ' <span class="host-meta">&#40;<span class="selectable">' . $this->escape($object->host_name)
. '</span>&#41;</span>';
} }
echo $this->render('partials/host/statusicons.phtml'); echo $this->render('partials/host/statusicons.phtml');
if ($object->host_address6 && $object->host_address6 !== $object->host_name) { if ($object->host_address6 && $object->host_address6 !== $object->host_name) {
@ -48,7 +49,8 @@ use Icinga\Module\Monitoring\Object\Service;
echo $this->translate('Service') echo $this->translate('Service')
. '&#58; <span class="selectable">' . $this->escape($object->service_display_name) . '</span>'; . '&#58; <span class="selectable">' . $this->escape($object->service_display_name) . '</span>';
if ($object->service_display_name !== $object->service_description) { if ($object->service_display_name !== $object->service_description) {
echo ' <span class="selectable service-meta">&#40;' . $this->escape($object->service_description) . '&#41;</span>'; echo ' <span class="service-meta">&#40;<span class="selectable">'
. $this->escape($object->service_description) . '</span>&#41;</span>';
} }
echo $this->render('partials/service/statusicons.phtml'); echo $this->render('partials/service/statusicons.phtml');
?></td> ?></td>