[vlma-devel] commit: Only display non-fictive adapters. (Adrien Grand )

[git version control]

vlma | branch: master | Adrien Grand <jpountz at videolan.org> | Sat Sep 20 15:29:58 2008 +0200| [1cd60f4d74f3038cc610ed2888d0da537e87df86] | committer: Adrien Grand 

Only display non-fictive adapters.

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

 .../src/main/webapp/WEB-INF/jsp/include.jsp        |    1 +
 .../webapp/WEB-INF/jsp/server/serverview_right.jsp |    6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/vlma-webapp/src/main/webapp/WEB-INF/jsp/include.jsp b/vlma-webapp/src/main/webapp/WEB-INF/jsp/include.jsp
index 0584775..a11905f 100644
--- a/vlma-webapp/src/main/webapp/WEB-INF/jsp/include.jsp
+++ b/vlma-webapp/src/main/webapp/WEB-INF/jsp/include.jsp
@@ -4,4 +4,5 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 
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 b0d10e0..61d167d 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
@@ -12,12 +12,13 @@
     <li><fmt:message key="servers.view.adapters" />
         <table>
         <c:forEach items="${server.adapters}" var="adapter">
+            <c:if test="${fn:contains(adapter.type, 'DVB')}">
             <tr><td><b><c:out value="${adapter.name}" /></b>
                 <c:choose>
-                    <c:when test="${adapter.type == 'DVB-S'}">
+                    <c:when test="${fn:contains(adapter.type, 'DVB-S')}">
                         <fmt:message key="servers.view.adapters.dvbs"><fmt:param value="${adapter.satellite.name}" /></fmt:message>
                     </c:when>
-                    <c:when test="${adapter.type == 'DVB-T'}">
+                    <c:when test="${fn:contains(adapter.type, 'DVB-T')}">
                         <fmt:message key="servers.view.adapters.dvbt" />
                     </c:when>
                 </c:choose>
@@ -27,6 +28,7 @@
                 </c:url></td>
                 <td><a href="${adapterRemoveUrl}"><img src="<c:url value="/img/delete.png" />" title="<fmt:message key="servers.view.adapters.remove" />" /></a></td>
             </tr>
+            </c:if>
         </c:forEach>
         </table>
         <c:url value="serveradapteradd.htm" var="adapterAddUrl">