[GM-CVS] GatorMail/src/webapp/tiles/message message.jsp,1.2,1.3 messageMenu.jsp,1.3,1.4 messageMenuHead.jsp,1.3,1.4

[Sandy M. <san...@us...>]

Update of /cvsroot/gatormail/GatorMail/src/webapp/tiles/message
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14024/src/webapp/tiles/message

Modified Files:
	message.jsp messageMenu.jsp messageMenuHead.jsp 
Log Message:
Applied most of Allison Moore's patch to add sorting to the mesage list.

Index: messageMenuHead.jsp
===================================================================
RCS file: /cvsroot/gatormail/GatorMail/src/webapp/tiles/message/messageMenuHead.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** messageMenuHead.jsp	19 Oct 2004 19:35:46 -0000	1.3
--- messageMenuHead.jsp	1 Dec 2004 22:13:28 -0000	1.4
***************
*** 17,20 ****
--- 17,21 ----
      Folder messageFolder = message.getFolder();
      request.setAttribute("messageFolder", messageFolder);
+     String sort = (String)request.getAttribute("folderSort");
  
  
***************
*** 23,27 ****
  
          Map messageParams = new HashMap();
!         Util.addMessageParams(message, messageParams);
          request.setAttribute("messageParams", messageParams);
  %>
--- 24,28 ----
  
          Map messageParams = new HashMap();
!         Util.addMessageParams(message, sort, messageParams);
          request.setAttribute("messageParams", messageParams);
  %>

Index: message.jsp
===================================================================
RCS file: /cvsroot/gatormail/GatorMail/src/webapp/tiles/message/message.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** message.jsp	20 Feb 2004 19:42:58 -0000	1.2
--- message.jsp	1 Dec 2004 22:13:28 -0000	1.3
***************
*** 3,11 ****
                                          edu.ufl.osg.webmail.wrappers.MessageWrapper,
                                          edu.ufl.osg.webmail.util.Util,
!                                         java.util.Map,
!                                         java.util.HashMap,
!                                         javax.mail.Folder,
!                                         java.util.Enumeration,
!                                         javax.mail.Header"%>
  <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
  <%@taglib uri="/tags/struts-tiles" prefix="tiles"%>
--- 3,7 ----
                                          edu.ufl.osg.webmail.wrappers.MessageWrapper,
                                          edu.ufl.osg.webmail.util.Util,
!                                         javax.mail.Folder"%>
  <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
  <%@taglib uri="/tags/struts-tiles" prefix="tiles"%>

Index: messageMenu.jsp
===================================================================
RCS file: /cvsroot/gatormail/GatorMail/src/webapp/tiles/message/messageMenu.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** messageMenu.jsp	19 Oct 2004 19:35:46 -0000	1.3
--- messageMenu.jsp	1 Dec 2004 22:13:28 -0000	1.4
***************
*** 17,22 ****
         <%
           pageContext.setAttribute("folderName", messageFolder.getFullName());
         %>
!        &nbsp;<html:link forward="folder" paramId="folder" paramName="folderName" titleKey="link.up.title"><bean:message key="link.up"/></html:link>&nbsp;
         <html:link forward="nextMessage" name="messageParams" scope="request" titleKey="link.next.title"><bean:message key="link.next"/></html:link>
        </nobr>
--- 17,25 ----
         <%
           pageContext.setAttribute("folderName", messageFolder.getFullName());
+          pageContext.setAttribute("sort", (String)request.getAttribute("folderSort"));
         %>
!        &nbsp;
!        <a href="folder.do?folder=<c:out value="${folderName}"/>&amp;sort=<c:out value="${folderSort}"/>" title="Back to Folder" ><bean:message key="link.up"/></a>
!        &nbsp;
         <html:link forward="nextMessage" name="messageParams" scope="request" titleKey="link.next.title"><bean:message key="link.next"/></html:link>
        </nobr>