From 4bd1d5eb3b931232f7d7723629b210694f5f5732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20Lu=C3=A7i?= <eri@pfsense.org>
Date: Fri, 7 Nov 2008 19:04:55 +0000
Subject: Cosmetic changes to show the descritive names on member interfaces on
 bridges page and clarify a note.

---
 usr/local/www/interfaces_bridge.php      | 15 +++++++++++++--
 usr/local/www/interfaces_bridge_edit.php |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'usr')

diff --git a/usr/local/www/interfaces_bridge.php b/usr/local/www/interfaces_bridge.php
index cd97fca..f5f3734 100644
--- a/usr/local/www/interfaces_bridge.php
+++ b/usr/local/www/interfaces_bridge.php
@@ -95,13 +95,24 @@ include("head.inc");
                   <td width="50%" class="listhdr">Description</td>
                   <td width="10%" class="list"></td>
 				</tr>
-			  <?php $i = 0; foreach ($a_bridges as $bridge): ?>
+			  <?php $i = 0; $ifdescrs = get_configured_interface_with_descr();
+					foreach ($a_bridges as $bridge): ?>
                 <tr>
                   <td class="listlr">
 					<?=htmlspecialchars(strtoupper($bridge['bridgeif']));?>
                   </td>
                   <td class="listr">
-					<?=htmlspecialchars($bridge['members']);?>
+					<? $members = explode(',', $bridge['members']);
+					$j = 0;
+					foreach ($members as $member) {
+						if (isset($ifdescrs[$member])) {
+							echo $ifdescrs[$member];
+							$j++;
+						}
+						if ($j > 1)
+							echo ", ";
+					}
+					?>
                   </td>
                   <td class="listbg">
                     <?=htmlspecialchars($bridge['descr']);?>&nbsp;
diff --git a/usr/local/www/interfaces_bridge_edit.php b/usr/local/www/interfaces_bridge_edit.php
index 1119fcb..e23ba5b 100644
--- a/usr/local/www/interfaces_bridge_edit.php
+++ b/usr/local/www/interfaces_bridge_edit.php
@@ -435,7 +435,7 @@ Set the size of the bridge address cache to size.	The default is
 		<p class="vexpl"><span class="red"><strong>
 					 Note:<br>
                                   </strong></span>
-                 The span interface cannot be part of the bridge.
+                 The span interface cannot be part of the bridge member interfaces.
                                         </span>
 					</td>
 				</tr>
-- 
cgit v1.1