[vlma-devel] commit: Display DNS and IP address. (Adrien Grand )

[git version control]

vlma | branch: master | Adrien Grand <jpountz at videolan.org> | Sun Mar  1 06:08:43 2009 +0100| [762adb355fe1e802b3cd188aa0ef1546fd565de9] | committer: Adrien Grand 

Display DNS and IP address.

> http://git.videolan.org/gitweb.cgi/vlma.git/?a=commit;h=762adb355fe1e802b3cd188aa0ef1546fd565de9
---

 .../webapp/WEB-INF/jsp/server/serverlist_right.jsp |    2 +-
 .../webapp/WEB-INF/jsp/server/serverview_right.jsp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vlma-webapp/src/main/webapp/WEB-INF/jsp/server/serverlist_right.jsp b/vlma-webapp/src/main/webapp/WEB-INF/jsp/server/serverlist_right.jsp
index c565eca..b51c4a3 100644
--- a/vlma-webapp/src/main/webapp/WEB-INF/jsp/server/serverlist_right.jsp
+++ b/vlma-webapp/src/main/webapp/WEB-INF/jsp/server/serverlist_right.jsp
@@ -19,7 +19,7 @@
     </c:url>
     <tr>
         <td width="25%"><b><c:out value="${server.name}" /></b></td>
-        <td><c:out value="${server.address}" /></td>
+        <td><c:out value="${server.ip.hostName} / ${server.ip.hostAddress}" /></td>
         <td>
             <c:if test="${!server.up}">
                 <span class="error"><fmt:message key="servers.unreachable" /></span>
diff --git a/vlma-webapp/src/main/webapp/WEB-INF/jsp/server/serverview_right.jsp b/vlma-webapp/src/main/webapp/WEB-INF/jsp/server/serverview_right.jsp
index e66c45e..48608a5 100644
--- a/vlma-webapp/src/main/webapp/WEB-INF/jsp/server/serverview_right.jsp
+++ b/vlma-webapp/src/main/webapp/WEB-INF/jsp/server/serverview_right.jsp
@@ -15,7 +15,7 @@
         <fmt:message key="general.days" var="days" />
         <li><fmt:message key="servers.view.vlc.uptime"><fmt:param value="${vlcUptime.days} ${days}, ${vlcUptime.hours}" /></fmt:message></li>
     </c:if>
-    <li><fmt:message key="servers.view.address" /> <b><c:out value="${server.address}" /></b></li>
+    <li><fmt:message key="servers.view.address" /> <b><c:out value="${server.ip.hostName} / ${server.ip.hostAddress}" /></b></li>
     <li><fmt:message key="servers.view.adapters" />
         <table>
         <c:forEach items="${server.adapters}" var="adapter">