Update of 
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement
In directory james.mmbase.org:/tmp/cvs-serv3543

Modified Files:
        tasklist.jsp 
Log Message:
CMSC-899,Check and improve all lists according to guideline


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement
See also: http://www.mmbase.org/jira/browse/CMSC-899


Index: tasklist.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/tasks/src/webapp/editors/taskmanagement/tasklist.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tasklist.jsp        13 Aug 2008 06:22:01 -0000      1.4
+++ tasklist.jsp        8 Sep 2008 07:56:53 -0000       1.5
@@ -1,7 +1,6 @@
 <[EMAIL PROTECTED] language="java" contentType="text/html;charset=UTF-8"
-%><[EMAIL PROTECTED] file="globals.jsp"%>
-<%!
-/*
+%><[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 
 * status "init" has position 1; status "notified" position 2 and status "done" 
position 3.
 */
@@ -29,8 +28,7 @@
                }
        }
 }
-%>
-<mm:content type="text/html" encoding="UTF-8" expires="0">
+%><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";>
 <html:html xhtml="true">
 <cmscedit:head title="tasks.title" />
@@ -65,10 +63,10 @@
                            <th><fmt:message key="task.created" /></th>
                            <th><fmt:message key="task.deadline" /></th>
                            <th><fmt:message key="task.title" /></th>
+                          <th><fmt:message key="task.status" /></th>
                            <th><fmt:message key="task.contenttitle" /></th>
                            <th><fmt:message key="task.nodetype" /></th>
                            <th><fmt:message key="task.description" /></th>
-                           <th><fmt:message key="task.status" /></th>
                         </tr>
                      </thead>
                      <tbody class="hover">
@@ -89,8 +87,9 @@
                                        <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>
+                             <c:set var="status"><mm:field name="status" 
/></c:set>
+                             <td><fmt:message key="${status}" /></td>
+                             <td><c:choose>
                                  <c:when test="${empty elementnumber}">
                                     <fmt:message key="task.noelement"/>
                                  </c:when>
@@ -100,13 +99,10 @@
                                        <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">
@@ -116,14 +112,9 @@
                                     <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>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to