Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 197 → Rev 198

/impl/conf/language/MessageResourcesEmail.properties
5,7 → 5,7
################################################################################
module.Email=Serviço de Email
pop.no.messages=Não tem mensagens na sua caixa de correio
pop.title=Últimas mensagens de correio electrónico do seu servidor de POP
pop.title=Últimas mensagens de Email<br>Ir para <a target="_blank" href="http://mail.estgp.pt/exchange/{0}">WEBMAIL</a>
pop.text=Mensagem
pop.from=De
pop.to=Para
/impl/conf/language/MessageResourcesFtpClient.properties
23,3 → 23,8
 
zero.files=A pasta não contém quaiquer ficheiros
 
file.size=Tamanho
file.name=Nome do ficheiro/pasta
file.date=Data de Modificação
file.up.dir=Anterior
 
/impl/conf/WEB-INF/struts/struts-blog.xml
41,9 → 41,9
<forward name="from.add.role" path="page.submit.blog"/>
</action>
 
<action path="/user/startAddPostFromHome" forward="/user/blogsControllerFromHome.do?dispatch=addPost"/>
<action path="/user/startEditPostFromHome" forward="/user/blogsControllerFromHome.do?dispatch=editPost"/>
<action path="/user/startDeletePostFromHome" forward="/user/blogsControllerFromHome.do?dispatch=deletePost"/>
<action path="/user/startAddPostFromHome" forward="/user/blogsControllerFromHome.do?dispatch=addPost&amp;from=Home"/>
<action path="/user/startEditPostFromHome" forward="/user/blogsControllerFromHome.do?dispatch=editPost&amp;from=Home"/>
<action path="/user/startDeletePostFromHome" forward="/user/blogsControllerFromHome.do?dispatch=deletePost&amp;from=Home"/>
 
<action path="/user/startSubmitBlogFromHome" forward="/user/blogsControllerFromHome.do?dispatch=start&amp;from=Home"/>
<action path="/user/startDeleteBlogFromHome" forward="/user/blogsControllerFromHome.do?dispatch=delete&amp;from=Home"/>
63,10 → 63,11
<forward name="from.add.role" path="page.submit.blog.from.home"/>
</action>
 
<action path="/user/startAddPostFromServiceZone" forward="/user/blogsControllerFromServiceZone.do?dispatch=addPost"/>
<action path="/user/startEditPostFromServiceZone" forward="/user/blogsControllerFromServiceZone.do?dispatch=editPost"/>
<action path="/user/startDeletePostFromServiceZone" forward="/user/blogsControllerFromServiceZone.do?dispatch=deletePost"/>
 
<action path="/user/startAddPostFromServiceZone" forward="/user/blogsControllerFromServiceZone.do?dispatch=addPost&amp;from=ServiceZone"/>
<action path="/user/startEditPostFromServiceZone" forward="/user/blogsControllerFromServiceZone.do?dispatch=editPost&amp;from=ServiceZone"/>
<action path="/user/startDeletePostFromServiceZone" forward="/user/blogsControllerFromServiceZone.do?dispatch=deletePost&amp;from=ServiceZone"/>
 
<action path="/user/startSubmitBlogFromServiceZone" forward="/user/blogsControllerFromServiceZone.do?dispatch=start&amp;from=ServiceZone"/>
<action path="/user/startDeleteBlogFromServiceZone" forward="/user/blogsControllerFromServiceZone.do?dispatch=delete&amp;from=ServiceZone"/>
<action path="/user/startEditBlogFromServiceZone" forward="/user/blogsControllerFromServiceZone.do?dispatch=edit&amp;from=ServiceZone"/>
/impl/src/java/pt/estgp/estgweb/domain/views/BlogPostView.java
28,6 → 28,7
private GenericUser owner;
private boolean status;
private BlogPost blogPost;
private long blogId;
 
public BlogPostView()
{
43,6 → 44,7
this.status = blogPost.isStatus();
this.id = blogPost.getId();
this.owner = blogPost.getOwner();
this.blogId = blogPost.getBlog().getId();
}
 
public void persistViewInObject(BlogPost blogPost)
55,6 → 57,11
}
 
 
public long getBlogId()
{
return blogId;
}
 
public long getId()
{
return id;
/impl/src/java/pt/estgp/estgweb/domain/views/UserView.java
105,6 → 105,7
 
public void persistViewInObjectUser(User user)
{
user.setName(name);
user.setOutEmail(outEmail);
user.setPop3server(pop3server);
user.setPop3username(pop3username);
/impl/src/web/admin/profile/profile.jsp
134,7 → 134,7
<bean:message key="name"/>
</th>
<td>
<html:text property="userView.name" maxlength="250" readonly="true" styleClass="readOnly"/>
<html:text property="userView.name" maxlength="250" readonly="true"/>
</td>
</tr>
<tr>
153,16 → 153,16
<html:text property="userView.zip" maxlength="8"/>
</td>
</tr>
<%--<tr>--%>
<%--<th>--%>
<%--<bean:message key="country"/>--%>
<%--</th>--%>
<%--<td>--%>
<%--<html:text property="userView.country" maxlength="100" readonly="true" styleClass="readOnly"/>--%>
<%--</td>--%>
<%--</tr>--%>
<tr>
<th>
<bean:message key="country"/>
</th>
<td>
<html:text property="userView.country" maxlength="100" readonly="true" styleClass="readOnly"/>
</td>
</tr>
<tr>
<th>
<bean:message key="phone.number"/>
</th>
<td>
/impl/src/web/css/style.css
210,15 → 210,30
margin-left: 10px;
margin-bottom:10px;
}
 
.files table
{
width:100%;
}
.files table td
{
padding-top:2px;
padding-bottom:3px;
padding-right: 20px;
border-top:1px solid black;
 
vertical-align:middle;
}
.files table tr.file td, .files table tr.dir td
{
border-top:1px solid black;
}
.files table th
{
text-align:left;
}
.files table th
{
text-align:left;
}
 
 
/*****************************************************************************************/
277,24 → 292,23
/****************** topnav **********************/
 
#topnav {
color: #FFFFFF;
color: black;
text-decoration: none;
BACKGROUND-COLOR: #8EC73F;
FONT: 11px / 20px "bitstream vera sans", "Lucida Grande", "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif
}
 
#topnav LI A:visited
{
COLOR: white;
}
#topnav LI A:hover {
COLOR: #4d4d4d;
COLOR: black;
BACKGROUND-COLOR: #FFFFFF
}
 
#topnav LI A:visited {
COLOR: black;
}
 
#topnav LI A {
color: #FFFFFF;
text-decoration: none;
color: white;
text-decoration: underline;
}
 
#topnav UL {
393,10 → 407,6
.portal {
}
 
.portalContent {
padding-left: 10px;
}
 
.columnTable td
{
margin-left: 10px;
405,11 → 415,6
vertical-align: top;
}
 
.portalContent {
padding-left: 10px;
padding-right: 10px;
}
 
.navLeftMenu h2 {
}
 
1154,8 → 1159,14
 
/*POP EMAIL*/
 
.messagesContainer
{
vertical-align:top;
}
 
.messages td, .dataTable td
 
/*.messages td*/
.dataTable td
{
border:1px solid #8ec73f;
 
1165,6 → 1176,8
border:1px solid darkgray;
text-align:center;
}
.messages
{ width:100%}
.dataTable input.removeButton, .form input.removeButton, .reminders * input.removeButton
{
cursor:pointer;
1178,7 → 1191,7
margin:0;
width:16px;
height:16px;
border:1px solid black;
border:0;
}
1233,7 → 1246,8
}
#activeReminders, #expiredReminders
{
border: 1px solid #8ec73f;
border-left: 1px solid #8ec73f;
border-right: 1px solid #8ec73f;
margin-top:10px;
margin-bottom:10px;
margin-left:0;
1244,13 → 1258,20
padding-right:0;
 
}
#activeReminders .title, #expiredReminders .title
#expiredReminders .title
{
padding:0;
background-color: lightcoral;
border:0;
 
}
#activeReminders .title
{
padding:0;
background-color: #8ec73f;
border:0;
 
}
#activeReminders .title td,#expiredReminders .title td
{text-align:right;}
 
/impl/src/web/js/ajax.js
266,6 → 266,19
/***************************************************
Reminders
***************************************************/
 
var activeRemindersCounter = 0;
var expiredRemindersCounter = 0;
 
function setActiveReminders(active)
{
activeRemindersCounter = active;
}
function setExpiredReminders(expired)
{
expiredRemindersCounter = expired;
}
 
var xmlHttpReminder;
var newReminderId;
var reminderFormId;
297,6 → 310,7
else
{
getObjectById(putMsgId).innerHTML = '<div class="statusOK">' + putOkMsg + '</div>';
activeRemindersCounter++;
show('activeReminders');
getObjectById(newReminderId).innerHTML = xmlHttpReminder.responseText + getObjectById(newReminderId).innerHTML;
}
308,21 → 322,51
getObjectById(putMsgId).innerHTML = '';
}
 
 
function deleteReminder(id,deleteReminderDiv,msgDiv,reminderFormDiv,action,waitMsg,okMsg,failMsg)
function deleteExpiredReminder(id,deleteReminderDiv,msgDiv,reminderFormDiv,action,waitMsg,okMsg,failMsg)
{
deleteReminder(id,deleteReminderDiv,msgDiv,reminderFormDiv,action,waitMsg,okMsg,failMsg,stateChangedDeleteExpiredReminderCall);
}
function deleteActiveReminder(id,deleteReminderDiv,msgDiv,reminderFormDiv,action,waitMsg,okMsg,failMsg)
{
deleteReminder(id,deleteReminderDiv,msgDiv,reminderFormDiv,action,waitMsg,okMsg,failMsg,stateChangedDeleteActiveReminderCall);
}
function deleteReminder(id,deleteReminderDiv,msgDiv,reminderFormDiv,action,waitMsg,okMsg,failMsg,callBack)
{
newReminderId = deleteReminderDiv;
reminderFormId = reminderFormDiv;
putMsgId = msgDiv;
putOkMsg = okMsg;
putFailMsg = failMsg;
getObjectById(putMsgId).innerHTML = waitMsg;
xmlHttpReminder=GetXmlHttpObject(stateChangedDeleteReminderCall);
startRequest(xmlHttpReminder,"dispatch=delete&id="+id,"",stateChangedDeleteReminderCall,"",action);
xmlHttpReminder=GetXmlHttpObject(callBack);
startRequest(xmlHttpReminder,"dispatch=delete&id="+id,"",callBack,"",action);
// hide(reminderFormId);
show(putMsgId);
}
 
function stateChangedDeleteExpiredReminderCall()
{
expiredRemindersCounter--;
stateChangedDeleteReminderCall();
if(expiredRemindersCounter <= 0)
{
hide('expiredReminders');
}
if(expiredRemindersCounter < 0)
expiredRemindersCounter = 0;
}
function stateChangedDeleteActiveReminderCall()
{
stateChangedDeleteReminderCall();
activeRemindersCounter--;
 
if(activeRemindersCounter <= 0)
{
hide('activeReminders');
}
if(activeRemindersCounter < 0)
activeRemindersCounter = 0;
}
function stateChangedDeleteReminderCall()
{
if (xmlHttpReminder.readyState==4 || xmlHttpReminder.readyState=="complete")
/impl/src/web/layout/topnav.jsp
15,15 → 15,14
if (navPlace.getUrl() != null)
{
%>
<li class="navPlace"><a
href="<%=request.getContextPath() + navPlace.getUrl()%>"><%=navPlace.getMessage(request)%>
</a> &gt;</li>
<li class="navPlace"><a href="<%=request.getContextPath() + navPlace.getUrl()%>"><%=navPlace.getMessage(request)%></a> &gt;</li>
<%
}
else
{
%>
<li class="navPlace"><%=navPlace.getMessage(request)%>
<li class="navPlace">
<%=navPlace.getMessage(request)%>
</li>
<%
}
/impl/src/web/public/portals/alunos/student.jsp
3,7 → 3,6
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
<div class="portal">
<div class="portalContent">
<table class="columnTable" width="100%">
<tbody>
<tr>
32,5 → 31,4
</tr>
</tbody>
</table>
</div>
</div>
/impl/src/web/public/portals/Docentes/teacher.jsp
3,7 → 3,6
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
<div class="portal">
<div class="portalContent">
<table class="columnTable" width="100%">
<tbody>
<tr>
30,5 → 29,4
</tr>
</tbody>
</table>
</div>
</div>
/impl/src/web/public/portals/antigosAlunos/oldStudent.jsp
3,7 → 3,6
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
<div class="portal">
<div class="portalContent">
<table class="columnTable" width="100%">
<tbody>
<tr>
28,5 → 27,4
</tr>
</tbody>
</table>
</div>
</div>
/impl/src/web/public/portals/futurosAlunos/futureStudent.jsp
3,7 → 3,6
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
<div class="portal">
<div class="portalContent">
<table class="columnTable" width="100%">
<tbody>
<tr>
34,5 → 33,4
</tr>
</tbody>
</table>
</div>
</div>
/impl/src/web/public/announcements/announcementsPortalRight.jsp
39,6 → 39,21
<logic:present name="Announcements">
<logic:notEmpty name="Announcements">
<table>
<baco:isAuthenticated>
<tr>
<td colspan="2" class="remindersContainer">
<jsp:include page="/user/reminders/reminders.jsp"/>
</td>
</tr>
<tr>
<td colspan="2" class="messagesContainer"><jsp:include page="/user/pop/messagesContainer.jsp"/></td>
</tr>
</baco:isAuthenticated>
<tr>
<td colspan="2">
<h1><bean:message key="announcements"/></h1>
</td>
</tr>
<logic:iterate id="item" name="Announcements" type="pt.estgp.estgweb.domain.views.AnnouncementView">
<tr>
<td width="25%">
/impl/src/web/user/home.jsp
14,13 → 14,12
<jsp:include page="/public/announcements/announcementsPortalLeft.jsp?role=student&from=Home"/>
</td>
<td class="contentPortal">
<jsp:include page="/public/portals/alunos/student.jsp"/>
<table width="100%" cellpadding="0" cellspacing="0" class="portalServices">
<tr>
<td class="messagesContainer"><jsp:include page="/user/pop/messagesContainer.jsp"/></td>
<td class="remindersContainer"><jsp:include page="/user/reminders/reminders.jsp"/></td>
</tr>
</table>
<jsp:include page="/user/home/student.jsp"/>
<%--<table width="100%" cellpadding="0" cellspacing="0" class="portalServices">--%>
<%--<tr>--%>
<%--<td class="messagesContainer"><jsp:include page="/user/pop/messagesContainer.jsp"/></td>--%>
<%--</tr>--%>
<%--</table>--%>
</td>
<td id="rightPagePortal">
<jsp:include page="/public/announcements/announcementsPortalRight.jsp?role=student&from=Home"/>
36,12 → 35,11
</td>
<td class="contentPortal">
<jsp:include page="/public/portals/Docentes/teacher.jsp"/>
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td class="messagesContainer"><jsp:include page="/user/pop/messagesContainer.jsp"/></td>
<td class="remindersContainer"><jsp:include page="/user/reminders/reminders.jsp"/></td>
</tr>
</table>
<%--<table width="100%" cellpadding="0" cellspacing="0">--%>
<%--<tr>--%>
<%--<td class="messagesContainer"><jsp:include page="/user/pop/messagesContainer.jsp"/></td>--%>
<%--</tr>--%>
<%--</table>--%>
</td>
<td id="rightPagePortal">
<jsp:include page="/public/announcements/announcementsPortalRight.jsp?role=teacher&from=Home"/>
57,14 → 55,15
<jsp:include page="/public/announcements/announcementsPortalLeft.jsp?role=all&from=Home"/>
</td>
<td class="contentPortal">
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td class="messagesContainer"><jsp:include page="/user/pop/messagesContainer.jsp"/></td>
<td class="remindersContainer"><jsp:include page="/user/reminders/reminders.jsp"/></td>
</tr>
</table>
<%--<table width="100%" cellpadding="0" cellspacing="0">--%>
<%--<tr>--%>
<%--<td class="messagesContainer"><jsp:include page="/user/pop/messagesContainer.jsp"/></td>--%>
 
<%--</tr>--%>
<%--</table> --%>
</td>
<td id="rightPagePortal">
 
<jsp:include page="/public/announcements/announcementsPortalRight.jsp?role=all&from=Home"/>
</td>
</tr>
/impl/src/web/user/ftpclient/ftpclient.jsp
91,9 → 91,22
if(upDir != null)
{
%>
<tr><td colspan="3"><a href="<%=upDir.getUrl()%>"> .. </a></td></tr>
<tr><td colspan="3"> .. [ <a class="updir" href="<%=upDir.getUrl()%>"><bean:message key="file.up.dir"/></a> ]</td></tr>
<%
}
%>
<tr>
<th>
<bean:message key="file.name"/>
</th>
<th>
<bean:message key="file.date"/>
</th>
<th>
<bean:message key="file.size"/>
</th>
</tr>
<%
if (iFiles.size() > 0)
{
%>
103,7 → 116,7
if (i.isDirectory())
{
%>
<tr>
<tr class="dir">
<td colspan="3">
<img alt="<%=i.getCompleteUrl()%>" src="<%=request.getContextPath()%>/imgs/folder.gif">&nbsp;<a
href="<%=URIUtil.encodePath(i.getName(),"ISO-8859-1")%>/"><%=i.getName()%>
121,7 → 134,7
if (!i.isDirectory())
{
%>
<tr>
<tr class="file">
<td>
 
<%
/impl/src/web/user/home/student.jsp
New file
0,0 → 1,66
<%--
Created by IntelliJ IDEA.
User: Jorge
Date: 29/Mai/2008
Time: 20:13:53
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<div class="portal">
<table class="columnTable" width="100%">
<tbody>
<tr>
<td class="column">
<div class="block">
<p>As minhas Unidades Curriculares</p>
<ul>
<li>
<a href="#">Projecto</a>
</li>
</ul>
</div>
</td>
<td class="column">
<div class="block">
<p>Os Anuncios das Minhas Unidades</p>
<ul>
<li>
<a href="#">O trabalho de TLV foi adiado uma semana porque as tintas não estavam boas</a>
</li>
</ul>
</div>
<div class="block">
<p>Os meus Afazeres</p>
<ul>
<li>
<a href="#">Inquerito de Docentes e Unidades (6)</a>
</li>
</ul>
</div>
</td>
<td class="column">
<div class="block">
<p>Ficheiros Úteis</p>
<ul>
<li>
<a href="#">Modelo de comunicação interna</a>
</li>
<li>
<a href="#">Justificação de Presença</a>
</li>
<li>
<a href="#">Justificação de Faltas</a>
</li>
<li>
<a href="#">Modelo de Bolsa</a>
</li>
<li>
<a href="#">Modelo de Bolsa</a>
</li>
</ul>
</div>
</td>
</tr>
</tbody>
</table>
</div>
/impl/src/web/user/reminders/reminders.jsp
16,7 → 16,26
Object[] args = new Object[]{};
IOwnedReminders reminders = (IOwnedReminders) sm.execute(RequestUtils.getRequester(request, response), "LoadOwnerReminders", args, names);
request.setAttribute("IOwnedReminders", reminders);
 
%>
<script type="text/javascript">
<!--
<%
if(reminders.getActiveReminders() != null)
{
%>
setActiveReminders(<%=reminders.getActiveReminders().size()%>);
<% }
if(reminders.getExpiredReminders() != null)
{
%>
setExpiredReminders(<%=reminders.getExpiredReminders().size()%>);
-->
<%
}
%>
</script>
 
<jsp:useBean id="IOwnedReminders" type="pt.estgp.estgweb.services.reminders.IOwnedReminders" scope="request"/>
 
<div class="reminders">
97,7 → 116,7
<tr>
<td>
<input type="button" class="removeButton"
onclick="deleteReminder('${item.id}','reminder${item.id}','reminderStatus','reminderForm','<%=request.getContextPath()%>/user/deleteReminder.do','<bean:message key="wait"/>','<bean:message key="reminder.deleted.success"/>','<bean:message key="reminder.deleted.fail"/>')"/>
onclick="deleteActiveReminder('${item.id}','reminder${item.id}','reminderStatus','reminderForm','<%=request.getContextPath()%>/user/deleteReminder.do','<bean:message key="wait"/>','<bean:message key="reminder.deleted.success"/>','<bean:message key="reminder.deleted.fail"/>')"/>
</td>
<td align="right">
${item.textSummary}
144,7 → 163,7
<tr>
<td>
<input type="button" class="removeButton"
onclick="deleteReminder('${item.id}','reminder${item.id}','reminderStatus','reminderForm','<%=request.getContextPath()%>/user/deleteReminder.do','<bean:message key="wait"/>','<bean:message key="reminder.deleted.success"/>','<bean:message key="reminder.deleted.fail"/>')"/>
onclick="deleteExpiredReminder('${item.id}','reminder${item.id}','reminderStatus','reminderForm','<%=request.getContextPath()%>/user/deleteReminder.do','<bean:message key="wait"/>','<bean:message key="reminder.deleted.success"/>','<bean:message key="reminder.deleted.fail"/>')"/>
</td>
<td align="right">
${item.textSummary}
/impl/src/web/user/reminders/putReminder.jsp
21,14 → 21,15
{
%>
<jsp:useBean id="ReminderView" type="pt.estgp.estgweb.domain.views.ReminderView" scope="request"/>
<div class="reminder">
<div id="reminder${ReminderView.id}">
 
<div id="reminder${ReminderView.id}">
<div class="reminder">
<div class="topic">
<table cellpadding="0" cellspacing="0" width="100%">
<tr>
<td>
<input type="button" class="removeButton"
onclick="deleteReminder('${ReminderView.id}','reminder${ReminderView.id}','reminderStatus','reminderForm','<%=request.getContextPath()%>/user/deleteReminder.do','<bean:message key="wait"/>','<bean:message key="reminder.deleted.success"/>','<bean:message key="reminder.deleted.fail"/>')"/>
onclick="deleteActiveReminder('${ReminderView.id}','reminder${ReminderView.id}','reminderStatus','reminderForm','<%=request.getContextPath()%>/user/deleteReminder.do','<bean:message key="wait"/>','<bean:message key="reminder.deleted.success"/>','<bean:message key="reminder.deleted.fail"/>')"/>
</td>
<td align="right">
${ReminderView.textSummary}
/impl/src/web/user/serviceZone/serviceZone.jsp
218,7 → 218,7
%>
<tr>
<td>
<a href="<%=request.getContextPath()%>/user/startLoadBlogFromServiceZone.do?id=<%=b.getId()%>"><%=b.getTitle()%>
<a href="<%=request.getContextPath()%>/user/startLoadBlogFromServiceZone.do?id=<%=b.getBlogId()%>"><%=b.getTitle()%>
</a></td>
<td>
<%
/impl/src/web/user/pop/messages.jsp
13,6 → 13,7
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
<jsp:useBean id="UserSession" type="pt.estgp.estgweb.domain.UserSession" scope="request"/>
<div class="pop">
<%
IServiceManager sm = ServiceManager.getInstance();
39,21 → 40,18
else
{
%>
<p>
<bean:message key="pop.title"/>
</p>
<table class="messages">
<tr>
<th>
<bean:message key="pop.subject"/>
<bean:message key="pop.title" arg0="${UserSession.user.pop3username}"/>
</th>
<th>
<bean:message key="pop.from"/>
</th>
<th>
<bean:message key="pop.date"/>
</th>
<%--<th>--%>
<%--<bean:message key="pop.from"/>--%>
<%--</th>--%>
<%--<th>--%>
<%--<bean:message key="pop.date"/>--%>
<%--</th>--%>
<%--<th>--%>
<%--<bean:message key="pop.text"/>--%>
<%--</th>--%>
</tr>
79,21 → 77,21
<%
}
%>
<td>
<%
for (IAddress a : popEmail.getFrom())
{
if (a.getName() != null)
out.print(a.getName());
%>
<%="&lt;" + a.getEmail() + "&gt;"%>
<%
}
%>
</td>
<td>
<%=popEmail.getDate()%>
</td>
<%--<td>--%>
<%--<%--%>
<%--for (IAddress a : popEmail.getFrom())--%>
<%--{--%>
<%--if (a.getName() != null)--%>
<%--out.print(a.getName());--%>
<%--%>--%>
<%--<%="&lt;" + a.getEmail() + "&gt;"%>--%>
<%--<%--%>
<%--}--%>
<%--%>--%>
<%--</td>--%>
<%--<td>--%>
<%--<%=popEmail.getDate()%>--%>
<%--</td>--%>
<%--<td><%if(popEmail.getFragment()!=null){out.print(popEmail.getFragment());}%></td>--%>
</tr>
<%
101,7 → 99,7
{
%>
<tr id="<%="messages" + i%>" style="position:absolute;visibility:hidden;">
<td class="message" colspan="3">
<td class="message" colspan="1">
<%=popEmail.getText()%>
</td>
</tr>