Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 129 → Rev 130

/impl/conf/language/MessageResourcesAnnouncements.properties
35,6 → 35,8
announcement.style.img.left=Imagem à esquerda
announcement.style.img.right=Imagem à direita
announcement.style.img.top=Imagem em cima
announcement.style.img.embedded.left=Imagem embebida à esquerda
announcement.style.img.embedded.right=Imagem embebida à direita
 
announcement.internal.url.include.yes=Incluir o conteudo
announcement.internal.url.include.no=Referênciar o conteudo
/impl/src/java/pt/estgp/estgweb/domain/enums/AnnoucementStyleEnum.java
File deleted
/impl/src/java/pt/estgp/estgweb/domain/enums/AnnouncementStyleEnum.java
New file
0,0 → 1,39
package pt.estgp.estgweb.domain.enums;
 
/**
* Created by IntelliJ IDEA.
* User: Jorge Machado
* Date: 14/Mai/2008
* Time: 12:24:35
* To change this template use File | Settings | File Templates.
*/
public enum AnnouncementStyleEnum {
imgLeft("announcement.style.img.left"),
imgRight("announcement.style.img.right"),
imgTop("announcement.style.img.top"),
imgEmbeddedLeft("announcement.style.img.embedded.left"),
imgEmbeddedRight("announcement.style.img.embedded.right");
 
private String messageKey;
 
private AnnouncementStyleEnum(String messageKey)
{
this.messageKey = messageKey;
}
 
public String getMessageKey()
{
return messageKey;
}
 
 
public static AnnouncementStyleEnum parse(String type)
{
for(AnnouncementStyleEnum styleEnum: values())
{
if(styleEnum.getMessageKey().equals(type))
return styleEnum;
}
return null;
}
}
/impl/src/java/pt/estgp/estgweb/domain/views/AnnouncementView.java
3,6 → 3,7
import pt.estgp.estgweb.domain.Announcement;
import pt.estgp.estgweb.domain.Image;
import pt.estgp.estgweb.domain.AnnouncementImpl;
import pt.estgp.estgweb.domain.enums.AnnouncementStyleEnum;
import pt.estgp.estgweb.utils.RoleManager;
import pt.estgp.estgweb.utils.ConfigProperties;
 
100,6 → 101,11
return style;
}
 
public AnnouncementStyleEnum getStyleEnum()
{
return AnnouncementStyleEnum.parse(style);
}
 
public void setStyle(String style) {
this.style = style;
}
/impl/src/web/admin/announcements/submitAnnouncement.jsp
155,6 → 155,8
<html:option value="announcement.style.img.left"><bean:message key="announcement.style.img.left"/></html:option>
<html:option value="announcement.style.img.right"><bean:message key="announcement.style.img.right"/></html:option>
<html:option value="announcement.style.img.top"><bean:message key="announcement.style.img.top"/></html:option>
<html:option value="announcement.style.img.top"><bean:message key="announcement.style.img.embedded.left"/></html:option>
<html:option value="announcement.style.img.top"><bean:message key="announcement.style.img.embedded.right"/></html:option>
</html:select>
</td>
</tr>
/impl/src/web/public/announcements/loadAnnouncement.jsp
2,45 → 2,132
<%@ page import="org.apache.struts.util.RequestUtils" %>
<%@ page import="pt.estgp.estgweb.domain.UserSessionImpl" %>
<%@ page import="pt.estgp.estgweb.web.UserSessionProxy" %>
<%@ page import="pt.estgp.estgweb.domain.enums.AnnouncementStyleEnum" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
<jsp:useBean id="Announcement" type="pt.estgp.estgweb.domain.views.AnnouncementView" scope="request"/>
<% UserSessionImpl userSession = (UserSessionImpl) UserSessionProxy.loadUserSession(request);%>
<html:link href="http://www.sapo.pt"> </html:link>
<html:link href="http://www.sapo.pt"></html:link>
<div class="seccao">
<h2>${Announcement.title}
<%if((userSession.getUser().getId()==Announcement.getOwnerID())||(userSession.getUser().getRoles().contains("all"))||(userSession.getUser().getRoles().contains("admin"))){%>
<html:link action="/loadAnnouncement?id=${Announcement.id}&dispatch=edit"> Editar</html:link><%}%>
</h2>
<p>
<%
if(Announcement.getBigImage() != null)
{
%>
<h2>${Announcement.title}
<%if ((userSession.getUser().getId() == Announcement.getOwnerID()) || (userSession.getUser().getRoles().contains("all")) || (userSession.getUser().getRoles().contains("admin"))) {%>
<html:link action="/loadAnnouncement?id=${Announcement.id}&dispatch=edit"> Editar</html:link>
<%}%>
</h2>
<%
AnnouncementStyleEnum styleEnum = Announcement.getStyleEnum();
if (styleEnum == AnnouncementStyleEnum.imgEmbeddedLeft || styleEnum == AnnouncementStyleEnum.imgEmbeddedRight) {
String align = "left";
if (styleEnum == AnnouncementStyleEnum.imgEmbeddedRight)
align = "right";
%>
 
 
<p>
<div class="imageAnnouncement">
<img align="left" alt="<%=Announcement.getTitle()%>" src="<%=request.getContextPath()%>/imageStream/<%=Announcement.getBigImage().getId()%>">
<%
if (Announcement.getBigImage() != null) {
%>
<img align="<%=align%>" alt="<%=Announcement.getTitle()%>"
src="<%=request.getContextPath()%>/imageStream/<%=Announcement.getBigImage().getId()%>">
<%
} else if (Announcement.getSmallImage() != null) {
%>
<img align="<%=align%>" alt="<%=Announcement.getTitle()%>"
src="<%=request.getContextPath()%>/imageStream/<%=Announcement.getSmallImage().getId()%>">
<%
}
%>
</div>
<%
}
else if(Announcement.getSmallImage() != null)
{
%>
<div class="imageAnnouncement">
<img align="left" alt="<%=Announcement.getTitle()%>" src="<%=request.getContextPath()%>/imageStream/<%=Announcement.getSmallImage().getId()%>">
</div>
<%
}
%>
${Announcement.formatedText}
<%
if(Announcement.getUrl()!=null)
{
if (Announcement.getUrl() != null) {
%>
<html:link href="${Announcement.url}">Ver +</html:link>
<%
}%>
</p>
</p>
<%
} else if (styleEnum == AnnouncementStyleEnum.imgTop) {
%>
<table>
<tr>
<td>
<div class="imageAnnouncement">
<%
if (Announcement.getBigImage() != null) {
%>
<img alt="<%=Announcement.getTitle()%>"
src="<%=request.getContextPath()%>/imageStream/<%=Announcement.getBigImage().getId()%>">
<%
} else if (Announcement.getSmallImage() != null) {
%>
<img alt="<%=Announcement.getTitle()%>"
src="<%=request.getContextPath()%>/imageStream/<%=Announcement.getSmallImage().getId()%>">
<%
}
%>
</div>
</td>
</tr>
<tr>
<td>${Announcement.formatedText}</td>
</tr>
</table>
<%
} else if (styleEnum == AnnouncementStyleEnum.imgLeft) {
%>
<table>
<tr>
<td>
<div class="imageAnnouncement">
<%
if (Announcement.getBigImage() != null) {
%>
<img alt="<%=Announcement.getTitle()%>"
src="<%=request.getContextPath()%>/imageStream/<%=Announcement.getBigImage().getId()%>">
<%
} else if (Announcement.getSmallImage() != null) {
%>
<img alt="<%=Announcement.getTitle()%>"
src="<%=request.getContextPath()%>/imageStream/<%=Announcement.getSmallImage().getId()%>">
<%
}
%>
</div>
</td>
<td>${Announcement.formatedText}</td>
</tr>
</table>
<%
} else if (styleEnum == AnnouncementStyleEnum.imgRight) {
%>
<table>
<tr>
<td>${Announcement.formatedText}</td>
<td>
<div class="imageAnnouncement">
<%
if (Announcement.getBigImage() != null) {
%>
<img alt="<%=Announcement.getTitle()%>"
src="<%=request.getContextPath()%>/imageStream/<%=Announcement.getBigImage().getId()%>">
<%
} else if (Announcement.getSmallImage() != null) {
%>
<img alt="<%=Announcement.getTitle()%>"
src="<%=request.getContextPath()%>/imageStream/<%=Announcement.getSmallImage().getId()%>">
<%
}
%>
</div>
</td>
</tr>
</table>
<%
}
%>
</div>