--- node.jsp.orig	2006-06-28 16:18:16.000000000 +0200
+++ node.jsp	2006-06-28 16:39:49.000000000 +0200
@@ -273,6 +273,12 @@
                 <td>Status</td>
                 <td><%=(this.getStatusString(node_db.getNodeType())!=null ? this.getStatusString(node_db.getNodeType()) : "Unknown")%></td>
               </tr>
+            <!-- AASU Start -->
+              <tr> 
+                <td>Node Id</td>
+                <td><%=(node_db.getNodeId())%></td>
+              </tr>
+            <!-- AASU Stop -->
             </table>
             <br>
             
@@ -334,18 +340,37 @@
             <table width="100%" border="1" cellspacing="0" cellpadding="2" bordercolor="black" BGCOLOR="#cccccc">
               <tr bgcolor="#999999">
                 <td><b>Interfaces</b></td> 
+		<td><b>Admin</b></td>
+		<td><b>Oper</b></td>
               </tr>
               <% for( int i=0; i < intfs.length; i++ ) { %>
                 <% if( "0.0.0.0".equals( intfs[i].getIpAddress() )) { %>
                   <tr>
                     <td>
                       <a href="element/interface.jsp?node=<%=nodeId%>&intf=<%=intfs[i].getIpAddress()%>&ifindex=<%=intfs[i].getIfIndex()%>">Non-IP</a>
-                      <%=" (ifIndex: "+intfs[i].getIfIndex()+"-"+intfs[i].getSnmpIfDescription()+")"%>
-                    </td>
+
+                       <!-- AASU Start -->
+                      <%=" ("+intfs[i].getSnmpIfDescription()+" - <b>"+intfs[i].getSnmpIfAlias()+"</b>)"%>
+                         <% if(  1 == ( intfs[i].getSnmpIfAdminStatus() ) ) { %>
+                              <td bgcolor="green">UP</td>
+                               <% } else if( ( intfs[i].getSnmpIfAdminStatus() ) == 2 ) { %>
+                              <td bgcolor="red">DOWN</td>
+                                <% } else { %>
+                             <td>n/a</td>
+                          <% } %>
+                         <% if(  1 == ( intfs[i].getSnmpIfOperStatus() ) ) { %>
+                              <td bgcolor="green">UP</td>
+                               <% } else if( ( intfs[i].getSnmpIfOperStatus() ) == 2 ) { %>
+                              <td bgcolor="red">DOWN</td>
+                                <% } else { %>
+                             <td>n/a</td>
+                          <% } %>
+                      <!-- AASU Stop  -->
+
                   </tr>
                 <% } else { %>  
                   <tr>
-                    <td>
+                    <td colspan="3">
                       <a href="element/interface.jsp?node=<%=nodeId%>&intf=<%=intfs[i].getIpAddress()%>"><%=intfs[i].getIpAddress()%></a>
                       <%=intfs[i].getIpAddress().equals(intfs[i].getHostname()) ? "" : "(" + intfs[i].getHostname() + ")"%>
                     </td>