You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/02/09 18:06:31 UTC
svn commit: r505374 -
/lenya/trunk/src/pubs/default/lenya/usecases/workflow/publish.jx
Author: andreas
Date: Fri Feb 9 09:06:30 2007
New Revision: 505374
URL: http://svn.apache.org/viewvc?view=rev&rev=505374
Log:
Improve formatting of publish error messages, don't show submit button if errors occur
Modified:
lenya/trunk/src/pubs/default/lenya/usecases/workflow/publish.jx
Modified: lenya/trunk/src/pubs/default/lenya/usecases/workflow/publish.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/lenya/usecases/workflow/publish.jx?view=diff&rev=505374&r1=505373&r2=505374
==============================================================================
--- lenya/trunk/src/pubs/default/lenya/usecases/workflow/publish.jx (original)
+++ lenya/trunk/src/pubs/default/lenya/usecases/workflow/publish.jx Fri Feb 9 09:06:30 2007
@@ -53,9 +53,14 @@
<ul>
<jx:forEach var="message" items="${usecase.getErrorMessages()}">
<li>
- <i18n:text>
- <jx:out value="${message}"/>
- </i18n:text>
+ <i18n:translate>
+ <i18n:text><jx:out value="${message.getMessage()}"/></i18n:text>
+ <jx:if test="${message.hasParameters()}">
+ <jx:forEach var="param" items="${message.getParameters()}">
+ <i18n:param><jx:out value="${param}"/></i18n:param>
+ </jx:forEach>
+ </jx:if>
+ </i18n:translate>
</li>
</jx:forEach>
<jx:forEach var="missingDocument" items="${usecase.getParameter('missingDocuments')}">
@@ -65,16 +70,21 @@
</jx:forEach>
<jx:forEach var="message" items="${usecase.getInfoMessages()}">
<li>
- <i18n:text>
- <jx:out value="${message}"/>
- </i18n:text>
+ <i18n:translate>
+ <i18n:text><jx:out value="${message.getMessage()}"/></i18n:text>
+ <jx:if test="${message.hasParameters()}">
+ <jx:forEach var="param" items="${message.getParameters()}">
+ <i18n:param><jx:out value="${param}"/></i18n:param>
+ </jx:forEach>
+ </jx:if>
+ </i18n:translate>
</li>
</jx:forEach>
</ul>
</td>
</tr>
- <jx:set var="emptyList" value="${new Packages.java.util.ArrayList()}"/>
- <jx:if test="${usecase.getParameter('unpublishedLinks', emptyList).size() > 0}">
+ <jx:if test="${usecase.getParameter('unpublishedLinks') != null &&
+ usecase.getParameter('unpublishedLinks').size() > 0}">
<tr>
<td class="lenya-entry-caption" valign="top">
<p>
@@ -122,8 +132,10 @@
<tr>
<td/>
<td>
- <input i18n:attr="value" type="submit" name="submit" value="Publish"/>
-  
+ <jx:if test="${!usecase.hasErrors()}">
+ <input i18n:attr="value" type="submit" name="submit" value="Publish"/>
+  
+ </jx:if>
<input i18n:attr="value" type="submit" name="cancel" value="Cancel"/>
</td>
</tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org