From: Sandy M. <san...@us...> - 2005-09-22 22:00:27
|
Update of /cvsroot/gatormail/GatorMail/src/webapp/tiles/folder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13699/src/webapp/tiles/folder Modified Files: folderQuota.jsp Log Message: Update the quota display to handle multiple quota roots. Index: folderQuota.jsp =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/webapp/tiles/folder/folderQuota.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** folderQuota.jsp 20 Feb 2004 00:25:59 -0000 1.2 --- folderQuota.jsp 22 Sep 2005 22:00:18 -0000 1.3 *************** *** 2,6 **** javax.mail.Folder, com.sun.mail.imap.IMAPFolder, ! edu.ufl.osg.webmail.beans.QuotaResourceBean"%> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@taglib uri="/tags/struts-html" prefix="html"%> --- 2,12 ---- javax.mail.Folder, com.sun.mail.imap.IMAPFolder, ! edu.ufl.osg.webmail.beans.QuotaBean, ! com.sun.mail.imap.IMAPStore, ! java.util.Arrays, ! edu.ufl.osg.webmail.Constants, ! edu.ufl.osg.webmail.User, ! java.util.List, ! java.util.Iterator"%> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@taglib uri="/tags/struts-html" prefix="html"%> *************** *** 16,20 **** Util.releaseFolder(folder); ! if (request.getAttribute("quotaList") == null) { out.println("<!-- No quota list was supplied. -->"); return; --- 22,31 ---- Util.releaseFolder(folder); ! IMAPFolder imapFolder = (IMAPFolder)folder; ! IMAPStore imapStore = (IMAPStore)imapFolder.getStore(); ! User user = (User)session.getAttribute(Constants.USER_KEY); ! List nameSpaces = Arrays.asList(imapStore.getUserNamespaces(user.getUsername())); ! ! if (request.getAttribute("quotaSet") == null) { out.println("<!-- No quota list was supplied. -->"); return; *************** *** 26,49 **** </tr> ! <c:forEach items="${quotaList}" var="quotaResources"> ! <tr> ! <td> ! ! <c:forEach items="${quotaResources}" var="resource"> <% ! QuotaResourceBean resource = (QuotaResourceBean)pageContext.getAttribute("resource"); ! long usage = (long)((double)resource.getUsage() / (double)resource.getLimit() * 100d); %> <table class="folderQuotaResource" border="0" cellspacing="0"> <tr> ! <th colspan="2"><bean:write name="resource" property="name"/></th> </tr> <tr> ! <td class="folderQuotaResourceUsed" width="<%= (int)(Math.max(1, usage) * 1.5) %>" title="<%= usage + "% used" %>"> </td> ! <td class="folderQuotaResourceFree" width="<%= (int)(Math.min(99, 100 - usage) * 1.5) %>" title="<%= (100 - usage) + "% free" %>"> </td> </tr> <tr> <td colspan="2" class="folderQuotaMessage"> ! <bean:message key="folder.quota.message" arg0="<%= Long.toString(resource.getUsage()) %>" arg1="<%= Long.toString(resource.getLimit()) %>"/> </td> </tr> --- 37,67 ---- </tr> ! <c:forEach items="${quotaSet}" var="quotaBean"> <% ! QuotaBean qb = (QuotaBean)pageContext.findAttribute("quotaBean"); ! String quotaRootName = qb.getQuotaRoot(); ! Iterator nsIterator = nameSpaces.iterator(); ! while (nsIterator.hasNext()) { ! Folder f = (Folder)nsIterator.next(); ! if (quotaRootName.startsWith(f.getFullName())) { ! quotaRootName = "INBOX" + quotaRootName.substring(f.getFullName().length()); ! } ! } ! pageContext.setAttribute("quotaRootName", quotaRootName); %> + <tr> + <td> + <c:forEach items="${quotaBean.resources}" var="resource"> <table class="folderQuotaResource" border="0" cellspacing="0"> <tr> ! <th colspan="2" title="<c:out value="${quotaBean.quotaRoot}"/>"><c:out value="${quotaRootName}"/></th> </tr> <tr> ! <td class="folderQuotaResourceUsed" width="<c:out value="${resource.percentUsed}"/>%" title="<c:out value="${resource.name}"/> <c:out value="${resource.percentUsed}"/>% used""> </td> ! <td class="folderQuotaResourceFree" width="<c:out value="${resource.percentFree}"/>%" title="<c:out value="${resource.name}"/> <c:out value="${resource.percentFree}"/>% free"> </td> </tr> <tr> <td colspan="2" class="folderQuotaMessage"> ! <bean:message key="folder.quota.message" arg0="<%= Long.toString(((QuotaBean.ResourceBean)pageContext.getAttribute("resource")).getUsage()) %>" arg1="<%= Long.toString(((QuotaBean.ResourceBean)pageContext.getAttribute("resource")).getLimit()) %>"/> </td> </tr> |