Menu
▾
▴
[GM-CVS] GatorMail/src/webapp/tiles/folder folderList.jsp,1.2,1.3 messageList.jsp,1.9,1.10 messageListView.jsp,1.4,1.5
|
From: Sandy M. <san...@us...> - 2004-12-01 22:13:38
|
Update of /cvsroot/gatormail/GatorMail/src/webapp/tiles/folder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14024/src/webapp/tiles/folder Modified Files: folderList.jsp messageList.jsp messageListView.jsp Log Message: Applied most of Allison Moore's patch to add sorting to the mesage list. Index: messageListView.jsp =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/webapp/tiles/folder/messageListView.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** messageListView.jsp 7 Oct 2004 18:00:52 -0000 1.4 --- messageListView.jsp 1 Dec 2004 22:13:28 -0000 1.5 *************** *** 53,57 **** <script language="JavaScript" type="text/javascript"> function jumpToPage(f) { ! window.location = "folder.do?folder=<%=folderName%>&page=" + f.value; } </script> --- 53,57 ---- <script language="JavaScript" type="text/javascript"> function jumpToPage(f) { ! window.location = "folder.do?folder=<%=folderName%>&sort=${folderSort}&page=" + f.value; } </script> *************** *** 60,67 **** <c:choose> <c:when test="${folderListPage > 1}"> ! <a href="folder.do?folder=<%=folderName%>&page=<c:out value="${folderListPage-1}"/>">< prev</a> </c:when> <c:otherwise> ! <a href="folder.do?folder=<%=folderName%>&page=0">show all</a> </c:otherwise> </c:choose> --- 60,67 ---- <c:choose> <c:when test="${folderListPage > 1}"> ! <a href="folder.do?folder=<%=folderName%>&sort=<c:out value="${folderSort}"/>&page=<c:out value="${folderListPage-1}"/>">< prev</a> </c:when> <c:otherwise> ! <a href="folder.do?folder=<%=folderName%>&sort=<c:out value="${folderSort}"/>&page=0">show all</a> </c:otherwise> </c:choose> *************** *** 79,83 **** </select> of <b><c:out value="${folderListPages}"/></b> <c:if test="${folderListPage < folderListPages}"> ! <a href="folder.do?folder=<%=folderName%>&page=<c:out value="${folderListPage+1}"/>">next ></a> </c:if> </form> --- 79,83 ---- </select> of <b><c:out value="${folderListPages}"/></b> <c:if test="${folderListPage < folderListPages}"> ! <a href="folder.do?folder=<%=folderName%>&sort=<c:out value="${folderSort}"/>&page=<c:out value="${folderListPage+1}"/>">next ></a> </c:if> </form> Index: folderList.jsp =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/webapp/tiles/folder/folderList.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** folderList.jsp 20 Feb 2004 00:25:59 -0000 1.2 --- folderList.jsp 1 Dec 2004 22:13:27 -0000 1.3 *************** *** 11,14 **** --- 11,15 ---- of new messages. --%> + <% try { Index: messageList.jsp =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/webapp/tiles/folder/messageList.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** messageList.jsp 7 Oct 2004 18:00:51 -0000 1.9 --- messageList.jsp 1 Dec 2004 22:13:28 -0000 1.10 *************** *** 27,31 **** --- 27,35 ---- <% Folder folder = (Folder)request.getAttribute("folder"); + String sort = (String)request.getAttribute("folderSort"); folder = Util.getFolder(folder); + + + Collection columns = new ArrayList(4); *************** *** 57,60 **** --- 61,66 ---- <html:hidden property="folder" value="<%=folderName%>"/> <html:hidden property="page" value="${folderListPage}"/> + <html:hidden property="sort" value="${folderSort}"/> + <table width="100%" border="0" cellpadding="4" cellspacing="0" class="folderMessageList"> *************** *** 183,205 **** </th> <c:forEach items="${columns}" var="column" varStatus="columnStatus"> ! <th> <c:choose> ! <c:when test="${column == 'date'}"> ! <bean:message key="message.date"/> ! </c:when> <c:when test="${column == 'flags'}"> ! <bean:message key="message.flags"/> </c:when> <c:when test="${column == 'from'}"> ! <bean:message key="message.from"/> </c:when> <c:when test="${column == 'size'}"> ! <bean:message key="message.size"/> </c:when> <c:when test="${column == 'subject'}"> ! <bean:message key="message.subject"/> </c:when> <c:when test="${column == 'to'}"> ! <bean:message key="message.to"/> </c:when> <c:otherwise> --- 189,272 ---- </th> <c:forEach items="${columns}" var="column" varStatus="columnStatus"> ! <th valign="middle" > <c:choose> ! <c:when test="${column == 'date'}"> ! <c:choose> ! <c:when test="${folderSort == 'dateDN'}"> ! ! <a href= "folder.do?folder=<%=folderName%>&sort=<c:out value="dateUP"/> " title="Sort by Date" >Date</a> ! <html:img page="/sort-down.gif" border="0" align="absmiddle"/> ! </c:when> ! <c:when test="${folderSort == 'dateUP'}"> ! <a href= "folder.do?folder=<%=folderName%>&sort=<c:out value="dateDN"/> " title="Sort by Date" >Date</a> ! <html:img page="/sort-up.gif" border="0" align="absmiddle"/> ! </c:when> ! <c:otherwise> ! <a href= "folder.do?folder=<%=folderName%>&sort=<c:out value="dateDN"/> " title="Sort by Date" >Date</a> ! </c:otherwise> ! </c:choose> ! </c:when> <c:when test="${column == 'flags'}"> ! <bean:message key="message.flags"/> </c:when> <c:when test="${column == 'from'}"> ! <c:choose> ! <c:when test="${folderSort == 'fromUP'}"> ! <a href= "folder.do?folder=<%=folderName%>&sort=<c:out value="fromDN"/> " title="Sort by Sender" >Sender</a> ! <html:img page="/sort-up.gif" border="0" align="absmiddle"/> ! </c:when> ! <c:when test="${folderSort == 'fromDN'}"> ! <a href= "folder.do?folder=<%=folderName%>&sort=<c:out value="fromUP"/> " title="Sort by Sender" >Sender</a> ! <html:img page="/sort-down.gif" border="0" align="absmiddle"/> ! </c:when> ! <c:otherwise> ! <a href= "folder.do?folder=<%=folderName%>&sort=<c:out value="fromDN"/> " title="Sort by Sender" >Sender</a> ! </c:otherwise> ! </c:choose> </c:when> <c:when test="${column == 'size'}"> ! <c:choose> ! <c:when test="${folderSort == 'sizeUP'}"> ! <a href= "folder.do?folder=<%=folderName%>&sort=<c:out value="sizeDN"/> " title="Sort by Size" >Size</a> ! <html:img page="/sort-up.gif" border="0" align="absmiddle"/> ! </c:when> ! <c:when test="${folderSort == 'sizeDN'}"> ! <a href= "folder.do?folder=<%=folderName%>&sort=<c:out value="sizeUP"/> " title="Sort by Size" >Size</a> ! <html:img page="/sort-down.gif" border="0" align="absmiddle"/> ! </c:when> ! <c:otherwise> ! <a href= "folder.do?folder=<%=folderName%>&sort=<c:out value="sizeDN"/> " title="Sort by Size" >Size</a> ! </c:otherwise> ! </c:choose> </c:when> <c:when test="${column == 'subject'}"> ! <c:choose> ! <c:when test="${folderSort == 'subUP'}"> ! <a href= "folder.do?folder=<%=folderName%>&sort=<c:out value="subDN"/> " title="Sort by Subject" >Subject</a> ! <html:img page="/sort-up.gif" border="0" align="absmiddle"/> ! </c:when> ! <c:when test="${folderSort == 'subDN'}"> ! <a href= "folder.do?folder=<%=folderName%>&sort=<c:out value="subUP"/> " title="Sort by Subject" >Subject</a> ! <html:img page="/sort-down.gif" border="0" align="absmiddle"/> ! </c:when> ! <c:otherwise> ! <a href= "folder.do?folder=<%=folderName%>&sort=<c:out value="subDN"/> " title="Sort by Subject" >Subject</a> ! </c:otherwise> ! </c:choose> </c:when> <c:when test="${column == 'to'}"> ! <c:choose> ! <c:when test="${folderSort == 'toUP'}"> ! <a href= "folder.do?folder=<%=folderName%>&sort=<c:out value="toDN"/> " title="Sort by Receiver" >To</a> ! <html:img page="/sort-up.gif" border="0" align="absmiddle"/> ! </c:when> ! <c:when test="${folderSort == 'toDN'}"> ! <a href= "folder.do?folder=<%=folderName%>&sort=<c:out value="toUP"/> " title="Sort by Receiver" >To</a> ! <html:img page="/sort-down.gif" border="0" align="absmiddle"/> ! </c:when> ! <c:otherwise> ! <a href= "folder.do?folder=<%=folderName%>&sort=<c:out value="toDN"/> " title="Sort by Receiver" >To</a> ! </c:otherwise> ! </c:choose> </c:when> <c:otherwise> *************** *** 225,235 **** MessageWrapper wrappedMessage = new MessageWrapper(message); pageContext.setAttribute("wrappedMessage", wrappedMessage); Map messageParams = new HashMap(); ! Util.addMessageParams(message, messageParams); pageContext.setAttribute("messageParams", messageParams); Integer messageNumber = (Integer)messageParams.get("messageNumber"); // For Messages Long uid = (Long)messageParams.get("uid"); // For IMAP Messages // Get the Message-ID so it can be added to the TR. --- 292,304 ---- MessageWrapper wrappedMessage = new MessageWrapper(message); pageContext.setAttribute("wrappedMessage", wrappedMessage); + Map messageParams = new HashMap(); ! Util.addMessageParams(message,sort, messageParams); pageContext.setAttribute("messageParams", messageParams); Integer messageNumber = (Integer)messageParams.get("messageNumber"); // For Messages Long uid = (Long)messageParams.get("uid"); // For IMAP Messages + //String messageSort = (string)messageParams.get("sort"); // Get the Message-ID so it can be added to the TR. *************** *** 463,470 **** <c:choose> <c:when test="${folderListPage > 1}"> ! <a href="folder.do?folder=<%=folderName%>&page=<c:out value="${folderListPage-1}"/>">< prev</a> </c:when> <c:otherwise> ! <a href="folder.do?folder=<%=folderName%>&page=0">show all</a> </c:otherwise> </c:choose> --- 532,539 ---- <c:choose> <c:when test="${folderListPage > 1}"> ! <a href="folder.do?folder=<%=folderName%>&sort=<c:out value="${folderSort}"/>&page=<c:out value="${folderListPage-1}"/>">< prev</a> </c:when> <c:otherwise> ! <a href="folder.do?folder=<%=folderName%>&sort=<c:out value="${folderSort}"/>&page=0">show all</a> </c:otherwise> </c:choose> *************** *** 482,486 **** </select> of <b><c:out value="${folderListPages}"/></b> <c:if test="${folderListPage < folderListPages}"> ! <a href="folder.do?folder=<%=folderName%>&page=<c:out value="${folderListPage+1}"/>">next ></a> </c:if> </form> --- 551,555 ---- </select> of <b><c:out value="${folderListPages}"/></b> <c:if test="${folderListPage < folderListPages}"> ! <a href="folder.do?folder=<%=folderName%>&sort=<c:out value="${folderSort}"/>&page=<c:out value="${folderListPage+1}"/>">next ></a> </c:if> </form> |