Update of
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement
In directory
james.mmbase.org:/tmp/cvs-serv25814/tasks/src/webapp/editors/taskmanagement
Modified Files:
tasklist.jsp tasklist_table.jspf
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.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement/tasklist.jsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- tasklist.jsp 31 Mar 2009 08:29:44 -0000 1.12
+++ tasklist.jsp 31 Mar 2009 10:32:52 -0000 1.13
@@ -23,9 +23,68 @@
</c:if>
<mm:cloud jspvar="cloud" loginpage="../login.jsp">
+
+ <div class="content">
+ <div class="tabs">
+ <div class="tab_active">
+ <div class="body">
+ <div>
+ <a href="#"><fmt:message key="tasks.title" /></a>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
<mm:cloudinfo type="user" id="cloudusername" write="false" />
- <c:set var="dashboardTaskTitle"><fmt:message key="tasks.title"
/></c:set>
+ <mm:listnodescontainer type="user">
+ <mm:constraint field="user.username" operator="EQUAL"
referid="cloudusername" />
+ <mm:maxnumber value="10" />
+ <mm:listnodes>
+ <mm:relatednodescontainer type="task" role="${tmpRole}"
searchdirs="source">
+ <mm:present referid="status">
+ <mm:constraint field="status"
value="${status}" operator="EQUAL" />
+ </mm:present>
+ <mm:notpresent referid="status">
+ <mm:constraint field="status"
value="task.status.done" operator="EQUAL" inverse="true" />
+ </mm:notpresent>
+ <mm:relatednodes
comparator="com.finalist.cmsc.tasks.TaskUrgencyComparator"
max="${dashboardTaskSize}" id="resultList" />
+ </mm:relatednodescontainer>
+ </mm:listnodes>
+ </mm:listnodescontainer>
+
+ <div class="editor">
+ <div class="body">
+
+ <p style="font-size: 12px; padding-left: 10px;"><html:messages
id="createSuccess" message="true" bundle="TASKS"><bean:write
name="createSuccess" /></html:messages></p>
+
+ <form action="DeleteTaskAction.do" name="taskForm">
+ <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="deleteTask('<fmt:message key="task.massdeleteconfirm" />');return
false;" />
+ </c:if>
+ </mm:hasrank>
<%@ 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="deleteTask('<fmt:message key="task.massdeleteconfirm" />');return
false;" />
+ </c:if>
+ </mm:hasrank>
+ </form>
+
+ <html:form action="/editors/taskmanagement/showTaskAction">
+ <html:select property="taskShowType"
onchange="this.form.submit();">
+ <html:option value="task.showtype.alltasks"
bundle="TASKS" key="task.showtype.alltasks" />
+ <html:option value="task.showtype.assignedtome"
bundle="TASKS" key="task.showtype.assignedtome" />
+ <html:option value="task.showtype.createdbyme"
bundle="TASKS" key="task.showtype.createdbyme" />
+ </html:select>
+ <html:checkbox property="showFinishedTask" value="yes"
onclick="this.form.submit();" />
+ <fmt:message key="task.show.finished" />
+ </html:form>
+
+ </div>
+ </div>
+
</mm:cloud>
</body>
</html:html>
Index: tasklist_table.jspf
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement/tasklist_table.jspf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tasklist_table.jspf 31 Mar 2009 08:29:44 -0000 1.5
+++ tasklist_table.jspf 31 Mar 2009 10:32:52 -0000 1.6
@@ -1,39 +1,4 @@
-<mm:listnodescontainer type="user">
- <mm:constraint field="user.username" operator="EQUAL"
- referid="cloudusername" />
- <mm:maxnumber value="10" />
- <mm:listnodes>
- <mm:relatednodescontainer type="task" role="${tmpRole}"
- searchdirs="source">
- <mm:present referid="status">
- <mm:constraint field="status" value="${status}"
operator="EQUAL" />
- </mm:present>
- <mm:notpresent referid="status">
- <mm:constraint field="status"
value="task.status.done" operator="EQUAL" inverse="true"/>
- </mm:notpresent>
- <mm:relatednodes
-
comparator="com.finalist.cmsc.tasks.TaskUrgencyComparator"
- max="${dashboardTaskSize}" id="resultList" />
- </mm:relatednodescontainer>
- </mm:listnodes>
-</mm:listnodescontainer>
-
-<c:if test="${(empty dashboardTaskSize) or (not empty resultList)}">
-<cmscedit:contentblock title="${dashboardTaskTitle}" titleMode="plain"
titleClass="content_block_pink" bodyClass="body_table">
-
- <p style="font-size:12px; padding-left:10px;">
- <html:messages id="createSuccess" message="true" bundle="TASKS">
- <bean:write name="createSuccess"/>
- </html:messages>
- </p>
-
- <form action="DeleteTaskAction.do" name="taskForm">
- <mm:hasrank minvalue="basic user">
- <c:if test="${empty dashboardTaskSize and fn:length(resultList)>1}">
- <input type="submit" class="button" value="<fmt:message
key="task.delete.massdelete"/>" onclick="deleteTask('<fmt:message
key="task.massdeleteconfirm" />');return false;"/>
- </c:if>
- </mm:hasrank>
- <table>
+<table>
<thead>
<tr>
<th><mm:hasrank minvalue="basic user">
@@ -69,7 +34,7 @@
<a href="javascript:window.top.openTasksWithTask('<mm:field
name="number" />');"><img src="gfx/icons/edit2.png" align="top"
alt="<fmt:message key="task.edit"/>" title="<fmt:message
key="task.edit"/>"/></a>
</c:if>
<c:if test="${empty dashboardTaskSize}">
- <a href="javascript:deleteTask('<fmt:message
key="task.deleteconfirm"><mm:field name="title"/></fmt:message>');"><img
src="../gfx/icons/delete.png" width="16" height="16" title="<fmt:message
key="task.delete" />" alt="<fmt:message key="task.delete" />" /></a>
+ <a href="javascript:deleteTask('<fmt:message
key="task.deleteconfirm"><fmt:param><mm:field
name="title"/></fmt:param></fmt:message>');"><img src="../gfx/icons/delete.png"
width="16" height="16" title="<fmt:message key="task.delete" />"
alt="<fmt:message key="task.delete" />" /></a>
</c:if>
</mm:hasrank>
</td>
@@ -117,19 +82,4 @@
</c:if>
</mm:listnodes>
</tbody>
- </table>
- </form>
-
- <c:if test="${empty dashboardTaskSize}">
- <html:form action="/editors/taskmanagement/showTaskAction">
- <html:select property="taskShowType"
onchange="this.form.submit();">
- <html:option value="task.showtype.alltasks" bundle="TASKS"
key="task.showtype.alltasks"/>
- <html:option value="task.showtype.assignedtome" bundle="TASKS"
key="task.showtype.assignedtome"/>
- <html:option value="task.showtype.createdbyme" bundle="TASKS"
key="task.showtype.createdbyme"/>
- </html:select>
- <html:checkbox property="showFinishedTask" value="yes"
onclick="this.form.submit();"/><fmt:message key="task.show.finished"/>
- </html:form>
- </c:if>
-
-</cmscedit:contentblock>
-</c:if>
+</table>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
