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 2006/11/29 19:39:35 UTC
svn commit: r480672 - in /lenya/trunk/src/modules-core/workflow-impl:
config/cocoon-xconf/usecase-workflow-multiWorkflow.xconf
usecases/multiWorkflow.jx
Author: andreas
Date: Wed Nov 29 10:39:34 2006
New Revision: 480672
URL: http://svn.apache.org/viewvc?view=rev&rev=480672
Log:
Workflow overview: show state as text by default, use hierarchical view instead of paths
Modified:
lenya/trunk/src/modules-core/workflow-impl/config/cocoon-xconf/usecase-workflow-multiWorkflow.xconf
lenya/trunk/src/modules-core/workflow-impl/usecases/multiWorkflow.jx
Modified: lenya/trunk/src/modules-core/workflow-impl/config/cocoon-xconf/usecase-workflow-multiWorkflow.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow-impl/config/cocoon-xconf/usecase-workflow-multiWorkflow.xconf?view=diff&rev=480672&r1=480671&r2=480672
==============================================================================
--- lenya/trunk/src/modules-core/workflow-impl/config/cocoon-xconf/usecase-workflow-multiWorkflow.xconf (original)
+++ lenya/trunk/src/modules-core/workflow-impl/config/cocoon-xconf/usecase-workflow-multiWorkflow.xconf Wed Nov 29 10:39:34 2006
@@ -32,5 +32,6 @@
<usecase name="sitemanagement.delete" event="delete"/>
<usecase name="sitemanagement.archive" event="archive"/>
<usecase name="sitemanagement.restore" event="restore"/>
+ <parameter name="style" value="text"/>
</component-instance>
</xconf>
Modified: lenya/trunk/src/modules-core/workflow-impl/usecases/multiWorkflow.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow-impl/usecases/multiWorkflow.jx?view=diff&rev=480672&r1=480671&r2=480672
==============================================================================
--- lenya/trunk/src/modules-core/workflow-impl/usecases/multiWorkflow.jx (original)
+++ lenya/trunk/src/modules-core/workflow-impl/usecases/multiWorkflow.jx Wed Nov 29 10:39:34 2006
@@ -26,7 +26,6 @@
<page:title><i18n:text><jx:out value="${usecase.getName()}"/></i18n:text></page:title>
<page:body>
-
<jx:set var="style" value="${usecase.getParameter('style')}"/>
<form style="display: inline;">
@@ -71,7 +70,15 @@
<jx:forEach var="doc" items="${usecase.getParameter('documents')}">
<tr>
- <td><a href="${request.contextPath}${doc.getUrl()}"><jx:out value="${doc.getPath()}"/></a></td>
+ <jx:set var="path" value="${doc.getPath()}"/>
+ <jx:set var="depth" value="${path.split('/').size() - 2}"/>
+ <jx:set var="whitespace" value="        "/>
+ <jx:set var="indent" value="${whitespace.substring(0, depth.intValue())}"/>
+ <jx:set var="lastSlashIndex" value="${java.lang.Integer.valueOf(path.lastIndexOf('/'))}"/>
+ <jx:set var="nodeName" value="${path.substring(lastSlashIndex.intValue())}"/>
+ <td>
+ <jx:out value="${indent}"/><jx:out value="${indent}"/><jx:out value="${indent}"/><jx:out value="${indent}"/><a href="${request.contextPath}${doc.getUrl()}"><jx:out value="${nodeName}"/></a>
+ </td>
<td><jx:out value="${doc.getLanguage()}"/></td>
<jx:choose>
<jx:when test="${style.equals('text')}">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org