[vlma-devel] commit: Welcome page: add a message when no media has a program. ( Adrien Grand )

git version control git at videolan.org
Sat Aug 2 10:55:01 CEST 2008


vlma | branch: master | Adrien Grand <jpountz at videolan.org> | Sat Aug  2 10:56:48 2008 +0200| [7b8370651dd38589bdc55b7aad1c5f58e40de2d0] | committer: Adrien Grand 

Welcome page: add a message when no media has a program.

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

 vlma-webapp/src/main/resources/messages.properties |    1 +
 .../src/main/resources/messages_fr.properties      |    1 +
 .../webapp/WEB-INF/jsp/welcome/welcome_right.jsp   |   16 +++++++++++++++-
 3 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 248587a..5bde43b 100644
--- a/vlma-webapp/src/main/resources/messages.properties
+++ b/vlma-webapp/src/main/resources/messages.properties
@@ -182,6 +182,7 @@ streams.addstreamchannel = Add a stream channel
 
 medias.title = Media management
 medias.list = media list
+medias.empty = No media has been programmed.
 medias.updateSat = Update satellite channels
 medias.addTNTchannel = Add a TNT channel
 medias.listTNT = TNT channel list
diff --git a/vlma-webapp/src/main/resources/messages_fr.properties b/vlma-webapp/src/main/resources/messages_fr.properties
index f41557a..cd1248b 100644
--- a/vlma-webapp/src/main/resources/messages_fr.properties
+++ b/vlma-webapp/src/main/resources/messages_fr.properties
@@ -182,6 +182,7 @@ streams.addstreamchannel = Ajouter une chaîne de stream
 
 medias.title = Gestion des médias
 medias.list = Liste des médias
+medias.empty = Aucun média n'est programmé.
 medias.updateSat = Mettre à jour les chaînes satellite
 medias.addTNTchannel = Ajouter une chaîne TNT
 medias.listTNT = Liste des chaînes TNT
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 1988d01..6f52213 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
@@ -1,4 +1,3 @@
-
 <%@ include file="/WEB-INF/jsp/include.jsp" %>
 
 <h1><fmt:message key="welcome.page" /></h1>
@@ -34,6 +33,11 @@
 
 <h2><fmt:message key="welcome.program" /></h2>
 
+<c:if test="${empty tntChannels && empty satChannels && empty streamChannels && empty fileChannels}">
+<p><fmt:message key="medias.empty" /></p>
+</c:if>
+
+<c:if test="${not empty tntChannels}">
 <h3><fmt:message key="medias.listTNT" /></h3>
 
 <table>
@@ -78,6 +82,9 @@
     </c:forEach>
 </table>
 
+</c:if>
+
+<c:if test="${not empty satChannels}">
 <h3><fmt:message key="medias.fulllistSat" /></h3>
 
 <table>
@@ -124,6 +131,9 @@
     </c:forEach>
 </table>
 
+</c:if>
+
+<c:if test="${not empty fileChannels}">
 <h3><fmt:message key="files.list" /></h3>
 
 <table>
@@ -167,7 +177,9 @@
     </tr>
     </c:forEach>
 </table>
+</c:if>
 
+<c:if test="${not empty  streamChannels}">
 <h3><fmt:message key="streams.list" /></h3>
 
 <table>
@@ -211,3 +223,5 @@
     </tr>
     </c:forEach>
 </table>
+
+</c:if>
\ No newline at end of file



More information about the vlma-devel mailing list