[vlma-devel] commit: Fix HTML output. (Adrien Grand )

[git version control]

vlma | branch: master | Adrien Grand <jpountz at videolan.org> | Mon Nov 10 15:30:40 2008 +0100| [ba4ab709e2eb79b6e592ee1a44261b857c30cb26] | committer: Adrien Grand 

Fix HTML output.

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

 .../webapp/WEB-INF/jsp/welcome/welcome_right.jsp   |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/vlma-webapp/src/main/webapp/WEB-INF/jsp/welcome/welcome_right.jsp b/vlma-webapp/src/main/webapp/WEB-INF/jsp/welcome/welcome_right.jsp
index 2763637..9b1b7a8 100644
--- a/vlma-webapp/src/main/webapp/WEB-INF/jsp/welcome/welcome_right.jsp
+++ b/vlma-webapp/src/main/webapp/WEB-INF/jsp/welcome/welcome_right.jsp
@@ -33,18 +33,23 @@
 
     <c:set var="vacantAdapterCount" value="0" />
 
+    <c:set var="serverNameDisplayed" value="false" />
     <c:forEach items="${servers}" var="server">
+        <c:if test="${serverNameDisplayed}" >
+            </ul>
+        </c:if>
         <c:set var="serverNameDisplayed" value="false" />
         <c:if test="${server.up}" >
 	        <c:forEach items="${server.adapters}" var="adapter">
-	            <c:if test="${!adapter.busy && adapter.name != 'files-adapter' && adapter.name != 'stream-adapter'}">
-	                <c:if test="${!serverNameDisplayed}" >
+	            <c:if test="${!adapter.busy && fn:contains(adapter.type, 'DVB')}">
+	                <c:if test="${!serverNameDisplayed}">
 	                    <c:url value="serverview.htm" var="serverUrl">
 	                        <c:param name="server" value="${server.id}" />
 	                        <c:set var="serverNameDisplayed" value="true" />
 	                        <c:set var="vacantAdapterCount" value="${vacantAdapterCount + 1}" />
 	                    </c:url>
-	                    <a href="${serverUrl}"><b>${server.name}</b></a><ul>
+	                    <a href="${serverUrl}"><b>${server.name}</b></a>
+	                    <ul>
 	                </c:if>
 	                <li>
 	                    <fmt:message key="welcome.vacantadapter.adapter" >
@@ -52,12 +57,12 @@
                         </fmt:message>
                     </li>
 	            </c:if>
-	            <c:if test="${!serverNameDisplayed}" >
-	                </ul>
-	            </c:if>
 	        </c:forEach>
         </c:if>
     </c:forEach>
+    <c:if test="${serverNameDisplayed}" >
+	    </ul>
+	</c:if>
     
     <c:if test="${vacantAdapterCount == 0}">
         <fmt:message key="welcome.vacantadapter.no" />