Update of
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement
In directory
james.mmbase.org:/tmp/cvs-serv5056/tasks/src/webapp/editors/taskmanagement
Modified Files:
tasklist_table.jspf tasklist.jsp
Log Message:
CMSC-1352 Improvements on the Task module; improve some i18n about recyclebin
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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- tasklist_table.jspf 7 Apr 2009 12:02:00 -0000 1.10
+++ tasklist_table.jspf 8 Apr 2009 03:38:45 -0000 1.11
@@ -7,12 +7,12 @@
</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=creationdate&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=status&direction=${direction}&offset=${offset}"><fmt:message
key="task.status" /></th>
+ <th><fmt:message key="task.contenttitle" /></th>
+ <th><fmt:message key="task.nodetype" /></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 }">
Index: tasklist.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement/tasklist.jsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- tasklist.jsp 7 Apr 2009 12:02:00 -0000 1.17
+++ tasklist.jsp 8 Apr 2009 03:38:45 -0000 1.18
@@ -1,5 +1,4 @@
<%...@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";>
@@ -45,8 +44,8 @@
</div>
-<mm:import externid="direction" jspvar="direction">up</mm:import>
-<mm:import externid="sortBy" jspvar="sortBy">title</mm:import>
+<mm:import externid="direction" jspvar="direction">down</mm:import>
+<mm:import externid="sortBy" jspvar="sortBy">status</mm:import>
<c:set var="direction">
<c:out value="${direction =='up'?'down':'up' }"/>
</c:set>
@@ -67,16 +66,13 @@
<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:relatednodes 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">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
