Update of
/var/cvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/workflow
In directory james.mmbase.org:/tmp/cvs-serv28961
Modified Files:
index.jsp workflow.jsp workflow_list_table_fragment.jsp
Log Message:
CMSC-1087 (changes the status box of a page to a dynamic tree in the Workflow
section of the CMSc)
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/workflow
See also: http://www.mmbase.org/jira/browse/CMSC-1087
Index: index.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/workflow/index.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- index.jsp 12 Dec 2006 09:42:32 -0000 1.1
+++ index.jsp 10 Nov 2008 03:25:30 -0000 1.2
@@ -12,6 +12,9 @@
if ("content".equals(type)) {
redirectTo = "ContentWorkflowAction.do";
}
+if ("asset".equals(type)) {
+ redirectTo = "AssetWorkflowAction.do";
+}
if ("link".equals(type)) {
redirectTo = "LinkWorkflowAction.do";
}
Index: workflow.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- workflow.jsp 7 Mar 2008 15:16:01 -0000 1.14
+++ workflow.jsp 10 Nov 2008 03:25:30 -0000 1.15
@@ -46,6 +46,15 @@
<td><a
href="ContentWorkflowAction.do?status=published">${statusInfo.contentPublished}</a></td>
</tr>
<tr>
+ <td><fmt:message key="workflow.status.asset"/></td>
+ <td><a
href="AssetWorkflowAction.do?status=draft">${statusInfo.assetDraft}</a></td>
+ <td><a
href="AssetWorkflowAction.do?status=finished">${statusInfo.assetFinished}</a></td>
+ <c:if test="${acceptedEnabled}">
+ <td><a
href="AssetWorkflowAction.do?status=approved">${statusInfo.assetApproved}</a></td>
+ </c:if>
+ <td><a
href="AssetWorkflowAction.do?status=published">${statusInfo.assetPublished}</a></td>
+ </tr>
+ <tr>
<td><fmt:message key="workflow.status.page"/></td>
<td><a
href="PageWorkflowAction.do?status=draft">${statusInfo.pageDraft}</a></td>
<td><a
href="PageWorkflowAction.do?status=finished">${statusInfo.pageFinished}</a></td>
@@ -164,6 +173,9 @@
<c:if test="${workflowType == 'content' }">
<fmt:message key="workflow.title.content"/>
</c:if>
+ <c:if test="${workflowType == 'asset' }">
+ <fmt:message key="workflow.title.asset"/>
+ </c:if>
<c:if test="${workflowType == 'link' }">
<fmt:message key="workflow.title.link"/>
</c:if>
Index: workflow_list_table_fragment.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow_list_table_fragment.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- workflow_list_table_fragment.jsp 8 Oct 2008 09:30:51 -0000 1.14
+++ workflow_list_table_fragment.jsp 10 Nov 2008 03:25:30 -0000 1.15
@@ -26,7 +26,7 @@
<fmt:message key="workflow.lastmodifier"/>
</a>
</th>
- <c:if test="${workflowType == 'page' || workflowType == 'content' }">
+ <c:if test="${workflowType == 'page' || workflowType == 'content' ||
workflowType == 'asset'}">
<th style="width: 140px;">
<a href="#" <%=onClickandStyle(pageContext, "lastmodifieddate")%>>
<fmt:message key="workflow.lastmodifieddate"/>
@@ -38,7 +38,7 @@
<fmt:message key="workflow.number"/>
</a>
</th>
- <c:if test="${workflowType == 'content' }">
+ <c:if test="${workflowType == 'content' || workflowType == 'asset' }">
<th style="width: 140px;">
<a href="#" <%=onClickandStyle(pageContext, "contentchannel")%>>
<fmt:message key="workflow.contentchannel"/>
@@ -65,6 +65,11 @@
<c:set var="field" value="title"/>
<c:set var="returnAction" value="ContentWorkflowAction.do"/>
</c:if>
+ <c:if test="${workflowType == 'asset' }">
+ <c:set var="type" value="assetelement"/>
+ <c:set var="field" value="title"/>
+ <c:set var="returnAction" value="AssetWorkflowAction.do"/>
+ </c:if>
<c:if test="${workflowType == 'link' }">
<c:set var="type" value="contentchannel"/>
<c:set var="field" value="name"/>
@@ -100,7 +105,7 @@
<img src="../gfx/icons/edit.png" align="top" alt="<fmt:message
key="workflow.editelement"/>"
title="<fmt:message key="workflow.editelement"/>"/>
</a>
- <c:if test="${type == 'contentelement'}">
+ <c:if test="${type == 'contentelement' || type == 'assetelement'}">
<a href="<cmsc:contenturl number="${number}"/>" target="_blank">
<img src="../gfx/icons/preview.png" alt="<fmt:message
key="workflow.preview.title"/>"
title="<fmt:message key="workflow.preview.title"/>"/>
@@ -138,7 +143,7 @@
<td style="white-space: nowrap;">
<mm:field name="workflowitem.lastmodifier"/>
</td>
- <c:if test="${workflowType == 'page' || workflowType == 'content' }">
+ <c:if test="${workflowType == 'page' || workflowType == 'content' ||
workflowType == 'asset' }">
<td style="white-space: nowrap;">
<mm:field name="${type}.lastmodifieddate"><cmsc:dateformat
displaytime="true"/></mm:field>
</td>
@@ -146,7 +151,7 @@
<td style="white-space: nowrap;">
${number}
</td>
- <c:if test="${workflowType == 'content' }">
+ <c:if test="${workflowType == 'content' || workflowType == 'asset' }">
<td style="white-space: nowrap;">
<mm:field name="contentchannel.name"/>
</td>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
