Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 153 → Rev 155

/impl/conf/language/MessageResourcesIntranet.properties
New file
0,0 → 1,11
################################################################################
#
# INTRANET MESSAGE RESOURCES
#
################################################################################
intranet.services=Os Meus Serviços
intranet.todo=Os Meus Afazeres
intranet.editable.blogs=Os Blogs Onde Posso Publicar
intranet.my.announcements=Os Anúncios Colocados por Mim
intranet.my.blogs=Os Meus Blogs
intranet.course.units.announcements=Anúncios da Minhas Unidades
/impl/conf/WEB-INF/struts/struts-default.xml
123,7 → 123,7
</action>
 
<!--Profile-->
<action path="/startEditProfile" forward="/profile.do?dispatch=changeProfile"/>
<action path="/startEditProfile" forward="/user/profile.do?dispatch=changeProfile"/>
<action path="/findProfile" forward="page.find.profile"/>
 
 
/impl/conf/WEB-INF/struts/tiles-announcements.xml
17,5 → 17,5
<put name="title" value="Load Announcement" />
<put name="body" value="/public/announcements/loadAnnouncement.jsp" />
</definition>
 
</tiles-definitions>
/impl/conf/WEB-INF/struts/tiles-intranet.xml
1,30 → 1,34
<?xml version="1.0" encoding="UTF-8" ?>
 
<!--<!DOCTYPE tiles-definitions PUBLIC-->
<!--"-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"-->
<!--"http://struts.apache.org/dtds/tiles-config_1_1.dtd">-->
<!DOCTYPE tiles-definitions PUBLIC
"-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
"http://struts.apache.org/dtds/tiles-config_1_1.dtd">
 
 
<tiles-definitions>
 
<definition name="base.separators" extends="base.definition" path="/layout/layoutintranet.jsp">
<put name="header" value="/layout/headerIntranet.jsp"/>
<put name="navigationTop" value="/layout/topnavempty.jsp"/>
<put name="separators" value="/layout/separators.jsp" />
<put name="separators" value="/layout/separators.jsp"/>
</definition>
 
 
<definition name="page.separators.serviceZone" extends="base.separators">
<put name="body" value="/user/serviceZone/serviceZone.jsp" />
<put name="body" value="/user/serviceZone/serviceZone.jsp"/>
</definition>
 
<definition name="page.separators.profile" extends="base.separators">
<put name="body" value="/admin/profile/profile.jsp" />
<put name="body" value="/admin/profile/profile.jsp"/>
</definition>
 
<definition name="page.separators.home" extends="base.separators">
<put name="body" value="/user/home.jsp" />
<put name="body" value="/user/home.jsp"/>
</definition>
 
<definition name="page.submit.announcement.intranet" extends="base.separators">
<put name="title" value="Load Announcement"/>
<put name="body" value="/admin/announcements/submitAnnouncement.jsp"/>
</definition>
 
</tiles-definitions>
/impl/conf/WEB-INF/struts/struts-announcements.xml
21,6 → 21,7
 
<action-mappings>
<action path="/startSubmitAnnouncement" forward="/loadAnnouncement.do?dispatch=start"/>
<action path="/startSubmitAnnouncementIntranet" forward="/loadAnnouncementIntranet.do?dispatch=start&amp;separator=4"/>
<action path="/submitAnnouncement"
type="pt.estgp.estgweb.web.controllers.announcements.AnnouncementsController"
name="AnnouncementsForm"
41,8 → 42,18
<forward name="success" path="page.welcome"/>
<forward name="load" path="page.load.announcement"/>
<forward name="submit" path="page.submit.announcement"/>
 
</action>
<action path="/loadAnnouncementIntranet"
type="pt.estgp.estgweb.web.controllers.announcements.AnnouncementsController"
name="AnnouncementsForm"
scope="request"
parameter="dispatch"
input="page.submit.announcement"
validate="false">
<forward name="success" path="page.welcome"/>
<forward name="load" path="page.submit.announcement.intranet"/>
<forward name="submit" path="page.submit.announcement.intranet"/>
</action>
</action-mappings>
 
</struts-config>
/impl/src/java/pt/estgp/estgweb/web/tags/IsAdminTag.java
16,11 → 16,16
private static final Logger logger = Logger.getLogger(IsAdminTag.class);
 
 
/**
*
* @return
* @throws JspException
*/
public int doStartTag() throws JspException
{
if (go())
{
return EVAL_BODY_TAG;
return EVAL_BODY_BUFFERED;
}
else
return SKIP_BODY;
/impl/src/web/public/announcements/loadAnnouncement.jsp
12,7 → 12,7
<% UserSessionImpl userSession = (UserSessionImpl) UserSessionProxy.loadUserSession(request, response);%>
<html:link href="http://www.sapo.pt"></html:link>
<div class="seccao">
<h2>${Announcement.title}
<h2>${Announcement.title}
<estgweb:canManage name="Announcement">
<html:link action="/loadAnnouncement?id=${Announcement.id}&dispatch=edit">
<bean:message key="edit"/>
/impl/src/web/user/serviceZone/serviceZone.jsp
4,6 → 4,12
<%@ page import="pt.utl.ist.berserk.logic.serviceManager.IServiceManager" %>
<%@ page import="pt.utl.ist.berserk.logic.serviceManager.ServiceManager" %>
<%@ page import="java.util.List" %>
<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %>
<%@ 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/struts-tiles.tld" prefix="tiles" %>
<%@ taglib uri="/WEB-INF/tlds/estgweb.tld" prefix="estgweb" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
 
<%
29,10 → 35,28
 
<div class="block">
<div class="head">
Os meus afazeres
<bean:message key="intranet.services"/>
</div>
<ul>
<li>
<html:link action="/startSubmitAnnouncementIntranet">
<bean:message key="submit.announcement"/>
</html:link>
</li>
<li>
<html:link action="/startSubmitBlog">
<bean:message key="submit.blog"/>
</html:link>
</li>
</ul>
</div>
<div class="block">
<div class="head">
<bean:message key="intranet.todo"/>
</div>
<ul>
<li>
<a href="#">(validar anúncio) Concurso de Pesca ESTG ...</a>
</li>
<li>
46,24 → 70,28
</li>
</ul>
</div>
 
</td>
<td class="column">
<div class="block">
<div class="head">
Serviços Disponiveis
<bean:message key="intranet.editable.blogs"/>
</div>
<ul>
<li>
<a href="#">Criar um Blog</a>
<a href="#">Blog de Arquitecturas Tecnoligicas de Sistemas de Informação</a>
</li>
<li>
<a href="#">Colocar um Anúncio</a>
<a href="#">Blog de Programação WEB e Equipamentos Móveis</a>
</li>
<li>
<a href="#">Blog de Projecto</a>
</li>
</ul>
</div>
</td>
<td class="column">
<div class="block">
<div class="head">
Blogs onde posso publicar
<bean:message key="intranet.my.blogs"/>
</div>
<ul>
<li>
77,11 → 105,28
</li>
</ul>
</div>
 
<div class="block">
<div class="head">
<bean:message key="intranet.my.announcements"/>
</div>
<ul>
<li>
<a href="#">Blog de Arquitecturas Tecnoligicas de Sistemas de Informação</a>
</li>
<li>
<a href="#">Blog de Programação WEB e Equipamentos Móveis</a>
</li>
<li>
<a href="#">Blog de Projecto</a>
</li>
</ul>
</div>
</td>
<td class="column">
<div class="block">
<div class="head">
Anuncios das minhas unidades
<bean:message key="intranet.course.units.announcements"/>
</div>
<ul>
<li>