diff --git a/LibreNMS/Util/Url.php b/LibreNMS/Util/Url.php index dde15a8aa1..bf6912231f 100644 --- a/LibreNMS/Util/Url.php +++ b/LibreNMS/Util/Url.php @@ -80,27 +80,32 @@ class Url // beginning of overlib box contains large hostname followed by hardware & OS details $contents = '
' . $device->displayName() . ''; + $devinfo = ''; if ($device->hardware) { - $contents .= ' - ' . htmlentities($device->hardware); + $devinfo .= htmlentities($device->hardware); } if ($device->os) { - $contents .= ' - ' . htmlentities(Config::getOsSetting($device->os, 'text')); + $devinfo .= ($devinfo ? ' - ' : '') . htmlentities(Config::getOsSetting($device->os, 'text')); } if ($device->version) { - $contents .= ' ' . htmlentities($device->version); + $devinfo .= ($devinfo ? ' - ' : '') . htmlentities($device->version); } if ($device->features) { - $contents .= ' (' . htmlentities($device->features) . ')'; + $devinfo .= ' (' . htmlentities($device->features) . ')'; + } + + if ($devinfo) { + $contents .= '
' . $devinfo; } if ($device->location_id) { - $contents .= ' - ' . htmlentities($device->location ?? ''); + $contents .= '
' . htmlentities($device->location ?? ''); } - $contents .= '
'; + $contents .= '
'; foreach ((array) $graphs as $entry) { $graph = isset($entry['graph']) ? $entry['graph'] : 'unknown'; diff --git a/html/css/styles.css b/html/css/styles.css index 0c420a89e5..be2efde761 100644 --- a/html/css/styles.css +++ b/html/css/styles.css @@ -1567,6 +1567,7 @@ tr.search:nth-child(odd) { } .minigraph-image { + display: inline; margin: 2px; }