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 2005/04/12 15:18:18 UTC
svn commit: r161049 - in lenya/trunk/src/webapp: WEB-INF/cocoon-xconf.xsl
lenya/resources/css/default.css lenya/usecases/edit/forms.jx
lenya/usecases/edit/forms/forms.jx lenya/usecases/tab/meta.jx
lenya/usecases/templates/messages.jx
Author: andreas
Date: Tue Apr 12 06:18:16 2005
New Revision: 161049
URL: http://svn.apache.org/viewcvs?view=rev&rev=161049
Log:
moved forms JX template to forms folder, improved error message display
Added:
lenya/trunk/src/webapp/lenya/usecases/edit/forms/forms.jx
Removed:
lenya/trunk/src/webapp/lenya/usecases/edit/forms.jx
Modified:
lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl
lenya/trunk/src/webapp/lenya/resources/css/default.css
lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx
lenya/trunk/src/webapp/lenya/usecases/templates/messages.jx
Modified: lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl?view=diff&r1=161048&r2=161049
==============================================================================
--- lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl (original)
+++ lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl Tue Apr 12 06:18:16 2005
@@ -420,7 +420,7 @@
<component-instance name="edit.forms" logger="lenya.publication"
class="org.apache.lenya.cms.editors.forms.FormsEditor">
<transaction policy="pessimistic"/>
- <view template="edit/forms" menu="false">
+ <view template="edit/forms/forms" menu="false">
<parameter name="formUri" value="cocoon://core/edit/form.xml"/>
</view>
</component-instance>
Modified: lenya/trunk/src/webapp/lenya/resources/css/default.css
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/resources/css/default.css?view=diff&r1=161048&r2=161049
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/css/default.css (original)
+++ lenya/trunk/src/webapp/lenya/resources/css/default.css Tue Apr 12 06:18:16 2005
@@ -88,6 +88,12 @@
font-weight: bold;
}
+div.lenya-error {
+ padding: 5px;
+ margin: 5px 0px;
+ background-color: #FF9999;
+}
+
.lenya-page-subtitle {
background-color: #E5F5F8;
border-bottom: solid 1px #B1B1B1;
Added: lenya/trunk/src/webapp/lenya/usecases/edit/forms/forms.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/edit/forms/forms.jx?view=auto&rev=161049
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/edit/forms/forms.jx (added)
+++ lenya/trunk/src/webapp/lenya/usecases/edit/forms/forms.jx Tue Apr 12 06:18:16 2005
@@ -0,0 +1,62 @@
+<page:page
+ xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
+ xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+ xmlns:cinclude="http://apache.org/cocoon/include/1.0"
+ >
+
+ <page:title><i18n:text>Edit</i18n:text></page:title>
+ <page:body>
+
+ <jx:import uri="templates/messages.jx"/>
+
+ <form method="post" action="?lenya.usecase=edit.forms">
+ <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
+ <jx:choose>
+ <jx:when test="${usecase.getErrorMessages().isEmpty()}">
+
+ <div class="lenya-box">
+ <div class="lenya-box-title">Information</div>
+ <div class="lenya-box-body">
+ <table class="lenya-table-noborder">
+ <tr>
+ <td class="lenya-entry-caption">Document:</td>
+ <td><jx:out value="${usecase.getParameter('document').getId()}"/></td>
+ </tr>
+ <tr>
+ <td class="lenya-entry-caption">Form:</td>
+ <td><jx:out value="${usecase.getParameter('form')}"/></td>
+ </tr>
+ <tr>
+ <td class="lenya-entry-caption">Node:</td>
+ <td><jx:out value="${usecase.getParameter('editSelect')}"/></td>
+ </tr>
+ <tr>
+ <td class="lenya-entry-caption">Workflow Event:</td>
+ <jx:set var="event" value="${request.getParameter('lenya.event')}"/>
+ <jx:choose>
+ <jx:when test="${event.equals('') || event.equals('null')}">
+ <td>No workflow event specified</td>
+ </jx:when>
+ <jx:otherwise>
+ <td><jx:out value="${event}"/></td>
+ </jx:otherwise>
+ </jx:choose>
+ </tr>
+ </table>
+ </div>
+ </div>
+
+ <cinclude:includexml>
+ <cinclude:src>cocoon://core/edit/form/<jx:out value="${usecase.getParameter('form')}"/>/<jx:out value="${usecase.getParameter('editSelect')}"/></cinclude:src>
+ </cinclude:includexml>
+ </jx:when>
+ <jx:otherwise>
+ <input type="submit" name="cancel" value="Cancel"/>
+ </jx:otherwise>
+ </jx:choose>
+ </form>
+
+ </page:body>
+</page:page>
\ No newline at end of file
Modified: lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx?view=diff&r1=161048&r2=161049
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx Tue Apr 12 06:18:16 2005
@@ -83,7 +83,7 @@
<td>
<br/>
<jx:choose>
- <jx:when test="${usecase.getParameter('document').getArea().equals('authoring')}">
+ <jx:when test="${usecase.getParameter('document').getArea().equals('authoring') && usecase.getErrorMessages().isEmpty()}">
<input i18n:attr="value" name="submit" type="submit" value="Save"/>
</jx:when>
<jx:otherwise>
Modified: lenya/trunk/src/webapp/lenya/usecases/templates/messages.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/templates/messages.jx?view=diff&r1=161048&r2=161049
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/templates/messages.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/templates/messages.jx Tue Apr 12 06:18:16 2005
@@ -22,24 +22,28 @@
xmlns="http://www.w3.org/1999/xhtml"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1" >
- <ul>
-
- <jx:forEach var="message" items="${usecase.getErrorMessages()}">
- <li>
- <i18n:text>
- <jx:out value="${message}"/>
- </i18n:text>
- </li>
- </jx:forEach>
-
- <jx:forEach var="message" items="${usecase.getInfoMessages()}">
- <li>
- <i18n:text>
- <jx:out value="${message}"/>
- </i18n:text>
- </li>
- </jx:forEach>
-
- </ul>
+ <jx:if test="${!usecase.getErrorMessages().isEmpty() || !usecase.getInfoMessages().isEmpty()}">
+ <div class="lenya-error">
+ <ul>
+
+ <jx:forEach var="message" items="${usecase.getErrorMessages()}">
+ <li>
+ <i18n:text>
+ <jx:out value="${message}"/>
+ </i18n:text>
+ </li>
+ </jx:forEach>
+
+ <jx:forEach var="message" items="${usecase.getInfoMessages()}">
+ <li>
+ <i18n:text>
+ <jx:out value="${message}"/>
+ </i18n:text>
+ </li>
+ </jx:forEach>
+
+ </ul>
+ </div>
+ </jx:if>
</jx:template>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org