Update of
/var/cvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/workflow
In directory
james.mmbase.org:/tmp/cvs-serv32710/workflow/src/webapp/editors/workflow
Modified Files:
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: workflow.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- workflow.jsp 10 Nov 2008 03:25:30 -0000 1.15
+++ workflow.jsp 18 Nov 2008 01:44:57 -0000 1.16
@@ -1,52 +1,195 @@
<[EMAIL PROTECTED] id="status" type="String"--%>
-<%@ page import="com.finalist.cmsc.workflow.forms.Utils" %>
-<%@ page import="static com.finalist.cmsc.workflow.forms.Utils.tabClass" %>
-<%@ page language="java" contentType="text/html;charset=UTF-8" %>
-<%@ include file="globals.jsp" %>
+<%@ page import="com.finalist.cmsc.workflow.forms.Utils"%>
+<%@ page import="static com.finalist.cmsc.workflow.forms.Utils.tabClass"%>
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ include file="globals.jsp"%>
<mm:content type="text/html" encoding="UTF-8" expires="0">
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html:html xhtml="true">
-<cmscedit:head title="workflow.module.title">
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+ <html:html xhtml="true">
+ <cmscedit:head title="workflow.module.title">
<script src="workflow.js" type="text/javascript"></script>
- <link href="../css/workflow.css" rel="stylesheet" type="text/css"/>
+ <link href="../css/workflow.css" rel="stylesheet"
type="text/css" />
<script type="text/javascript">
function info(objectNumber) {
openPopupWindow("info", 500, 500,
"../repository/showitem.jsp?objectnumber=" + objectNumber);
}
+ var treeHandler = {
+ toggle : function (oItem) {
+ var parentTableId = oItem.id.replace('-plus', '');
+ var originImgSrc = oItem.src;
+ if(originImgSrc.toLowerCase().indexOf('plus.png')>=0){
+ oItem.src = originImgSrc.replace('plus', 'minus');
+ document.getElementById(parentTableId + '-cont').style.display =
'block';
+ }else{
+ oItem.src = originImgSrc.replace('minus', 'plus');
+ document.getElementById(parentTableId + '-cont').style.display =
'none';
+ }
+ }
+};
</script>
-</cmscedit:head>
+ </cmscedit:head>
-<body>
+ <body>
-<div id="left">
- <cmscedit:sideblock title="workflow.status.header">
- <mm:import externid="statusInfo" required="true"/>
+ <div id="left"><cmscedit:sideblock title="workflow.status.header">
+ <mm:import externid="statusInfo" required="true" />
<table class="centerData">
<thead>
<tr>
<th></th>
- <th><fmt:message key="workflow.status.draft"/></th>
- <th><fmt:message key="workflow.status.finished"/></th>
+ <th><fmt:message
key="workflow.status.draft" /></th>
+ <th><fmt:message
key="workflow.status.finished" /></th>
<c:if test="${acceptedEnabled}">
- <th><fmt:message key="workflow.status.approved"/></th>
+ <th><fmt:message
key="workflow.status.approved" /></th>
</c:if>
- <th><fmt:message key="workflow.status.published"/></th>
+ <th><fmt:message
key="workflow.status.published" /></th>
</tr>
</thead>
<tbody>
<tr>
- <td><fmt:message key="workflow.status.content"/></td>
+ <td colspan="5">
+ <table class="centerData"
id="tree_table">
+ <tbody>
+ <tr>
+ <td>
+ <table
class="centerData" id="tree-allcontent">
+ <tbody>
+
<tr>
+
<td class="leftData">
+
<img id="tree-allcontent-plus" onclick="treeHandler.toggle(this);"
src="../utils/ajaxtree/images/minus.png"/>
+
<fmt:message
+
key="workflow.status.allcontent" /></td>
+
<td><a
href="AllcontentWorkflowAction.do?status=draft">${statusInfo.allcontentDraft}</a></td>
+
<td><a
+
href="AllcontentWorkflowAction.do?status=finished">${statusInfo.allcontentFinished}</a></td>
+
<c:if test="${acceptedEnabled}">
+
<td><a
+
href="AllcontentWorkflowAction.do?status=approved">${statusInfo.allcontentApproved}</a></td>
+
</c:if>
+
<td><a
+
href="AllcontentWorkflowAction.do?status=published">${statusInfo.allcontentPublished}</a></td>
+
</tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="5">
+ <table
class="centerData" id="tree-allcontent-cont">
+ <tbody>
+
<tr>
+
<td>
+
<table class="centerData" id="tree-content">
+
<tbody>
+
<tr>
+
<td class="leftData">
+
<span> </span>
+<img id="tree-content-plus" onclick="treeHandler.toggle(this);"
src="../utils/ajaxtree/images/Tminus.png"/>
+
<fmt:message
+
key="workflow.status.content" /></td>
<td><a
href="ContentWorkflowAction.do?status=draft">${statusInfo.contentDraft}</a></td>
- <td><a
href="ContentWorkflowAction.do?status=finished">${statusInfo.contentFinished}</a></td>
+
<td><a
+
href="ContentWorkflowAction.do?status=finished">${statusInfo.contentFinished}</a></td>
+
<c:if test="${acceptedEnabled}">
+
<td><a
+
href="ContentWorkflowAction.do?status=approved">${statusInfo.contentApproved}</a></td>
+
</c:if>
+
<td><a
+
href="ContentWorkflowAction.do?status=published">${statusInfo.contentPublished}</a></td>
+
</tr>
+
</tbody>
+
</table>
+
</td>
+
</tr>
+
<tr>
+
<td colspan="5">
+
<table class="centerData" id="tree-content-cont">
+
<tbody>
+
<tr>
+
<td class="leftData">
+
<span> </span>
+<img src="../utils/ajaxtree/images/I.png"/>
+<img src="../utils/ajaxtree/images/T.png"/>
+
<fmt:message
+
key="workflow.status.content.article"
/></td>
+
<td><a
+
href="ContentWorkflowAction.do?workflowNodetype=article&status=draft">${statusInfo.contentArticleDraft}</a></td>
+
<td><a
+
href="ContentWorkflowAction.do?workflowNodetype=article&status=finished">${statusInfo.contentArticleFinished}</a></td>
+
<c:if test="${acceptedEnabled}">
+
<td><a
+
href="ContentWorkflowAction.do?workflowNodetype=article&status=approved">${statusInfo.contentArticleApproved}</a></td>
+
</c:if>
+
<td><a
+
href="ContentWorkflowAction.do?workflowNodetype=article&status=published">${statusInfo.contentArticlePublished}</a></td>
+
</tr>
+
<tr>
+
<td class="leftData">
+
<span> </span>
+<img src="../utils/ajaxtree/images/I.png"/>
+<img src="../utils/ajaxtree/images/T.png"/>
+
<fmt:message
+
key="workflow.status.content.banners"
/></td>
+
<td><a
+
href="ContentWorkflowAction.do?workflowNodetype=banners&status=draft">${statusInfo.contentBannersDraft}</a></td>
+
<td><a
+
href="ContentWorkflowAction.do?workflowNodetype=banners&status=finished">${statusInfo.contentBannersFinished}</a></td>
+
<c:if test="${acceptedEnabled}">
+
<td><a
+
href="ContentWorkflowAction.do?workflowNodetype=banners&status=approved">${statusInfo.contentBannersApproved}</a></td>
+
</c:if>
+
<td><a
+
href="ContentWorkflowAction.do?workflowNodetype=banners&status=published">${statusInfo.contentBannersPublished}</a></td>
+
</tr>
+
<tr>
+
<td class="leftData">
+
<span> </span><img
src="../utils/ajaxtree/images/I.png"/><img
src="../utils/ajaxtree/images/T.png"/>
+
<fmt:message key="workflow.status.content.link"
/></td>
+
<td><a
+
href="ContentWorkflowAction.do?workflowNodetype=link&status=draft">${statusInfo.contentLinkDraft}</a></td>
+
<td><a
+
href="ContentWorkflowAction.do?workflowNodetype=link&status=finished">${statusInfo.contentLinkFinished}</a></td>
<c:if test="${acceptedEnabled}">
- <td><a
href="ContentWorkflowAction.do?status=approved">${statusInfo.contentApproved}</a></td>
+
<td><a
+
href="ContentWorkflowAction.do?workflowNodetype=link&status=approved">${statusInfo.contentLinkApproved}</a></td>
</c:if>
- <td><a
href="ContentWorkflowAction.do?status=published">${statusInfo.contentPublished}</a></td>
+
<td><a
+
href="ContentWorkflowAction.do?workflowNodetype=link&status=published">${statusInfo.contentLinkPublished}</a></td>
</tr>
<tr>
- <td><fmt:message key="workflow.status.asset"/></td>
+
<td class="leftData">
+
<span> </span>
+<img src="../utils/ajaxtree/images/I.png"/>
+<img src="../utils/ajaxtree/images/L.png"/>
+
<fmt:message
+
key="workflow.status.content.faqitem"
/></td>
+
<td><a
+
href="ContentWorkflowAction.do?workflowNodetype=faqitem&status=draft">${statusInfo.contentFaqitemDraft}</a></td>
+
<td><a
+
href="ContentWorkflowAction.do?workflowNodetype=faqitem&status=finished">${statusInfo.contentFaqitemFinished}</a></td>
+
<c:if test="${acceptedEnabled}">
+
<td><a
+
href="ContentWorkflowAction.do?workflowNodetype=faqitem&status=approved">${statusInfo.contentFaqitemApproved}</a></td>
+
</c:if>
+
<td><a
+
href="ContentWorkflowAction.do?workflowNodetype=faqitem&status=published">${statusInfo.contentFaqitemPublished}</a></td>
+
</tr>
+
</tbody>
+
</table>
+
</td>
+
</tr>
+
<tr>
+
<td>
+
<table class="centerData" id="tree-asset">
+
<tbody>
+
<tr>
+
<td class="leftData">
+
<span> </span>
+<img id="tree-asset-plus" onclick="treeHandler.toggle(this);"
src="../utils/ajaxtree/images/Lminus.png"/>
+
<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}">
@@ -54,8 +197,80 @@
</c:if>
<td><a
href="AssetWorkflowAction.do?status=published">${statusInfo.assetPublished}</a></td>
</tr>
+
</tbody>
+
</table>
+
+
</td>
+
</tr>
+
<tr>
+
<td colspan="5">
+
<table class="centerData" id="tree-asset-cont">
+
<tbody>
+
<tr>
+
<td class="leftData">
+
<span> </span>
+<span> </span>
+<img src="../utils/ajaxtree/images/T.png"/>
+
<fmt:message
+
key="workflow.status.asset.images"
/></td>
+
<td><a
+
href="AssetWorkflowAction.do?workflowNodetype=images&status=draft">${statusInfo.assetImagesDraft}</a></td>
+
<td><a
+
href="AssetWorkflowAction.do?workflowNodetype=images&status=finished">${statusInfo.assetImagesFinished}</a></td>
+
<c:if test="${acceptedEnabled}">
+
<td><a
+
href="AssetWorkflowAction.do?workflowNodetype=images&status=approved">${statusInfo.assetImagesApproved}</a></td>
+
</c:if>
+
<td><a
+
href="AssetWorkflowAction.do?workflowNodetype=images&status=published">${statusInfo.assetImagesPublished}</a></td>
+
</tr>
+
<tr>
+
<td class="leftData">
+
<span> </span><span> </span><img
src="../utils/ajaxtree/images/T.png"/>
+
<fmt:message
key="workflow.status.asset.attachments" /></td>
+
<td><a
+
href="AssetWorkflowAction.do?workflowNodetype=attachments&status=draft">${statusInfo.assetAttachmentsDraft}</a></td>
+
<td><a
+
href="AssetWorkflowAction.do?workflowNodetype=attachments&status=finished">${statusInfo.assetAttachmentsFinished}</a></td>
+
<c:if test="${acceptedEnabled}">
+
<td><a
+
href="AssetWorkflowAction.do?workflowNodetype=attachments&status=approved">${statusInfo.assetAttachmentsApproved}</a></td>
+
</c:if>
+
<td><a
+
href="AssetWorkflowAction.do?workflowNodetype=attachments&status=published">${statusInfo.assetAttachmentsPublished}</a></td>
+
</tr>
+
<tr>
+
<td class="leftData">
+
<span> </span>
+<span> </span>
+<img src="../utils/ajaxtree/images/L.png"/>
+
<fmt:message
+
key="workflow.status.asset.urls" /></td>
+
<td><a
+
href="AssetWorkflowAction.do?workflowNodetype=urls&status=draft">${statusInfo.assetUrlsDraft}</a></td>
+
<td><a
+
href="AssetWorkflowAction.do?workflowNodetype=urls&status=finished">${statusInfo.assetUrlsFinished}</a></td>
+
<c:if test="${acceptedEnabled}">
+
<td><a
+
href="AssetWorkflowAction.do?workflowNodetype=urls&status=approved">${statusInfo.assetUrlsApproved}</a></td>
+
</c:if>
+
<td><a
+
href="AssetWorkflowAction.do?workflowNodetype=urls&status=published">${statusInfo.assetUrlsPublished}</a></td>
+
</tr>
+
</tbody>
+
</table>
+
</td>
+
</tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
<tr>
- <td><fmt:message key="workflow.status.page"/></td>
+ <td class="leftData"><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>
<c:if test="${acceptedEnabled}">
@@ -64,7 +279,7 @@
<td><a
href="PageWorkflowAction.do?status=published">${statusInfo.pagePublished}</a></td>
</tr>
<tr>
- <td><fmt:message key="workflow.status.link"/></td>
+ <td class="leftData"><fmt:message
key="workflow.status.link" /></td>
<td></td>
<td><a
href="LinkWorkflowAction.do?status=finished">${statusInfo.linkFinished}</a></td>
<c:if test="${acceptedEnabled}">
@@ -74,54 +289,47 @@
</tr>
</tbody>
</table>
- </cmscedit:sideblock>
-</div>
+ </cmscedit:sideblock></div>
-<div id="content">
-<mm:cloud jspvar="cloud" loginpage="login.jsp">
-<mm:import externid="status">draft</mm:import>
-<mm:import externid="results" jspvar="nodeList" vartype="List"/>
+ <div id="content"><mm:cloud jspvar="cloud" loginpage="login.jsp">
+ <mm:import externid="status">draft</mm:import>
+ <mm:import externid="results" jspvar="nodeList" vartype="List"
/>
-<div class="content">
+ <div class="content">
<div class="tabs" id="${status}">
<div class="<%=tabClass(pageContext,"draft")%>">
<div class="body">
- <div>
- <a href="#" onclick="selectTab('draft');"><fmt:message
key="workflow.tab.draft"/></a>
- </div>
+ <div><a href="#" onclick="selectTab('draft');"><fmt:message
+ key="workflow.tab.draft" /></a></div>
</div>
</div>
<div class="<%=tabClass(pageContext,"finished")%>">
<div class="body">
- <div>
- <a href="#" onclick="selectTab('finished');"><fmt:message
key="workflow.tab.finished"/></a>
- </div>
+ <div><a href="#" onclick="selectTab('finished');"><fmt:message
+ key="workflow.tab.finished" /></a></div>
</div>
</div>
<c:if test="${acceptedEnabled}">
<div class="<%=tabClass(pageContext,"approved")%>">
<div class="body">
- <div>
- <a href="#" onclick="selectTab('approved');"><fmt:message
key="workflow.tab.approved"/></a>
- </div>
+ <div><a href="#"
onclick="selectTab('approved');"><fmt:message
+ key="workflow.tab.approved" /></a></div>
</div>
</div>
</c:if>
<div class="<%=tabClass(pageContext,"published")%>">
<div class="body">
- <div>
- <a href="#" onclick="selectTab('published');"><fmt:message
key="workflow.tab.published"/></a>
+ <div><a href="#" onclick="selectTab('published');"><fmt:message
+ key="workflow.tab.published" /></a></div>
</div>
</div>
</div>
</div>
-</div>
-<div class="editor">
-<c:if test="${not empty errors}">
- <mm:import externid="errors" vartype="List"/>
+ <div class="editor"><c:if test="${not empty errors}">
+ <mm:import externid="errors" vartype="List" />
<div class="messagebox_red">
<div class="box">
@@ -129,33 +337,33 @@
<div></div>
</div>
<div class="body">
- <p><fmt:message key="workflow.publish.failed"/></p>
+ <p><fmt:message key="workflow.publish.failed" /></p>
<table>
<thead>
<tr>
- <th><fmt:message key="workflow.content.type"/></th>
- <th><fmt:message key="workflow.title"/></th>
- <th><fmt:message key="workflow.lastmodifier"/></th>
- <th><fmt:message key="workflow.lastmodifieddate"/></th>
+ <th><fmt:message
key="workflow.content.type" /></th>
+ <th><fmt:message
key="workflow.title" /></th>
+ <th><fmt:message
key="workflow.lastmodifier" /></th>
+ <th><fmt:message
key="workflow.lastmodifieddate" /></th>
</tr>
</thead>
<tbody>
<mm:listnodes referid="errors">
<tr>
- <td><mm:nodeinfo type="guitype"/></td>
- <td>
- <mm:hasfield name="title"> <mm:field name="title"/>
</mm:hasfield>
- <mm:hasfield name="name"> <mm:field name="name"/>
</mm:hasfield>
- </td>
- <td>
- <mm:hasfield name="lastmodifier"> <mm:field
name="lastmodifier"/> </mm:hasfield>
- </td>
- <td>
- <mm:hasfield name="lastmodifieddate">
+ <td><mm:nodeinfo
type="guitype" /></td>
+ <td><mm:hasfield
name="title">
+ <mm:field
name="title" />
+ </mm:hasfield>
<mm:hasfield name="name">
+ <mm:field
name="name" />
+ </mm:hasfield></td>
+ <td><mm:hasfield
name="lastmodifier">
+ <mm:field
name="lastmodifier" />
+ </mm:hasfield></td>
+ <td><mm:hasfield
name="lastmodifieddate">
<mm:field name="lastmodifieddate">
- <cmsc:dateformat
displaytime="true"/></mm:field>
- </mm:hasfield>
- </td>
+
<cmsc:dateformat displaytime="true" />
+ </mm:field>
+ </mm:hasfield></td>
</tr>
</mm:listnodes>
</tbody>
@@ -166,84 +374,110 @@
</div>
</div>
</div>
-</c:if>
-
-<div class="ruler_green">
- <div>
- <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>
- <c:if test="${workflowType == 'page' }">
- <fmt:message key="workflow.title.page"/>
- </c:if>
- </div>
-</div>
-<div class="body" style="display: none;" id="workflow-wait">
- <fmt:message key="workflow.wait"/>
-</div>
-<div class="body" id="workflow-canvas">
- <c:set var="orderby" value="${param.orderby}"/>
+ <div class="ruler_green">
+ <div> <c:if test="${workflowType == 'allcontent' }">
+ <fmt:message key="workflow.title.allcontent" />
+ </c:if><c:if test="${workflowType == 'content' }">
+ <c:choose>
+ <c:when test="${workflowNodetype == 'article'
}">
+ <fmt:message
key="workflow.title.content.article" />
+ </c:when>
+ <c:when test="${workflowNodetype == 'banners'
}">
+ <fmt:message
key="workflow.title.content.banners" />
+ </c:when>
+ <c:when test="${workflowNodetype == 'link' }">
+ <fmt:message
key="workflow.title.content.link" />
+ </c:when>
+ <c:when test="${workflowNodetype == 'faqitem'
}">
+ <fmt:message
key="workflow.title.content.faqitem" />
+ </c:when>
+ <c:otherwise>
+ <fmt:message
key="workflow.title.content" />
+ </c:otherwise>
+ </c:choose>
+
+ </c:if> <c:if test="${workflowType == 'asset' }">
+ <c:choose>
+ <c:when test="${workflowNodetype == 'images' }">
+ <fmt:message
key="workflow.title.asset.images" />
+ </c:when>
+ <c:when test="${workflowNodetype ==
'attachments' }">
+ <fmt:message
key="workflow.title.asset.attachments" />
+ </c:when>
+ <c:when test="${workflowNodetype == 'urls' }">
+ <fmt:message
key="workflow.title.asset.urls" />
+ </c:when>
+ <c:otherwise>
+ <fmt:message key="workflow.title.asset"
/>
+ </c:otherwise>
+ </c:choose>
+ </c:if> <c:if test="${workflowType == 'link' }">
+ <fmt:message key="workflow.title.link" />
+ </c:if> <c:if test="${workflowType == 'page' }">
+ <fmt:message key="workflow.title.page" />
+ </c:if></div>
+ </div>
+
+ <div class="body" style="display: none;"
id="workflow-wait"><fmt:message
+ key="workflow.wait" /></div>
+ <div class="body" id="workflow-canvas"><c:set var="orderby"
+ value="${param.orderby}" />
<form action='?' method="post" onsubmit="return submitValid(false);">
- <input type="hidden" name="orderby" value="${orderby}"/>
- <input type="hidden" name="status" value="${status}"/>
- <input type="hidden" name="laststatus"/>
- <c:set var="lastvalue" value="<%=request.getAttribute("laststatus")%>"/>
-
- <c:set var="resultsPerPage" value="50"/>
- <c:set var="offset" value="${param.offset}"/>
- <c:set var="listSize">${fn:length(nodeList)}</c:set>
+ <input type="hidden" name="orderby" value="${orderby}" /> <input
+ type="hidden" name="status" value="${status}" /> <input
type="hidden"
+ name="laststatus" /> <c:set var="lastvalue"
+ value="<%=request.getAttribute("laststatus")%>" />
<c:set
+ var="resultsPerPage" value="50" /> <c:set var="offset"
+ value="${param.offset}" /> <c:set
var="listSize">${fn:length(nodeList)}</c:set>
<c:if test="${fn:length(results) > 0}">
- <%@ include file="../pages.jsp" %>
- <%@ include file="workflow_list_table_fragment.jsp" %>
- <%@ include file="../pages.jsp" %>
- </c:if>
-
- <c:set var="remark">
- <fmt:message key="workflow.action.reject.remark"/>
- </c:set>
- <input type="checkbox" name="checkAll"
onclick="checkAllElement(this, '')"/> <fmt:message key="workflow.select_all"/>
- <input type="hidden" name="actionvalue" value=""/>
- <input type='hidden' id="remark" name="remark" value="[unchanged-item]"/>
- <br/>
+ <%@ include file="../pages.jsp"%>
+ <%@ include file="workflow_list_table_fragment.jsp"%>
+ <%@ include file="../pages.jsp"%>
+ </c:if> <c:set var="remark">
+ <fmt:message key="workflow.action.reject.remark" />
+ </c:set> <input type="checkbox"
name="checkAll"
+ onclick="checkAllElement(this, '')" /> <fmt:message
+ key="workflow.select_all" /> <input type="hidden"
name="actionvalue"
+ value="" /> <input type='hidden' id="remark"
name="remark"
+ value="[unchanged-item]" /> <br />
<c:if test="${status == 'draft' }">
- <input name="action" value="<fmt:message key="workflow.action.finish"
/>"
- onclick="return setActionValue('finish')"
- type="submit"/>
- </c:if>
- <c:if test="${status == 'finished' }">
- <input name="action" value="<fmt:message key="workflow.action.reject"
/>"
- onclick="return setActionValue('reject','','${remark}')"
type="submit"/>
- <c:if test="${acceptedEnabled}">
- <input name="action" value="<fmt:message
key="workflow.action.accept" />"
- onclick="return setActionValue('accept')" type="submit"/>
- </c:if>
- <input name="action" value="<fmt:message
key="workflow.action.publish" />"
- onclick="return setActionValue('publish')" type="submit"/>
- </c:if>
- <c:if test="${status == 'approved' }">
- <input name="action" value="<fmt:message key="workflow.action.reject"
/>"
- onclick="return setActionValue('reject','','${remark}')"
type="submit"/>
- <input name="action" value="<fmt:message
key="workflow.action.publish" />"
- onclick="return setActionValue('publish')" type="submit"/>
- </c:if>
- <c:if test="${status == 'published' }">
- <input name="action" value="<fmt:message key="workflow.action.reject"
/>"
- onclick="return setActionValue('reject','','${remark}')"
type="submit"/>
- </c:if>
- </form>
-
-</div>
-</div>
-</mm:cloud>
-</div>
-</body>
-</html:html>
+ <input name="action"
+ value="<fmt:message
key="workflow.action.finish" />"
+ onclick="return setActionValue('finish')"
type="submit" />
+ </c:if> <c:if test="${status == 'finished' }">
+ <input name="action"
+ value="<fmt:message
key="workflow.action.reject" />"
+ onclick="return
setActionValue('reject','','${remark}')"
+ type="submit" />
+ <c:if test="${acceptedEnabled}">
+ <input name="action"
+ value="<fmt:message
key="workflow.action.accept" />"
+ onclick="return
setActionValue('accept')" type="submit" />
+ </c:if>
+ <input name="action"
+ value="<fmt:message
key="workflow.action.publish" />"
+ onclick="return setActionValue('publish')"
type="submit" />
+ </c:if> <c:if test="${status == 'approved' }">
+ <input name="action"
+ value="<fmt:message
key="workflow.action.reject" />"
+ onclick="return
setActionValue('reject','','${remark}')"
+ type="submit" />
+ <input name="action"
+ value="<fmt:message
key="workflow.action.publish" />"
+ onclick="return setActionValue('publish')"
type="submit" />
+ </c:if> <c:if test="${status == 'published' }">
+ <input name="action"
+ value="<fmt:message
key="workflow.action.reject" />"
+ onclick="return
setActionValue('reject','','${remark}')"
+ type="submit" />
+ </c:if></form>
+
+ </div>
+ </div>
+ </mm:cloud></div>
+ </body>
+ </html:html>
</mm:content>
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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- workflow_list_table_fragment.jsp 10 Nov 2008 03:25:30 -0000 1.15
+++ workflow_list_table_fragment.jsp 18 Nov 2008 01:44:57 -0000 1.16
@@ -26,7 +26,7 @@
<fmt:message key="workflow.lastmodifier"/>
</a>
</th>
- <c:if test="${workflowType == 'page' || workflowType == 'content' ||
workflowType == 'asset'}">
+ <c:if test="${workflowType == 'page' || workflowType == 'content' ||
workflowType == 'asset' || workflowType == 'allcontent'}">
<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' || workflowType == 'asset' }">
+ <c:if test="${workflowType == 'content' || workflowType == 'asset' ||
workflowType == 'allcontent'}">
<th style="width: 140px;">
<a href="#" <%=onClickandStyle(pageContext, "contentchannel")%>>
<fmt:message key="workflow.contentchannel"/>
@@ -60,6 +60,13 @@
<input type="checkbox" name="check_${workflowNumber}" value="on"/>
</td>
+ <c:if test="${workflowType == 'allcontent' }">
+ <mm:field name="workflowitem.type" id="itemType" write="false"/>
+ <c:if test="${itemType == 'content' }"><c:set var="type"
value="contentelement"/></c:if>
+ <c:if test="${itemType == 'asset' }"><c:set var="type"
value="assetelement"/></c:if>
+ <c:set var="field" value="title"/>
+ <c:set var="returnAction" value="AllcontentWorkflowAction.do"/>
+ </c:if>
<c:if test="${workflowType == 'content' }">
<c:set var="type" value="contentelement"/>
<c:set var="field" value="title"/>
@@ -105,7 +112,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' || type == 'assetelement'}">
+ <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"/>"/>
@@ -143,7 +150,7 @@
<td style="white-space: nowrap;">
<mm:field name="workflowitem.lastmodifier"/>
</td>
- <c:if test="${workflowType == 'page' || workflowType == 'content' ||
workflowType == 'asset' }">
+ <c:if test="${workflowType == 'page' || workflowType == 'content' ||
workflowType == 'asset' || workflowType == 'allcontent'}">
<td style="white-space: nowrap;">
<mm:field name="${type}.lastmodifieddate"><cmsc:dateformat
displaytime="true"/></mm:field>
</td>
@@ -151,7 +158,7 @@
<td style="white-space: nowrap;">
${number}
</td>
- <c:if test="${workflowType == 'content' || workflowType == 'asset' }">
+ <c:if test="${workflowType == 'content' || workflowType == 'asset' ||
workflowType == 'allcontent'}">
<td style="white-space: nowrap;">
<mm:field name="contentchannel.name"/>
</td>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
