Index: src/web/web/element/node.jsp
===================================================================
RCS file: /cvsroot/opennms/opennms/src/web/web/element/node.jsp,v
retrieving revision 1.12
diff -u -r1.12 node.jsp
--- src/web/web/element/node.jsp 16 Nov 2004 21:21:29 -0000 1.12
+++ src/web/web/element/node.jsp 22 Nov 2004 18:46:25 -0000
@@ -248,32 +248,6 @@
-
-
-
- Interfaces |
-
- <% for( int i=0; i < intfs.length; i++ ) { %>
- <% if( "0.0.0.0".equals( intfs[i].getIpAddress() )) { %>
-
-
- Non-IP
- <%=" (ifIndex: "+intfs[i].getIfIndex()+"-"+intfs[i].getSnmpIfDescription()+")"%>
- |
-
- <% } else { %>
-
-
- <%=intfs[i].getIpAddress()%>
- <%=intfs[i].getIpAddress().equals(intfs[i].getHostname()) ? "" : "(" + intfs[i].getHostname() + ")"%>
- |
-
- <% } %>
- <% } %>
-
-
-
-
@@ -310,6 +284,32 @@
<% } %>
+
+
+
+ Interfaces |
+
+ <% for( int i=0; i < intfs.length; i++ ) { %>
+ <% if( "0.0.0.0".equals( intfs[i].getIpAddress() )) { %>
+
+
+ Non-IP
+ <%=" (ifIndex: "+intfs[i].getIfIndex()+"-"+intfs[i].getSnmpIfDescription()+")"%>
+ |
+
+ <% } else { %>
+
+
+ <%=intfs[i].getIpAddress()%>
+ <%=intfs[i].getIpAddress().equals(intfs[i].getHostname()) ? "" : "(" + intfs[i].getHostname() + ")"%>
+ |
+
+ <% } %>
+ <% } %>
+
+
+
+
Index: src/web/web/includes/nodeAvailability-box.jsp
===================================================================
RCS file: /cvsroot/opennms/opennms/src/web/web/includes/nodeAvailability-box.jsp,v
retrieving revision 1.6
diff -u -r1.6 nodeAvailability-box.jsp
--- src/web/web/includes/nodeAvailability-box.jsp 7 Oct 2004 20:23:51 -0000 1.6
+++ src/web/web/includes/nodeAvailability-box.jsp 22 Nov 2004 18:46:25 -0000
@@ -144,17 +144,16 @@
<% } %>
<% } else { %>
<%-- interface is not managed --%>
+ <% if("0.0.0.0".equals(ipAddr)) {
+ }
+ else { %>
- <% if("0.0.0.0".equals(ipAddr)) { %>
- Non-IP
- <%=" (ifIndex: "+intf.getIfIndex()+"-"+intf.getSnmpIfDescription()+")"%>
- <% } else { %>
- <%=ipAddr%>
- <% } %>
+ <%=ipAddr%>
|
<%=ElementUtil.getInterfaceStatusString(intf)%> |
+ <% } %>
<% } %>
<% } %>