Update of
/var/cvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/workflow
In directory
james.mmbase.org:/tmp/cvs-serv25864/CMSContainer_Modules/workflow/src/webapp/editors/workflow
Modified Files:
workflow_list_table_fragment.jsp
Log Message:
CMSC-899 change list style of newsletter &&workflow
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/workflow
See also: http://www.mmbase.org/jira/browse/CMSC-899
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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- workflow_list_table_fragment.jsp 13 Aug 2008 06:46:11 -0000 1.12
+++ workflow_list_table_fragment.jsp 5 Sep 2008 06:24:50 -0000 1.13
@@ -3,18 +3,23 @@
<table>
<thead>
<tr>
- <th style="width: 20px;"> </th>
+ <th style="width: 20px;" > </th>
<th style="width: 10px;"> </th>
<th style="width: 75px;"> </th>
+ <th style="width: 68px;">
+ <a class="headerlink" href="#" <%=onClickandStyle(pageContext,
"type")%> >
+ <fmt:message key="workflow.type"/>
+ </a>
+ </th>
<th style="width: 300px;" nowrap="true">
<a href="#" <%=onClickandStyle(pageContext, "title")%>>
<fmt:message key="workflow.title"/>
</a>
</th>
- <th style="width: 68px;"><a href="#" <%=onClickandStyle(pageContext,
"type")%>><fmt:message key="workflow.type"/></th>
- <th style="width: 68px;"><a href="#" <%=onClickandStyle(pageContext,
"number")%>><fmt:message key="workflow.number"/></th>
- <th style="width: 50px;">
- <a href="#" <%=onClickandStyle(pageContext, "remark")%>><fmt:message
key="workflow.remark"/></a>
+ <th style="width: 140px;">
+ <a href="#" <%=onClickandStyle(pageContext, "publishdate")%>>
+ <fmt:message key="workflow.publishdate"/>
+ </a>
</th>
<th style="width: 145px;">
<a href="#" <%=onClickandStyle(pageContext, "lastmodifier")%>>
@@ -28,6 +33,11 @@
</a>
</th>
</c:if>
+ <th style="width: 68px;">
+ <a href="#" <%=onClickandStyle(pageContext, "number")%>>
+ <fmt:message key="workflow.number"/>
+ </a>
+ </th>
<c:if test="${workflowType == 'content' }">
<th style="width: 140px;">
<a href="#" <%=onClickandStyle(pageContext, "contentchannel")%>>
@@ -35,10 +45,8 @@
</a>
</th>
</c:if>
- <th style="width: 140px;">
- <a href="#" <%=onClickandStyle(pageContext, "publishdate")%>>
- <fmt:message key="workflow.publishdate"/>
- </a>
+ <th style="width: 50px;">
+ <a href="#" <%=onClickandStyle(pageContext, "remark")%>><fmt:message
key="workflow.remark"/></a>
</th>
</tr>
</thead>
@@ -47,27 +55,27 @@
<mm:list referid="results" max="${resultsPerPage}"
offset="${offset*resultsPerPage}">
<tr <mm:even inverse="true">class="swap"</mm:even>>
-<td>
+ <td>
<mm:field name="workflowitem.number" id="workflowNumber" write="false"/>
<input type="checkbox" name="check_${workflowNumber}" value="on"/>
-</td>
+ </td>
-<c:if test="${workflowType == 'content' }">
+ <c:if test="${workflowType == 'content' }">
<c:set var="type" value="contentelement"/>
<c:set var="field" value="title"/>
<c:set var="returnAction" value="ContentWorkflowAction.do"/>
-</c:if>
-<c:if test="${workflowType == 'link' }">
+ </c:if>
+ <c:if test="${workflowType == 'link' }">
<c:set var="type" value="contentchannel"/>
<c:set var="field" value="name"/>
<c:set var="returnAction" value="LinkWorkflowAction.do"/>
-</c:if>
-<c:if test="${workflowType == 'page' }">
+ </c:if>
+ <c:if test="${workflowType == 'page' }">
<c:set var="type" value="page"/>
<c:set var="field" value="title"/>
<c:set var="returnAction" value="PageWorkflowAction.do"/>
-</c:if>
-<td align="left">
+ </c:if>
+ <td align="left">
<mm:node number="${workflowNumber}">
<mm:field name="stacktrace" id="stacktrace" write="false"/>
</mm:node>
@@ -81,18 +89,26 @@
</c:if>
</mm:hasrank>
</mm:haspage>
-</td>
-<td align="left" style="white-space: nowrap;">
+ </td>
+ <td align="left" style="white-space: nowrap;">
<mm:field name="${type}.number" jspvar="number" write="false"/>
- <c:if test="${type == 'contentelement'}">
- <a href="javascript:info('${number}')">
- <img src="../gfx/icons/info.png" title="<fmt:message
key="workflow.info" />"
- alt="<fmt:message key="workflow.info"/>"/>
+ <mm:url page="../WizardInitAction.do" jspvar="url" write="false">
+ <mm:param name="objectnumber" value="${number}"/>
+ <mm:param name="returnurl"
value="workflow/${returnAction}?status=${param.status}"/>
+ </mm:url>
+ <a href="${url}">
+ <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'}">
<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"/>"/>
</a>
+ <a href="javascript:info('${number}')">
+ <img src="../gfx/icons/info.png" title="<fmt:message
key="workflow.info" />"
+ alt="<fmt:message key="workflow.info"/>"/>
+ </a>
<mm:haspage page="/editors/versioning">
<c:url value="/editors/versioning/ShowVersions.do" var="showVersions">
<c:param name="nodenumber">${number}</c:param>
@@ -104,52 +120,45 @@
</a>
</mm:haspage>
</c:if>
- <mm:url page="../WizardInitAction.do" jspvar="url" write="false">
- <mm:param name="objectnumber" value="${number}"/>
- <mm:param name="returnurl"
value="workflow/${returnAction}?status=${param.status}"/>
- </mm:url>
- <a href="${url}">
- <img src="../gfx/icons/edit.png" align="top" alt="<fmt:message
key="workflow.editelement"/>"
- title="<fmt:message key="workflow.editelement"/>"/>
- </a>
-</td>
-<td style="white-space: nowrap;">
+
+ </td>
+ <td style="white-space: nowrap;">
+ <mm:node number="${number}"> <mm:nodeinfo type="guitype"/> </mm:node>
+ </td>
+ <td style="white-space: nowrap;">
<mm:field jspvar="value" write="false" name="${type}.${field}"/>
<c:if test="${fn:length(value) > 50}">
<c:set var="value">${fn:substring(value,0,49)}...</c:set>
</c:if>
${value}
-</td>
-<td style="white-space: nowrap;">
- <mm:node number="${number}"> <mm:nodeinfo type="guitype"/> </mm:node>
-</td>
-<td style="white-space: nowrap;">
+ </td>
+ <td>
+ <mm:field name="${type}.publishdate"><cmsc:dateformat
displaytime="true"/></mm:field>
+ </td>
+ <td style="white-space: nowrap;">
+ <mm:field name="workflowitem.lastmodifier"/>
+ </td>
+ <c:if test="${workflowType == 'page' || workflowType == 'content' }">
+ <td style="white-space: nowrap;">
+ <mm:field name="${type}.lastmodifieddate"><cmsc:dateformat
displaytime="true"/></mm:field>
+ </td>
+ </c:if>
+ <td style="white-space: nowrap;">
${number}
-</td>
-<td>
+ </td>
+ <c:if test="${workflowType == 'content' }">
+ <td style="white-space: nowrap;">
+ <mm:field name="contentchannel.name"/>
+ </td>
+ </c:if>
+ <td>
<mm:field name="workflowitem.remark" escape="none" jspvar="w_remar"
write="false"/>
<a href="javascript:editRemark(${workflowNumber},'${w_remar}')">
<img src="../gfx/icons/edit2.png" align="top" alt="<fmt:message
key="workflow.editremark"/>"
title="<fmt:message key="workflow.editremark"/>"/>
</a>
<mm:field name="workflowitem.remark" escape="none"/>
-</td>
-<td style="white-space: nowrap;">
- <mm:field name="workflowitem.lastmodifier"/>
-</td>
-<c:if test="${workflowType == 'page' || workflowType == 'content' }">
- <td style="white-space: nowrap;">
- <mm:field name="${type}.lastmodifieddate"><cmsc:dateformat
displaytime="true"/></mm:field>
</td>
-</c:if>
-<c:if test="${workflowType == 'content' }">
- <td style="white-space: nowrap;">
- <mm:field name="contentchannel.name"/>
- </td>
-</c:if>
-<td>
- <mm:field name="${type}.publishdate"><cmsc:dateformat
displaytime="true"/></mm:field>
-</td>
</tr>
</mm:list>
</tbody>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
