r2755 - in trunk/pollen-ui/src/main: java/org/chorem/pollen/ui/components java/org/chorem/pollen/ui/pages/poll resources/org/chorem/pollen/ui/components webapp/poll
Author: nrannou Date: 2009-08-26 12:01:22 +0200 (Wed, 26 Aug 2009) New Revision: 2755 Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml trunk/pollen-ui/src/main/webapp/poll/VoteForPoll.tml Log: correction flux inexistant (ui) Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java 2009-08-26 09:39:41 UTC (rev 2754) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java 2009-08-26 10:01:22 UTC (rev 2755) @@ -16,6 +16,7 @@ package org.chorem.pollen.ui.components; +import java.io.File; import java.text.DateFormat; import java.util.Date; import java.util.Locale; @@ -221,6 +222,19 @@ } /** + * Vérifie que le fichier de flux de syndication existe. + * + * @return vrai si le fichier existe + */ + public boolean isFeedFileExisting() { + if (feedUrl == null) { + return false; + } + File feedFile = new File(feedUrl); + return feedFile.exists() ? true : false; + } + + /** * Initialisation de l'affichage */ void setupRender() { Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2009-08-26 09:39:41 UTC (rev 2754) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2009-08-26 10:01:22 UTC (rev 2755) @@ -588,6 +588,16 @@ } /** + * Vérifie que le fichier de flux de syndication existe. + * + * @return vrai si le fichier existe + */ + public boolean isFeedFileExisting() { + File feedFile = new File(getFeedFileName()); + return feedFile.exists() ? true : false; + } + + /** * Retourne le nom complet du fichier de flux de syndication. * * @return le nom du fichier Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml 2009-08-26 09:39:41 UTC (rev 2754) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml 2009-08-26 10:01:22 UTC (rev 2755) @@ -4,7 +4,7 @@ <head> <title>${message:pollen}</title> <link rel="shortcut icon" type="image/x-icon" href="${asset:context:favicon.ico}" /> - <t:if test="${feedUrl}"> + <t:if test="${feedFileExisting}"> <t:headlink rel="alternate" type="application/atom+xml" href="${feedUrl}" /> </t:if> <script type="text/javascript" src="${asset:context:js/pollen.js}" /> Modified: trunk/pollen-ui/src/main/webapp/poll/VoteForPoll.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/VoteForPoll.tml 2009-08-26 09:39:41 UTC (rev 2754) +++ trunk/pollen-ui/src/main/webapp/poll/VoteForPoll.tml 2009-08-26 10:01:22 UTC (rev 2755) @@ -19,9 +19,11 @@ <img src="${asset:context:img/count.png}" title="${message:results-help}" alt="${message:results}"/> </t:PageLink> </t:if> - <t:FileLink src="${feedFileName}" type="literal:application/atom+xml"> - <img src="${asset:context:img/feed.png}" title="Atom" alt="Atom"/> - </t:FileLink> + <t:if test="feedFileExisting"> + <t:FileLink src="${feedFileName}" type="literal:application/atom+xml"> + <img src="${asset:context:img/feed.png}" title="Atom" alt="Atom"/> + </t:FileLink> + </t:if> </div> <label>${message:creator-label}</label> ${creatorName} <br/>
participants (1)
-
nrannou@users.chorem.org