You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by jw...@apache.org on 2005/04/26 15:19:25 UTC
svn commit: r164785 - in
/lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow:
deactivate.jx publish.jx reject.jx submit.jx
Author: jwkaltz
Date: Tue Apr 26 06:19:24 2005
New Revision: 164785
URL: http://svn.apache.org/viewcvs?rev=164785&view=rev
Log:
[minor change] use template for error messages, where possible. Formatting: removed ctrl-Ms
Modified:
lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/deactivate.jx (contents, props changed)
lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/publish.jx (contents, props changed)
lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/reject.jx (contents, props changed)
lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/submit.jx (contents, props changed)
Modified: lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/deactivate.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/deactivate.jx?rev=164785&r1=164784&r2=164785&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/deactivate.jx (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/deactivate.jx Tue Apr 26 06:19:24 2005
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
<!--
- Copyright 1999-2004 The Apache Software Foundation
+ Copyright 1999-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -13,70 +13,53 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--->
-
-<!-- $Id: login.jx 123986 2005-01-03 15:23:11Z andreas $ -->
-
-<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" >
-
- <page:title><i18n:text>Deactivate</i18n:text></page:title>
- <page:body>
- <div class="lenya-box">
- <div class="lenya-box-title">
- <i18n:text>Deactivate</i18n:text>
- </div>
- <div class="lenya-box-body">
- <form>
- <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
- <input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
- <table class="lenya-table-noborder">
- <tr>
- <td class="lenya-entry-caption" valign="top"><i18n:text>Document</i18n:text>:</td>
- <td valign="top">
- <jx:out value="${usecase.getParameter('document').getId()}"/>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <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>
- </td>
- </tr>
- <tr>
- <td/>
- <td>
- <jx:choose>
- <jx:when test="${usecase.getParameter('allowSingleDocument').equals('false')}">
- <input type="checkbox" checked="checked" disabled="disabled"/>
- <input name="subtree" type="hidden" value="on"/>
- </jx:when>
- <jx:when test="${usecase.getParameter('subtree') == null}">
- <input name="subtree" type="checkbox"/>
- </jx:when>
- <jx:otherwise>
- <input name="subtree" type="checkbox" checked="checked"/>
- </jx:otherwise>
- </jx:choose>
- <i18n:text>deactivate complete subtree</i18n:text>
- </td>
- </tr>
+-->
+
+<!-- $Id$ -->
+
+<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" >
+
+ <page:title><i18n:text>Deactivate</i18n:text></page:title>
+ <page:body>
+ <div class="lenya-box">
+ <div class="lenya-box-title">
+ <i18n:text>Deactivate</i18n:text>
+ </div>
+
+ <jx:import uri="templates/messages.jx"/>
+
+ <div class="lenya-box-body">
+ <form>
+ <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
+ <input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
+ <table class="lenya-table-noborder">
+ <tr>
+ <td class="lenya-entry-caption" valign="top"><i18n:text>Document</i18n:text>:</td>
+ <td valign="top">
+ <jx:out value="${usecase.getParameter('document').getId()}"/>
+ </td>
+ </tr>
+ <tr>
+ <td/>
+ <td>
+ <jx:choose>
+ <jx:when test="${usecase.getParameter('allowSingleDocument').equals('false')}">
+ <input type="checkbox" checked="checked" disabled="disabled"/>
+ <input name="subtree" type="hidden" value="on"/>
+ </jx:when>
+ <jx:when test="${usecase.getParameter('subtree') == null}">
+ <input name="subtree" type="checkbox"/>
+ </jx:when>
+ <jx:otherwise>
+ <input name="subtree" type="checkbox" checked="checked"/>
+ </jx:otherwise>
+ </jx:choose>
+ <i18n:text>deactivate complete subtree</i18n:text>
+ </td>
+ </tr>
<tr>
<td/>
<td>
@@ -84,10 +67,10 @@
 
<input i18n:attr="value" type="submit" name="cancel" value="Cancel"/>
</td>
- </tr>
- </table>
- </form>
- </div>
- </div>
- </page:body>
-</page:page>
+ </tr>
+ </table>
+ </form>
+ </div>
+ </div>
+ </page:body>
+</page:page>
Propchange: lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/deactivate.jx
------------------------------------------------------------------------------
svn:keywords = Id
Modified: lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/publish.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/publish.jx?rev=164785&r1=164784&r2=164785&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/publish.jx (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/publish.jx Tue Apr 26 06:19:24 2005
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
<!--
- Copyright 1999-2004 The Apache Software Foundation
+ Copyright 1999-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -13,82 +13,82 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--->
-
-<!-- $Id: login.jx 123986 2005-01-03 15:23:11Z andreas $ -->
-
-<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" >
-
- <page:title><i18n:text>Publish</i18n:text></page:title>
- <page:body>
- <div class="lenya-box">
- <div class="lenya-box-title">
- <i18n:text>Publish</i18n:text>
- </div>
- <div class="lenya-box-body">
- <form>
- <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
- <input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
- <table class="lenya-table-noborder">
- <tr>
- <td class="lenya-entry-caption" valign="top"><i18n:text>Document</i18n:text>:</td>
- <td valign="top">
- <jx:out value="${usecase.getParameter('document').getId()}"/>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <ul>
- <jx:forEach var="message" items="${usecase.getErrorMessages()}">
- <li>
- <i18n:text>
- <jx:out value="${message}"/>
- </i18n:text>
- </li>
- </jx:forEach>
- <jx:forEach var="missingDocument" items="${usecase.getParameter('missingDocuments')}">
- <li>
- <a href="${request.getContextPath() + missingDocument.getCanonicalWebappURL()}"><jx:out value="${missingDocument.getId()}"/> [<jx:out value="${missingDocument.getLanguage()}"/>]</a>
- </li>
- </jx:forEach>
- <jx:forEach var="message" items="${usecase.getInfoMessages()}">
- <li>
- <i18n:text>
- <jx:out value="${message}"/>
- </i18n:text>
- </li>
- </jx:forEach>
- </ul>
- </td>
- </tr>
- <tr>
- <td/>
- <td>
- <jx:choose>
- <jx:when test="${usecase.getParameter('allowSingleDocument').equals('false')}">
- <input type="checkbox" checked="checked" disabled="disabled"/>
- <input name="subtree" type="hidden" value="on"/>
- </jx:when>
- <jx:when test="${usecase.getParameter('subtree') == null}">
- <input name="subtree" type="checkbox"/>
- </jx:when>
- <jx:otherwise>
- <input name="subtree" type="checkbox" checked="checked"/>
- </jx:otherwise>
- </jx:choose>
- <i18n:text>publish complete subtree</i18n:text>
- </td>
- </tr>
- <tr>
- <td><i18n:text>Schedule</i18n:text>:</td>
- <td>
- <input type="checkbox" name="schedule"/>
- <input type="text" name="schedule.time" value="${usecase.getParameter('schedule.time')}"/>
- </td>
- </tr>
+-->
+
+<!-- $Id$ -->
+
+<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" >
+
+ <page:title><i18n:text>Publish</i18n:text></page:title>
+ <page:body>
+ <div class="lenya-box">
+ <div class="lenya-box-title">
+ <i18n:text>Publish</i18n:text>
+ </div>
+ <div class="lenya-box-body">
+ <form>
+ <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
+ <input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
+ <table class="lenya-table-noborder">
+ <tr>
+ <td class="lenya-entry-caption" valign="top"><i18n:text>Document</i18n:text>:</td>
+ <td valign="top">
+ <jx:out value="${usecase.getParameter('document').getId()}"/>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <ul>
+ <jx:forEach var="message" items="${usecase.getErrorMessages()}">
+ <li>
+ <i18n:text>
+ <jx:out value="${message}"/>
+ </i18n:text>
+ </li>
+ </jx:forEach>
+ <jx:forEach var="missingDocument" items="${usecase.getParameter('missingDocuments')}">
+ <li>
+ <a href="${request.getContextPath() + missingDocument.getCanonicalWebappURL()}"><jx:out value="${missingDocument.getId()}"/> [<jx:out value="${missingDocument.getLanguage()}"/>]</a>
+ </li>
+ </jx:forEach>
+ <jx:forEach var="message" items="${usecase.getInfoMessages()}">
+ <li>
+ <i18n:text>
+ <jx:out value="${message}"/>
+ </i18n:text>
+ </li>
+ </jx:forEach>
+ </ul>
+ </td>
+ </tr>
+ <tr>
+ <td/>
+ <td>
+ <jx:choose>
+ <jx:when test="${usecase.getParameter('allowSingleDocument').equals('false')}">
+ <input type="checkbox" checked="checked" disabled="disabled"/>
+ <input name="subtree" type="hidden" value="on"/>
+ </jx:when>
+ <jx:when test="${usecase.getParameter('subtree') == null}">
+ <input name="subtree" type="checkbox"/>
+ </jx:when>
+ <jx:otherwise>
+ <input name="subtree" type="checkbox" checked="checked"/>
+ </jx:otherwise>
+ </jx:choose>
+ <i18n:text>publish complete subtree</i18n:text>
+ </td>
+ </tr>
+ <tr>
+ <td><i18n:text>Schedule</i18n:text>:</td>
+ <td>
+ <input type="checkbox" name="schedule"/>
+ <input type="text" name="schedule.time" value="${usecase.getParameter('schedule.time')}"/>
+ </td>
+ </tr>
<tr>
<td/>
<td>
@@ -96,10 +96,10 @@
 
<input i18n:attr="value" type="submit" name="cancel" value="Cancel"/>
</td>
- </tr>
- </table>
- </form>
- </div>
- </div>
- </page:body>
-</page:page>
+ </tr>
+ </table>
+ </form>
+ </div>
+ </div>
+ </page:body>
+</page:page>
Propchange: lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/publish.jx
------------------------------------------------------------------------------
svn:keywords = Id
Modified: lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/reject.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/reject.jx?rev=164785&r1=164784&r2=164785&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/reject.jx (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/reject.jx Tue Apr 26 06:19:24 2005
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
<!--
- Copyright 1999-2004 The Apache Software Foundation
+ Copyright 1999-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -13,68 +13,51 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--->
-
-<!-- $Id: login.jx 123986 2005-01-03 15:23:11Z andreas $ -->
-
-<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" >
-
- <page:title><i18n:text>Reject Document</i18n:text></page:title>
- <page:body>
- <div class="lenya-box">
- <div class="lenya-box-title">
+-->
+
+<!-- $Id$ -->
+
+<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" >
+
+ <page:title><i18n:text>Reject Document</i18n:text></page:title>
+ <page:body>
+ <div class="lenya-box">
+ <div class="lenya-box-title">
<i18n:translate>
<i18n:text i18n:key="reject-doc"/>
<i18n:param><jx:out value="${usecase.getParameter('document').getId()}"/></i18n:param>
- </i18n:translate>
- </div>
- <div class="lenya-box-body">
- <form>
- <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
- <input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
- <table class="lenya-table-noborder">
- <tr>
- <td colspan="2">
- <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>
- </td>
- </tr>
- <tr>
- <td colspan="2" class="lenya-entry-caption">
+ </i18n:translate>
+ </div>
+
+ <jx:import uri="templates/messages.jx"/>
+
+ <div class="lenya-box-body">
+ <form>
+ <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
+ <input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
+ <table class="lenya-table-noborder">
+ <tr>
+ <td colspan="2" class="lenya-entry-caption">
<i18n:translate>
<i18n:text i18n:key="reject-doc?"/>
<i18n:param><jx:out value="${usecase.getParameter('document').getId()}"/></i18n:param>
- </i18n:translate>
- </td>
- </tr>
- <tr>
- <td/>
- <td>
- <input i18n:attr="value" type="submit" name="submit" value="Reject"/>
-  
- <input i18n:attr="value" type="submit" name="cancel" value="Cancel"/>
- </td>
- </tr>
- </table>
- </form>
- </div>
- </div>
- </page:body>
-</page:page>
+ </i18n:translate>
+ </td>
+ </tr>
+ <tr>
+ <td/>
+ <td>
+ <input i18n:attr="value" type="submit" name="submit" value="Reject"/>
+  
+ <input i18n:attr="value" type="submit" name="cancel" value="Cancel"/>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+ </div>
+ </page:body>
+</page:page>
Propchange: lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/reject.jx
------------------------------------------------------------------------------
svn:keywords = Id
Modified: lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/submit.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/submit.jx?rev=164785&r1=164784&r2=164785&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/submit.jx (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/submit.jx Tue Apr 26 06:19:24 2005
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
<!--
- Copyright 1999-2004 The Apache Software Foundation
+ Copyright 1999-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -13,68 +13,51 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--->
-
-<!-- $Id: login.jx 123986 2005-01-03 15:23:11Z andreas $ -->
-
-<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" >
-
- <page:title><i18n:text>Submit Document</i18n:text></page:title>
- <page:body>
- <div class="lenya-box">
- <div class="lenya-box-title">
+-->
+
+<!-- $Id$ -->
+
+<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" >
+
+ <page:title><i18n:text>Submit Document</i18n:text></page:title>
+ <page:body>
+ <div class="lenya-box">
+ <div class="lenya-box-title">
<i18n:translate>
<i18n:text i18n:key="submit-for-approval"/>
<i18n:param><jx:out value="${usecase.getParameter('document').getId()}"/></i18n:param>
- </i18n:translate>
- </div>
- <div class="lenya-box-body">
- <form>
- <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
- <input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
- <table class="lenya-table-noborder">
- <tr>
- <td colspan="2">
- <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>
- </td>
- </tr>
- <tr>
- <td colspan="2" class="lenya-entry-caption">
+ </i18n:translate>
+ </div>
+
+ <jx:import uri="templates/messages.jx"/>
+
+ <div class="lenya-box-body">
+ <form>
+ <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
+ <input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
+ <table class="lenya-table-noborder">
+ <tr>
+ <td colspan="2" class="lenya-entry-caption">
<i18n:translate>
<i18n:text i18n:key="submit-for-approval?"/>
<i18n:param><jx:out value="${usecase.getParameter('document').getId()}"/></i18n:param>
- </i18n:translate>
- </td>
- </tr>
- <tr>
- <td/>
- <td>
- <input i18n:attr="value" type="submit" name="submit" value="Submit"/>
-  
- <input i18n:attr="value" type="submit" name="cancel" value="Cancel"/>
- </td>
- </tr>
- </table>
- </form>
- </div>
- </div>
- </page:body>
-</page:page>
+ </i18n:translate>
+ </td>
+ </tr>
+ <tr>
+ <td/>
+ <td>
+ <input i18n:attr="value" type="submit" name="submit" value="Submit"/>
+  
+ <input i18n:attr="value" type="submit" name="cancel" value="Cancel"/>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+ </div>
+ </page:body>
+</page:page>
Propchange: lenya/trunk/src/webapp/lenya/pubs/default/lenya/usecases/workflow/submit.jx
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org