diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-08-28 08:48:25 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-08-28 08:48:25 -0300 |
| commit | b0473447877582562f15d7086f645af28183ce33 (patch) | |
| tree | 1c3b8f4cc22d9a276897c558b16afff7f8b3880e /usr/local/www/widgets/widgets | |
| parent | 56d237224ffcc565115814b8e25e70e1031684a1 (diff) | |
| parent | dd57482238384fe436cafaac895f4c2cf99542e5 (diff) | |
| download | pfsense-b0473447877582562f15d7086f645af28183ce33.zip pfsense-b0473447877582562f15d7086f645af28183ce33.tar.gz | |
Merge pull request #1261 from CharlieMarshall/improveInter
Diffstat (limited to 'usr/local/www/widgets/widgets')
| -rw-r--r-- | usr/local/www/widgets/widgets/interfaces.widget.php | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/usr/local/www/widgets/widgets/interfaces.widget.php b/usr/local/www/widgets/widgets/interfaces.widget.php index 22b15d9..92a5ffb 100644 --- a/usr/local/www/widgets/widgets/interfaces.widget.php +++ b/usr/local/www/widgets/widgets/interfaces.widget.php @@ -49,7 +49,7 @@ require_once("/usr/local/www/widgets/include/interfaces.inc"); $iswireless = is_interface_wireless($ifdescr); ?> <tr> - <td class="vncellt" width="40%"> + <td class="vncellt" rowspan="2"> <?php if($ifinfo['ppplink']) { echo "<img src='./themes/{$g['theme']}/images/icons/icon_3g.gif' alt='3g' />"; @@ -67,39 +67,37 @@ require_once("/usr/local/www/widgets/include/interfaces.inc"); <?=htmlspecialchars($ifname);?></span></u></strong> <?php if ($ifinfo['dhcplink']) - echo " (DHCP)"; + echo " (DHCP)"; ?> </td> - <td width="60%" class="listr"> - <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="status"> - <tr> - <?php if($ifinfo['status'] == "up" || $ifinfo['status'] == "associated") { ?> - <td> + <?php if($ifinfo['status'] == "up" || $ifinfo['status'] == "associated") { ?> + <td rowspan="2" class="listr" align="center"> <div id="<?php echo $ifname;?>-up" style="display:inline" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_up.gif" title="<?=$ifname;?> is up" alt="up" /></div> </td> <?php } else if ($ifinfo['status'] == "no carrier") { ?> - <td> + <td rowspan="2" class="listr" align="center"> <div id="<?php echo $ifname;?>-down" style="display:inline" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_down.gif" title="<?=$ifname;?> is down" alt="down" /></div> </td> <?php } else if ($ifinfo['status'] == "down") { ?> - <td> + <td rowspan="2" class="listr" align="center"> <div id="<?php echo $ifname;?>-block" style="display:inline" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block.gif" title="<?=$ifname;?> is disabled" alt="disabled" /></div> </td> <?php } else { ?><?=htmlspecialchars($ifinfo['status']); }?> - <td> + <td class="listr"> <div id="<?php echo $ifname;?>-media" style="display:inline"><?=htmlspecialchars($ifinfo['media']);?></div> </td> </tr> - </table> - <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="summary"> <tr> - <td class="vncellt" width="100%"> - <div id="<?php echo $ifname;?>-ip" style="display:inline"><?=htmlspecialchars($ifinfo['ipaddr']);?> </div> - <br /> - <div id="<?php echo $ifname;?>-ipv6" style="display:inline"><?=htmlspecialchars($ifinfo['ipaddrv6']);?> </div> - </td> + <td class="listr"><b> + <?php if($ifinfo['ipaddr'] != "") { ?> + <div id="<?php echo $ifname;?>-ip" style="display:inline"><?=htmlspecialchars($ifinfo['ipaddr']);?> </div> + <br /> + <?php } + if ($ifinfo['ipaddrv6'] != "") { ?> + <div id="<?php echo $ifname;?>-ipv6" style="display:inline"><?=htmlspecialchars($ifinfo['ipaddrv6']);?> </div> + <?php } ?> + </b></td> </tr> - </table> - </td></tr> + </tr> <?php }//end for each ?> </table> |
