[vlma-devel] commit: Display more information about stream and file channels. ( Adrien Grand )

[git version control]

vlma | branch: master | Adrien Grand <jpountz at videolan.org> | Thu May 29 14:40:52 2008 +0200| [ee2f42b8dd1ab89150bcedebdcb46df053c47409]

Display more information about stream and file channels.

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

 vlma-webapp/src/main/resources/messages.properties |    4 +++-
 .../src/main/resources/messages_fr.properties      |    2 ++
 .../WEB-INF/jsp/file/filechannellist_right.jsp     |    8 ++++++++
 .../WEB-INF/jsp/stream/streamchannellist_right.jsp |    4 ++++
 4 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/vlma-webapp/src/main/resources/messages.properties b/vlma-webapp/src/main/resources/messages.properties
index 31564e7..887c8af 100644
--- a/vlma-webapp/src/main/resources/messages.properties
+++ b/vlma-webapp/src/main/resources/messages.properties
@@ -175,10 +175,12 @@ medias.shortlistSat = Satellite channel list not crypted
 medias.fulllistSat = Satellite channel list
 medias.list.frequency = Frequency
 medias.list.sid = SID
-medias.list.name = NAme
+medias.list.name = Name
 medias.list.status = State
 medias.list.action = Action
 medias.list.server = Server
+medias.list.files = Files
+medias.list.streamURL = URL
 medias.list.status.non-programmed = Not programmed
 medias.list.status.programmed-assigned = Programmed, priority {0}, assign to {1}
 medias.list.status.programmed-running = Programmed, priority {0}, streamed by {1}
diff --git a/vlma-webapp/src/main/resources/messages_fr.properties b/vlma-webapp/src/main/resources/messages_fr.properties
index 302bd95..db0d40b 100644
--- a/vlma-webapp/src/main/resources/messages_fr.properties
+++ b/vlma-webapp/src/main/resources/messages_fr.properties
@@ -179,6 +179,8 @@ medias.list.name = Nom
 medias.list.status = État
 medias.list.action = Action
 medias.list.server = Serveur
+medias.list.files = Fichiers
+medias.list.streamURL = URL
 medias.list.status.non-programmed = Non programmé
 medias.list.status.programmed-assigned = Programmé, priorité {0}, assigné à {1}
 medias.list.status.programmed-running = Programmé, priorité {0}, diffusé par {1}
diff --git a/vlma-webapp/src/main/webapp/WEB-INF/jsp/file/filechannellist_right.jsp b/vlma-webapp/src/main/webapp/WEB-INF/jsp/file/filechannellist_right.jsp
index 36126a1..eaae2e3 100644
--- a/vlma-webapp/src/main/webapp/WEB-INF/jsp/file/filechannellist_right.jsp
+++ b/vlma-webapp/src/main/webapp/WEB-INF/jsp/file/filechannellist_right.jsp
@@ -8,6 +8,7 @@
     <tr>
         <th><fmt:message key="medias.list.name" /></th>
         <th><fmt:message key="medias.list.server" /></th>
+        <th><fmt:message key="medias.list.files" /></th>
         <th><fmt:message key="medias.list.status" /></th>
         <th><fmt:message key="medias.list.action" /></th>
     </tr>
@@ -24,6 +25,13 @@
         <td>
             <c:out value="${filesChannel.server.name}"/>
         </td>
+        <td>
+            <ul>
+            <c:forEach items="${filesChannel.files}" var="file">
+                <li><c:out value="${file}"/></li>
+            </c:forEach>
+            </ul>
+        </td>
         <%-- Build the URL to remove the channel from the list --%>
         <c:url value="tntchannelremove.htm" var="tntChannelRemoveUrl">
             <c:param name="Id" value="${filesChannel.id}" />
diff --git a/vlma-webapp/src/main/webapp/WEB-INF/jsp/stream/streamchannellist_right.jsp b/vlma-webapp/src/main/webapp/WEB-INF/jsp/stream/streamchannellist_right.jsp
index f264654..94d52f6 100755
--- a/vlma-webapp/src/main/webapp/WEB-INF/jsp/stream/streamchannellist_right.jsp
+++ b/vlma-webapp/src/main/webapp/WEB-INF/jsp/stream/streamchannellist_right.jsp
@@ -7,6 +7,7 @@
 <table width="100%">
     <tr>
         <th><fmt:message key="medias.list.name" /></th>
+        <th><fmt:message key="medias.list.streamURL" /></th>
         <th><fmt:message key="medias.list.status" /></th>
         <th><fmt:message key="medias.list.action" /></th>
     </tr>
@@ -20,6 +21,9 @@
                 </a>
             </strong>
         </td>
+        <td>
+            <c:out value="${streamChannel.streamURL}" />
+        </td>
         <%-- Build the URL to remove the channel from the list --%>
         <c:url value="tntchannelremove.htm" var="tntChannelRemoveUrl">
             <c:param name="Id" value="${streamChannel.id}" />