Update of
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement
In directory
james.mmbase.org:/tmp/cvs-serv26110/src/webapp/editors/taskmanagement
Modified Files:
tasklist.jsp
Log Message:
CMSC-235 , CMSC-932 , CMSC-933
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement
See also: http://www.mmbase.org/jira/browse/CMSC-235
See also: http://www.mmbase.org/jira/browse/CMSC-932
See also: http://www.mmbase.org/jira/browse/CMSC-933
Index: tasklist.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement/tasklist.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tasklist.jsp 23 May 2007 07:49:00 -0000 1.3
+++ tasklist.jsp 13 Aug 2008 06:22:01 -0000 1.4
@@ -1,5 +1,5 @@
-<[EMAIL PROTECTED] language="java" contentType="text/html;charset=UTF-8"%>
-<[EMAIL PROTECTED] file="globals.jsp"%>
+<[EMAIL PROTECTED] language="java" contentType="text/html;charset=UTF-8"
+%><[EMAIL PROTECTED] file="globals.jsp"%>
<%!
/*
* Comparator to order mmbase nodes on status. Sorting is not done on
alphabetical order but on the value of status where
@@ -35,17 +35,30 @@
<html:html xhtml="true">
<cmscedit:head title="tasks.title" />
<body>
+ <c:choose>
+ <c:when test="${requestScope.taskShowType eq
'task.showtype.assignedtome'}">
+ <c:set var="tmpRole">assignedrel</c:set>
+ </c:when>
+ <c:when test="${requestScope.taskShowType eq
'task.showtype.createdbyme'}">
+ <c:set var="tmpRole">creatorrel</c:set>
+ </c:when>
+ <c:otherwise>
+ <c:set var="tmpRole"></c:set>
+ </c:otherwise>
+ </c:choose>
<mm:cloud jspvar="cloud" loginpage="../login.jsp">
- <cmscedit:contentblock title="tasks.title"
- titleClass="content_block_pink" bodyClass="body_table">
- <br />
+ <cmscedit:contentblock title="tasks.title"
titleClass="content_block_pink" bodyClass="body_table">
<mm:cloudinfo type="user" id="cloudusername" write="false" />
<mm:listnodescontainer type="user">
<mm:constraint field="user.username" operator="EQUAL"
referid="cloudusername" />
<mm:maxnumber value="10" />
+ <p style="font-size:12px; padding-left:10px;">
+ <html:messages id="createSuccess" message="true" bundle="TASKS">
+ <bean:write name="createSuccess"/>
+ </html:messages>
+ </p>
<mm:listnodes>
-
- <mm:relatednodescontainer type="task" role="assignedrel"
searchdirs="source">
+ <mm:relatednodescontainer type="task" role="${tmpRole}"
searchdirs="source">
<table>
<thead>
<tr>
@@ -58,9 +71,7 @@
<th><fmt:message key="task.status" /></th>
</tr>
</thead>
-
<tbody class="hover">
-
<mm:relatednodes comparator="StatusComparator">
<c:set var="taskid"><mm:field name="number"/></c:set>
<tr <mm:even inverse="true">class="swap"</mm:even>>
@@ -70,7 +81,6 @@
<c:set var="elementtitel"><mm:field
name="title"/></c:set>
<c:set var="elementnumber"/>
<c:set var="elementtype"/>
-
<mm:relatednodescontainer type="contentelement"
role="taskrel" searchdirs="destination">
<mm:maxnumber value="1" />
<mm:relatednodes>
@@ -79,8 +89,8 @@
<c:set var="elementtype"><mm:field
name="number"><mm:isnotempty><mm:nodeinfo
type="guitype"/></mm:isnotempty></mm:field></c:set>
</mm:relatednodes>
</mm:relatednodescontainer>
-
- <td><c:choose>
+ <td>
+ <c:choose>
<c:when test="${empty elementnumber}">
<fmt:message key="task.noelement"/>
</c:when>
@@ -90,13 +100,14 @@
<a href="<mm:url
page="../WizardInitAction.do">
<mm:param name="objectnumber" value="${elementnumber}"/>
<mm:param
name="returnurl" value="${returnTasklist}"/>
-
</mm:url>" target="rightpane"><img src="../gfx/icons/edit.png" align="top"
alt="<fmt:message key="task.editelement"/>" title="<fmt:message
key="task.editelement"/>"/></a> ${elementtitel}
+ </mm:url>" target="rightpane">
+ <img src="../gfx/icons/edit.png"
align="top" alt="<fmt:message key="task.editelement"/>" title="<fmt:message
key="task.editelement"/>"/>
+ </a> ${elementtitel}
</mm:hasrank>
</c:otherwise>
- </c:choose></td>
-
+ </c:choose>
+ </td>
<td>${elementtype}</td>
-
<td>
<mm:hasrank minvalue="basic user">
<mm:field name="number" jspvar="number"
write="false"/>
@@ -105,13 +116,14 @@
<mm:param name="objectnumber" value="${number}"/>
<mm:param name="contenttype" value="task"/>
<mm:param name="returnurl" value="${returnTaskedit}"/>
-
</mm:url>" target="rightpane"><img src="../gfx/icons/edit2.png"
align="top" alt="<fmt:message key="task.edit"/>" title="<fmt:message
key="task.edit"/>"/></a> <mm:field name="description" />
+ </mm:url>" target="rightpane">
+ <img src="../gfx/icons/edit2.png"
align="top" alt="<fmt:message key="task.edit"/>" title="<fmt:message
key="task.edit"/>"/>
+ </a>
+ <mm:field name="description" />
</mm:hasrank>
</td>
-
<c:set var="status"><mm:field name="status"
/></c:set>
<td><fmt:message key="${status}" /></td>
-
</tr>
</mm:relatednodes>
</tbody>
@@ -119,8 +131,16 @@
</mm:relatednodescontainer>
</mm:listnodes>
</mm:listnodescontainer>
+ <html:form action="/editors/taskmanagement/showTaskAction">
+ <html:select property="taskShowType"
value="${requestScope.taskShowType}">
+ <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:submit><bean:message bundle="TASKS"
key="task.showtype.submit"/></html:submit>
+ </html:form>
</cmscedit:contentblock>
</mm:cloud>
- </body>
- </html:html>
+</body>
+</html:html>
</mm:content>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
