Update of
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement
In directory
james.mmbase.org:/tmp/cvs-serv6725/tasks/src/webapp/editors/taskmanagement
Modified Files:
tasklist_table.jspf tasklist.jsp
Log Message:
CMSC-1352 Improvements on the Task module
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement
See also: http://www.mmbase.org/jira/browse/CMSC-1352
Index: tasklist_table.jspf
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement/tasklist_table.jspf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tasklist_table.jspf 3 Apr 2009 10:06:26 -0000 1.9
+++ tasklist_table.jspf 7 Apr 2009 12:02:00 -0000 1.10
@@ -6,6 +6,16 @@
<input type="checkbox" name="selectall"
class="checkbox" onclick="selectAll(this.checked, 'taskForm', 'chk_');"
value="on" />
</c:if>
</mm:hasrank></th>
+<c:if test="${empty dashboardTaskSize }">
+ <th><a
href="tasklist.jsp?sortBy=created&direction=${direction}&offset=${offset}"><fmt:message
key="task.created" /></a></th>
+ <th><a
href="tasklist.jsp?sortBy=deadline&direction=${direction}&offset=${offset}"><fmt:message
key="task.deadline" /></a></th>
+ <th><a
href="tasklist.jsp?sortBy=title&direction=${direction}&offset=${offset}"><fmt:message
key="task.title" /></a></th>
+ <th><a
href="tasklist.jsp?sortBy=status&direction=${direction}&offset=${offset}"><fmt:message
key="task.status" /></a></th>
+ <th><a
href="tasklist.jsp?sortBy=contenttitle&direction=${direction}&offset=${offset}"><fmt:message
key="task.contenttitle" /></a></th>
+ <th><a
href="tasklist.jsp?sortBy=nodetype&direction=${direction}&offset=${offset}"><fmt:message
key="task.nodetype" /></a></th>
+ <th><a
href="tasklist.jsp?sortBy=description&direction=${direction}&offset=${offset}"><fmt:message
key="task.description" /></a></th>
+</c:if>
+<c:if test="${!empty dashboardTaskSize }">
<th><fmt:message key="task.created" /></th>
<th><fmt:message key="task.deadline" /></th>
<th><fmt:message key="task.title" /></th>
@@ -13,12 +23,14 @@
<th><fmt:message key="task.contenttitle" /></th>
<th><fmt:message key="task.nodetype" /></th>
<th><fmt:message key="task.description" /></th>
+</c:if>
+
</tr>
</thead>
<tbody class="hover">
<c:set var="taskList" value="" />
<c:set var="isSwapClass" value="true"/>
- <mm:listnodes referid="resultList">
+ <mm:listnodes referid="resultList" max="${resultsPerPage}"
offset="${offset*resultsPerPage}">
<c:set var="taskId"><mm:field name="number"/></c:set>
<tr <c:if test="${isSwapClass}">class="swap"</c:if>>
<td style="white-space: nowrap;">
Index: tasklist.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement/tasklist.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- tasklist.jsp 3 Apr 2009 10:06:26 -0000 1.16
+++ tasklist.jsp 7 Apr 2009 12:02:00 -0000 1.17
@@ -1,4 +1,5 @@
<%...@page language="java" contentType="text/html;charset=UTF-8"
+%><%@ page import="com.finalist.cmsc.mmbase.PropertiesUtil"
%><%...@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";>
@@ -43,6 +44,13 @@
</div>
</div>
+
+<mm:import externid="direction" jspvar="direction">up</mm:import>
+<mm:import externid="sortBy" jspvar="sortBy">title</mm:import>
+<c:set var="direction">
+ <c:out value="${direction =='up'?'down':'up' }"/>
+</c:set>
+
<mm:cloudinfo type="user" id="cloudusername" write="false" />
<mm:listnodescontainer type="user">
<mm:constraint field="user.username" operator="EQUAL"
referid="cloudusername" />
@@ -56,14 +64,20 @@
<mm:constraint field="status"
value="task.status.done" operator="EQUAL" inverse="true" />
</mm:notpresent>
<mm:distinct />
- <mm:relatednodes
comparator="com.finalist.cmsc.tasks.TaskUrgencyComparator"
max="${dashboardTaskSize}" id="resultList" />
+ <mm:sortorder field="task.${sortBy}" direction="${direction}" />
+ <c:set var="listSize"><mm:size/></c:set>
+ <c:set var="offset" value="${not empty param.offset ? param.offset
: '0'}"/>
+ <mm:relatednodes
comparator="com.finalist.cmsc.tasks.TaskUrgencyComparator"
max="${dashboardTaskSize}" id="resultList"/>
</mm:relatednodescontainer>
</mm:listnodes>
</mm:listnodescontainer>
<div class="editor">
<div class="body">
-
+ <c:set var="resultsPerPage">
+ <%=PropertiesUtil.getProperty("repository.search.results.per.page")%>
+ </c:set>
+<%...@include file="../pages.jsp" %>
<c:url value="/editors/taskmanagement/MassDeleteTaskAction.do"
var="taskFormAction" />
<form action="${taskFormAction}" name="taskForm">
<mm:hasrank minvalue="basic user">
@@ -71,13 +85,14 @@
<input type="submit" class="button"
value="<fmt:message key="task.delete.massdelete"/>"
onclick="massDeleteTask('<fmt:message key="task.massdeleteconfirm" />');return
false;" />
</c:if>
</mm:hasrank>
- <%@ include file="tasklist_table.jspf"%>
+<%@ include file="tasklist_table.jspf"%>
<mm:hasrank minvalue="basic user">
<c:if test="${fn:length(resultList)>1}">
<input type="submit" class="button"
value="<fmt:message key="task.delete.massdelete"/>"
onclick="massDeleteTask('<fmt:message key="task.massdeleteconfirm" />');return
false;" />
</c:if>
</mm:hasrank>
</form>
+<%...@include file="../pages.jsp" %>
<html:form action="/editors/taskmanagement/showTaskAction">
<html:select property="taskShowType"
onchange="this.form.submit();">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
