From 7a0c88f82773c77580999c04ba6224e7ba18b0de Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@inf.org>
Date: Sat, 20 Dec 2014 23:50:35 +0545
Subject: Interfaces widget remove blank line if no IPv4 address

If the interface had an IPv6 address but no IPv4 address, there was a blank line where the IPv4 address would have been. There is no need for that, and one day IPv4 will be old legacy and systems will routinely have no IPv4 addresses at all - they will all be IPv6. Might as well make that look ordinary on the display now.
The br goes in the div so we can put it in and out from the AJAX also.
---
 usr/local/www/widgets/widgets/interfaces.widget.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'usr/local/www/widgets/widgets')

diff --git a/usr/local/www/widgets/widgets/interfaces.widget.php b/usr/local/www/widgets/widgets/interfaces.widget.php
index 99d52d9..8dbcad0 100644
--- a/usr/local/www/widgets/widgets/interfaces.widget.php
+++ b/usr/local/www/widgets/widgets/interfaces.widget.php
@@ -112,8 +112,7 @@ foreach ($ifdescrs as $ifdescr => $ifname):
 	</tr>
 	<tr>
 		<td class="listr">
-			<div id="<?php echo $ifname;?>-ip" style="display:inline"><strong><?=htmlspecialchars($ifinfo['ipaddr']);?> </strong></div>
-			<br />
+			<div id="<?php echo $ifname;?>-ip" style="display:inline"><strong><?=htmlspecialchars($ifinfo['ipaddr']);?> </strong><?php if ($ifinfo['ipaddr']) echo "<br />";?></div>
 			<div id="<?php echo $ifname;?>-ipv6" style="display:inline"><strong><?=htmlspecialchars($ifinfo['ipaddrv6']);?> </strong></div>
 		</td>
 	</tr>
-- 
cgit v1.1