WebSVN - bacoAlunos - Path Comparison

Ignore whitespace Rev 35 → Rev 62

 /log.txt
 ,5 → 1,5
-Estão feitos os templates base para o pedro começar a fazer as paginas á vontade.
-Foi criado dois tipos diferentes de templates:
-*templatePortal-template mais especifico para as páginas que vão ter listas de links para outras páginas
-*templatePage-template genérico com o qual o pedro têm vários objectos para poder contruir grande parte dos sites da escola
+-Auto validação a funcionar
+-Corrigido noticias do lado esquerdo nos portais o tipo que aparecia estava errado
+-No index os announcements center e bottom já carregam as imagens da base de dados, carregam o tipo de noticas certo
+-Acrescentado links para cantinas e associação de estudantes nos alunos (falta por a redirecionar)
+-Atribuição automatica de roles atraves do LDAP feita (fazer alguns testes)

 /impl/conf/language/MessageResourcesAnnouncements.properties
 ,13 → 11,22
 announcement.bigImage=Imagem Grande
 announcement.smallImage=Imagem Pequena
 announcement.typeAnnouncement=Tipo
+announcement.sendAnnouncementLike=Enviar como
 announcement.priorityAnnouncement=Prioridade
 announcement.linkAnnouncement=Url
 announcement.target.roles=Pessoas a quem destina
 announcement.created.success=Anúncio criado com sucesso
 announcement.edited.success=Anúncio alterado com sucesso
+announcement.status=Válido
 announcements.type.news=Notícias
 announcements.type.top.flash.news=Destaques
 announcements.type.bottom.flash.news=Destaques Secundarios
+announcement.protocol.error.http=http
+announcement.protocol.error.https=https
+announcement.protocol.error.ftp=ftp
+announcements.loading=carregando anúncio...

 /impl/conf/language/MessageResources.properties
 ,6 → 19,7
 errors.minlength={0} can not be less than {1} characters.
 errors.range={0} is not in the range {1} through {2}.
 errors.required=Por favor preencha o {0}.
+errors.notrequired=Por favor retire o {0} do {1}.
 errors.byte={0} must be an byte.
 errors.date={0} is not a date.
 errors.double={0} must be an double.
 ,13 → 72,15
 user.role.worker=Funcionário
 user.role.invited=Convidado
 user.role.services=Serviços
-user.role.administrativeCouncil=Concelho Administrativo
+user.role.administrativeCouncil=Concelho Directivo
+user.role.representativeCouncil=Concelho de Representantes
 user.role.scientificCouncil=Concelho Científico
 user.role.erasmusCouncil=Concelho Erasmus
 user.role.pedagogicCouncil=Concelho Pedagógico
 user.role.courseCoordinator=Coordenador
 user.role.futureStudent=Futuros Alunos
 user.role.oldStudent=Antigos Alunos
+user.role.sudentAssociation=Associação de Estudantes
 #Filter Errors
 ,6 → 106,104
 staff.header=Informação para funcionários docentes e não docentes
 staff=Docentes
+#Menus Portais
+portal.orgaos=Orgãos
+portal.conselho.pedagogico=Conselho Pedagógico
+portal.conselho.cientifico=Conselho Cientifico
+portal.conselho.directivo=Conselho Directivo
+portal.assembleia.representantes=Assembleia de Representantes
+portal.mobilidade=Mobilidade
+portal.mobilidade.alunos.estrangeiros=Os alunos estrangeiros na estg
+portal.mobilidade.alunos.estg.estrangeiro=Os alunos da estg no estrangeiro
+portal.mobilidade.docentes.estrangeiros=Os docentes estrangeiros na estg
+portal.mobilidade.docentes.estg.estrangeiro=Os docentes da estg no estrangeiro
+portal.mobilidade.protocolos.internacionais=Protocolos internacionais
+portal.mobilidade.candidaturas=Candidaturas
+portal.mobilidade.programa.erasmus=Programa Erasmus
+portal.accao.social=Acção social
+portal.accao.social.cantinas=Cantinas
+portal.accao.social.residencias=Residências
+portal.accao.social.ementas=Ementas
+portal.accao.social.desporto.cultura=Desporto e cultura
+portal.accao.social.apoio.psicopedagogico=Apoio psicopedagógico
+portal.accao.social.bolsa.estudo=Bolsa de estudo
+portal.accao.social.alimentacao=Alimentação
+portal.accao.social.alojamento=Alojamento
+portal.accao.social.apoio.medico=Apoio médico
+portal.accao.social.gapp=GAPP
+portal.accao.social.informacoes=Informações
+portal.instituto.politecnico=Instituto politécnico
+portal.instituto.politecnico.servicos.centrais=Serviços centrais
+portal.instituto.politecnico.loja.alunos=Loja do aluno
+portal.instituto.politecnico.merchandising=Merchandising
+portal.instituto.politecnico.cultura.lazer=Cultura e lazer
+portal.paginas.alunos=Páginas dos Alunos
+portal.paginas.exemplo=Exemplo
+portal.paginas.alunos.assessoria=Assessoria de Administração
+portal.paginas.nucleo.engenharia=Nucleo de Engenharia
+portal.servicos.online=Serviços on-line
+portal.servicos.online.webmail=Webmail
+portal.servicos.online.eduroam=Eduroam
+portal.servicos.online.secretaria=Secretaria
+portal.servicos.online.in.estg=In-estg
+portal.servicos.online.biblioteca.online=Biblioteca online
+portal.servicos.online.n.zero=N.zero
+portal.servicos.online.academicos.online=Académicos online
+portal.servicos.online.portal.assiduidade=Portal de assiduidade
+portal.servicos.online.sisgom.ocorrencias=Sisgom ocorrências
+portal.servicos.online.siadap=Siadap
+portal.servicos.online.portal.academicos.online=Portal académicos online
+portal.servicos.online.gabinete.comunicacao=Gabinete de Comunicação
+portal.servicos.online.regie=Régie
+portal.servicos.online.centro.informatico=Centro informático
+portal.servicos.online.reprografia=Reprografia
+portal.actividades=Actividades
+portal.actividades.semana.engenharia=Semada de Engenharia
+portal.actividades.jornadas.ciencias.empresariais=Jornadas C. Empresariais
+portal.actividades.Seminario.design=Seminário de Design
+portal.actividades.outras.actividades=Outras actividades
+portal.formacao.pos.graduada=Formação Pos-Graduada
+portal.contactos=Contactos
+portal.contactos.gerais.estg=Contactos gerais estg
+portal.contactos.areas.cientificas=Áreas ciêntificas
+portal.contactos.secretaria=Secretaria
+portal.contactos.centro.informatico=Centro informático
+portal.contactos.reprografia=Reprografia
+portal.contactos.docentes=Docentes
+portal.contactos.associacao.estudantes=Associação de Estudantes
+portal.contactos.gabinete.comunicacao=Gabinete de Comunicação
+portal.contactos.aaaipp=AAAIPP
+portal.contactos.conselho.directivo=Conselho Directivo
+portal.informacao.academica=Informação académica
+portal.informacao.academica.calendario.escolar=Calendário escolar
+portal.informacao.academica.licenciaturas=Licenciaturas
+portal.informacao.academica.mestrados=Mestrados
+portal.informacao.academica.pos.graduacoes=Pós-graduações
+portal.informacao.academica.cets=Cet´s
+portal.informacao.academica.outras.formacoes=Outras Formações
+portal.informacao.academica.maiores.23=Maiores de 23
+portal.estg=A ESTG
+portal.estg.mensagem.presidente=Mensagem do presidente
+portal.estg.como.chegar.estg=Como chegar à ESTG
+portal.estg.numeros=ESTG em números
+portal.estg.nosso.passado=O nosso passado
+portal.estg.presente=O presente
+portal.estg.areas.cientificas=Áreas ciêncificas
+portal.estg.cidade=A ESTG na cidade
+portal.estg.bolonha=A ESTG em bolonha
+portal.estg.edificio=O edifício
 menu.alunos=Alunos
 menu.staff=Staff
 menu.docentes=Docentes
 ,18 → 213,31
 #Mensagens Status
 authentication.ok=Benvindo Fulano
 logout.ok=Caro {0}, obrigado por usar o nosso serviço.
+authentication.first.time=Olá bem-vindo, é a primeira vez que que se esta a ligar
 authenticate.already.authenticated=O seu usuário já está autênticado
 username=Nome de Utilizador
 password=Password
 submit=Entrar
 confirm=Confirmar
 add=Adicionar
+yes=Sim
+no=Não
+#Login
+login.firts.time.name=Nome
+login.first.time.address=Morada
+login.first.time.zip=Código Postal
+login.first.time.country=País
+login.first.time.email=E-mail
+login.first.time.phone.number=Telefone
 #Cursos
 course.aa=Acessoria e Administração
+#Nucleos
+nucleo.engenharia=Nucleo de Engenharia

 /impl/conf/WEB-INF/struts/struts-default.xml
 ,9 → 41,7
         <action path="/Welcome" forward="page.welcome"/>
         <action path="/StartAuthentication" forward="page.authentication"/>
         <action path="/Logout" forward="/authenticate.do?dispatch=logout"/>
-        <action path="/StaffPage" forward="page.staff"/>
-       <!-- <action path="/AlumnPage" forward="page.alumn"/>-->
         <!-- Errors -->
         <action path="/errorNoCookies" forward="page.no.cookies"/>
         <action path="/error401" forward="page.error.401"/>
 ,7 → 57,44
             <forward name="layout2" path="page.layout2.proxy"/>
             <forward name="layout3" path="page.layout3.proxy"/>
             <forward name="layout4" path="page.layout4.proxy"/>
-            <forward name="portal" path="page.portal.proxy"/>
+            <!--Alunos-->
+            <forward name="orgaosAlunosPortalMenu" path="page.alunosOrgaosPortalMenu.proxy"/>
+            <forward name="contactosAlunosPortalMenu" path="page.alunosContactosPortalMenu.proxy"/>
+            <forward name="institutoPolitecnicoAlunosPortalMenu" path="page.alunosInstitutoPolitecnicoPortalMenu.proxy"/>
+            <forward name="accaoSocialAlunosPortalMenu" path="page.alunosAccaoSocialPortalMenu.proxy"/>
+            <forward name="servicosAlunosPortalMenu" path="page.alunosServicosPortalMenu.proxy"/>
+            <forward name="informacaoAcademicaAlunosPortalMenu" path="page.alunosInformacaoAcademicaPortalMenu.proxy"/>
+            <forward name="mobilidadeAlunosPortalMenu" path="page.alunosMobilidadePortalMenu.proxy"/>
+            <!--Futuros Alunos-->
+            <forward name="estgFuturosAlunosPortalMenu" path="page.futurosAlunosEstgPortalMenu.proxy"/>
+            <forward name="servicosFuturosAlunosPortalMenu" path="page.futurosAlunosServicosPortalMenu.proxy"/>
+            <forward name="contactosFuturosAlunosPortalMenu" path="page.futurosAlunosContactosPortalMenu.proxy"/>
+            <forward name="institutoPolitecnicoFuturosAlunosPortalMenu" path="page.futurosAlunosInstitutoPolitecnicoPortalMenu.proxy"/>
+            <forward name="informacaoAcademicaFuturosAlunosPortalMenu" path="page.futurosAlunosInformacaoAcademicaPortalMenu.proxy"/>
+            <forward name="mobilidadeFuturosAlunosPortalMenu" path="page.futurosAlunosMobilidadePortalMenu.proxy"/>
+            <forward name="accaoSocialFuturosAlunosPortalMenu" path="page.futurosAlunosAccaoSocialPortalMenu.proxy"/>
+            <forward name="orgaosFuturosAlunosPortalMenu" path="page.futurosAlunosOrgaosPortalMenu.proxy"/>
+            <!--Antigos Alunos-->
+            <forward name="estgAntigosAlunosPortalMenu" path="page.antigosAlunosEstgPortalMenu.proxy"/>
+            <forward name="servicoAntigosAlunosPortalMenu" path="page.antigosAlunosServicoPortalMenu.proxy"/>
+            <forward name="actividadesAntigosAlunosPortalMenu" path="page.antigosAlunosActividadesPortalMenu.proxy"/>
+            <forward name="institutoPolitecnicoAntigosAlunosPortalMenu" path="page.antigosAlunosInstitutoPolitecnicoPortalMenu.proxy"/>
+            <forward name="contactosAntigosAlunosPortalMenu" path="page.antigosAlunosContactosPortalMenu.proxy"/>
+            <!--Docentes-->
+            <forward name="servicosDocentesPortalMenu" path="page.docentesServicosPortalMenu.proxy"/>
+            <forward name="contactosDocentesPortalMenu" path="page.docentesContactosPortalMenu.proxy"/>
+            <forward name="informacaoAcademicaDocentesPortalMenu" path="page.docentesInformacaoAcademicaPortalMenu.proxy"/>
+            <forward name="mobilidadeDocentesPortalMenu" path="page.docentesMobilidadePortalMenu.proxy"/>
+            <forward name="accaoSocialDocentesPortalMenu" path="page.docentesAccaoSocialPortalMenu.proxy"/>
+            <forward name="orgaosDocentesPortalMenu" path="page.docentesOrgaoPortalMenu.proxy"/>
+            <forward name="institutoPolitecnicoDocentesPortalMenu" path="page.docentesInstitutoPolitecnicoPortalMenu.proxy"/>
+            <!--Assessoria Administracao-->
+            <forward name="layoutAA" path="page.layoutAA.proxy"/>
+            <!--Nucleo de Engenharia-->
+            <forward name="layoutNucleoEng" path="page.layoutNucleoENG.proxy"/>
             <forward name="layoutCourses" path="page.layoutCourses.proxy"/>
             <forward name="layout1.ftp" path="page.layout1.proxy.ftp"/>
             <forward name="layout2.ftp" path="page.layout2.proxy.ftp"/>
 ,6 → 103,12
             <forward name="layoutCourses.ftp" path="page.layoutCourses.proxy.ftp"/>
         </action>
+        <!--Portal Forward-->
+        <action path="/student" forward="page.portal.student"/>
+        <action path="/futureStudent" forward="page.portal.futureStudent"/>
+        <action path="/oldStudent" forward="page.portal.oldStudent"/>
+        <action path="/teacher" forward="page.portal.teacher"/>
         <!--Authentication-->
         <action path="/authenticate"
                 type="pt.estgp.estgweb.web.controllers.authenticate.AuthenticateController"
 ,6 → 119,7
                 input="page.authentication">
             <forward name="success" path="page.authentication.ok"/>
             <forward name="logout" path="page.logout.ok"/>
+            <forward name="firstTimeAuthenticate" path="page.first.time.authenticate"/>
         </action>

 /impl/conf/WEB-INF/struts/tiles-processworkflow.xml
 ,8 → 1,8
 <?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>
 ,4 → 10,8
     <definition name="page.load.process" extends="base.layout1">
     </definition>
+    <definition name="page.teste" extends="base.layout1">
+        <put name="body" value="/teste.jsp"/>
+    </definition>
 </tiles-definitions>

/impl/conf/WEB-INF/struts/tiles-announcements.xml
18,6 → 18,4
<put name="body" value="/public/announcements/loadAnnouncement.jsp" />
</definition>



</tiles-definitions>

 /impl/conf/WEB-INF/struts/tiles-default.xml
 ,12 → 1,12
 <?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>
     <!-- Templates Globais Tiles Definition -->
     <definition name="base.definition" path="/layout/siteLayout.jsp">
         <put name="title" value="x"/>
 ,7 → 53,7
     <definition name="base.layout3" extends="base.definition" path="/layout/layout3.jsp">
         <put name="navigation" value="/layout/navigationRight.jsp" />
     </definition>
     <definition name="base.layout4" extends="base.definition" path="/layout/layout4.jsp">
         <put name="navigationLeft" value="/layout/navigationLeft.jsp" />
         <put name="navigationRight" value="/layout/navigationRight.jsp" />
 ,6 → 63,12
         <put name="navigation" value="/layout/navigationCourse.jsp" />
     </definition>
+    <definition name="base.layoutPortal" extends="base.definition" path="/layout/layoutPortal.jsp">
+        <put name="topnav" value="/public/portals/topnavPortal.jsp" />
+        <put name="navigationLeft" value="/public/announcements/announcementsPortalLeft.jsp" />
+        <put name="navigationRight" value="/public/announcements/announcementsPortalRight.jsp" />
+    </definition>
     <!-- Proxies -->
     <definition name="page.layout1.proxy" extends="base.layout1">
         <put name="body" value="/WebProxy"/>
 ,7 → 85,17
     <definition name="page.layoutCourses.proxy" extends="base.layoutCourses">
         <put name="body" value="/WebProxy"/>
     </definition>
+    <definition name="page.layoutPortal.proxy" extends="base.layoutPortal">
+        <put name="body" value="/WebProxy"/>
+    </definition>
+    <definition name="page.layoutAssessoria.proxy" extends="base.layoutPortal">
+        <put name="body" value="/WebProxy"/>
+    </definition>
+     <definition name="page.layoutNuleoEngenharia.proxy" extends="base.layoutPortal">
+        <put name="body" value="/WebProxy"/>
+    </definition>
     <definition name="page.layout1.proxy.ftp" extends="base.layout1">
         <put name="body" value="/user/ftpclient/ftpclient.jsp"/>
     </definition>
 ,28 → 111,159
     <definition name="page.layoutCourses.proxy.ftp" extends="base.layoutCourses">
         <put name="body" value="/user/ftpclient/ftpclient.jsp"/>
     </definition>
-    <!--PASSOU PARA AQUI-->
-    <definition name="page.portal.proxy" extends="page.layout4.proxy">
-        <put name="topnav" value="/public/portal/topnavPortal.jsp" />
-        <put name="navigationLeft" value="/public/announcements/announcementsPortalLeft.jsp" />
-        <put name="navigationRight" value="/public/announcements/announcementsPortalRight.jsp" />
+    <!--Portais-->
+    <definition name="page.portal.student" extends="base.layoutPortal">
+        <put name="body" value="/public/portals/alunos/student.jsp"/>
     </definition>
+    <definition name="page.portal.oldStudent" extends="base.layoutPortal">
+        <put name="body" value="/public/portals/antigosAlunos/oldStudent.jsp"/>
+    </definition>
+    <definition name="page.portal.futureStudent" extends="base.layoutPortal">
+        <put name="body" value="/public/portals/futurosAlunos/futureStudent.jsp"/>
+    </definition>
+    <definition name="page.portal.teacher" extends="base.layoutPortal">
+      <put name="body" value="/public/portals/Docentes/teacher.jsp"/>
+      <!--<put name="body" value="/templates/templatePageAssessoria.jsp"/> -->
+    </definition>
+    <!--Alunos-->
+    <definition name="page.alunosOrgaosPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/alunos/topnavOrgaos.jsp" />
+        <put name="navigationLeft" value="/public/portals/alunos/orgaos.jsp" />
+    </definition>
+   <definition name="page.alunosContactosPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/alunos/topnavContactos.jsp" />
+        <put name="navigationLeft" value="/public/portals/alunos/contactos.jsp" />
+    </definition>
+    <definition name="page.alunosInstitutoPolitecnicoPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/alunos/topnavInstitutoPolitecnico.jsp" />
+        <put name="navigationLeft" value="/public/portals/alunos/institutoPolitecnico.jsp" />
+    </definition>
+    <definition name="page.alunosAccaoSocialPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/alunos/topnavAccaoSocial.jsp" />
+        <put name="navigationLeft" value="/public/portals/alunos/accaoSocial.jsp" />
+    </definition>
+    <definition name="page.alunosServicosPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/alunos/topnavServicos.jsp" />
+        <put name="navigationLeft" value="/public/portals/alunos/servicos.jsp" />
+    </definition>
+    <definition name="page.alunosInformacaoAcademicaPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/alunos/topnavInformacaoAcademica.jsp" />
+        <put name="navigationLeft" value="/public/portals/alunos/informacaoAcademica.jsp" />
+    </definition>
+    <definition name="page.alunosMobilidadePortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/alunos/topnavMobilidade.jsp" />
+        <put name="navigationLeft" value="/public/portals/alunos/mobilidade.jsp" />
+    </definition>
+    <!--Futuros Alunos-->
+    <definition name="page.futurosAlunosEstgPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/futurosAlunos/topnavEstg.jsp" />
+        <put name="navigationLeft" value="/public/portals/futurosAlunos/estg.jsp" />
+    </definition>
+    <definition name="page.futurosAlunosServicosPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/futurosAlunos/topnavServicos.jsp" />
+        <put name="navigationLeft" value="/public/portals/futurosAlunos/servicos.jsp" />
+    </definition>
+    <definition name="page.futurosAlunosContactosPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/futurosAlunos/topnavContactos.jsp" />
+        <put name="navigationLeft" value="/public/portals/futurosAlunos/contactos.jsp" />
+    </definition>
+    <definition name="page.futurosAlunosInstitutoPolitecnicoPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/futurosAlunos/topnavInstitutoPolitecnico.jsp" />
+        <put name="navigationLeft" value="/public/portals/futurosAlunos/institutoPolitecnico.jsp" />
+    </definition>
+    <definition name="page.futurosAlunosInformacaoAcademicaPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/futurosAlunos/topnavInformacaoAcademica.jsp" />
+        <put name="navigationLeft" value="/public/portals/futurosAlunos/informacaoAcademica.jsp" />
+    </definition>
+    <definition name="page.futurosAlunosAccaoSocialPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/futurosAlunos/topnavAccaoSocial.jsp" />
+        <put name="navigationLeft" value="/public/portals/futurosAlunos/accaoSocial.jsp" />
+    </definition>
+    <definition name="page.futurosAlunosMobilidadePortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/futurosAlunos/topnavMobilidade.jsp" />
+        <put name="navigationLeft" value="/public/portals/futurosAlunos/mobilidade.jsp" />
+    </definition>
+    <definition name="page.futurosAlunosOrgaosPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/futurosAlunos/topnavOrgaos.jsp" />
+        <put name="navigationLeft" value="/public/portals/futurosAlunos/orgaos.jsp" />
+    </definition>
+    <!--Antigos Alunos-->
+    <definition name="page.antigosAlunosEstgPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/antigosAlunos/topnavEstg.jsp" />
+        <put name="navigationLeft" value="/public/portals/antigosAlunos/estg.jsp" />
+    </definition>
+    <definition name="page.antigosAlunosServicoPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/antigosAlunos/topnavServico.jsp" />
+        <put name="navigationLeft" value="/public/portals/antigosAlunos/servicos.jsp" />
+    </definition>
+    <definition name="page.antigosAlunosActividadesPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/antigosAlunos/topnavActividades.jsp" />
+        <put name="navigationLeft" value="/public/portals/antigosAlunos/actividades.jsp" />
+    </definition>
+    <definition name="page.antigosAlunosFormacaoPosGraduadaPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/antigosAlunos/topnavFormacaoPosGraduada.jsp" />
+        <put name="navigationLeft" value="/public/portals/antigosAlunos/formacaoPosGraduada.jsp" />
+    </definition>
+    <definition name="page.antigosAlunosInstitutoPolitecnicoPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/antigosAlunos/topnavInstitutoPolitecnico.jsp" />
+        <put name="navigationLeft" value="/public/portals/antigosAlunos/institutoPolitecnico.jsp" />
+    </definition>
+    <definition name="page.antigosAlunosContactosPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/antigosAlunos/topnavContactos.jsp" />
+        <put name="navigationLeft" value="/public/portals/antigosAlunos/contactos.jsp" />
+    </definition>
+    <!--Docentes-->
+    <definition name="page.docentesServicosPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/Docentes/topnavServicos.jsp" />
+        <put name="navigationLeft" value="/public/portals/Docentes/servicos.jsp" />
+    </definition>
+    <definition name="page.docentesContactosPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/Docentes/topnavContactos.jsp" />
+        <put name="navigationLeft" value="/public/portals/Docentes/contactos.jsp" />
+    </definition>
+    <definition name="page.docentesInformacaoAcademicaPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/Docentes/topnavInformacaoAcademica.jsp" />
+        <put name="navigationLeft" value="/public/portals/Docentes/informacaoAcademica.jsp" />
+    </definition>
+    <definition name="page.docentesMobilidadePortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/Docentes/topnavMobilidade.jsp" />
+        <put name="navigationLeft" value="/public/portals/Docentes/mobilidade.jsp" />
+    </definition>
+    <definition name="page.docentesAccaoSocialPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/Docentes/topnavAccaoSocial.jsp" />
+        <put name="navigationLeft" value="/public/portals/Docentes/accaoSocial.jsp" />
+    </definition>
+    <definition name="page.docentesOrgaoPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/Docentes/topnavOrgaos.jsp" />
+        <put name="navigationLeft" value="/public/portals/Docentes/orgaos.jsp" />
+    </definition>
+    <definition name="page.docentesInstitutoPolitecnicoPortalMenu.proxy" extends="page.layoutPortal.proxy">
+        <put name="topnav" value="/public/portals/Docentes/topnavInstitutoPolitecnico.jsp" />
+        <put name="navigationLeft" value="/public/portals/Docentes/institutoPolitecnico.jsp" />
+    </definition>
+    <!--Alunos Assessoria-->
+    <definition name="page.layoutAA.proxy" extends="page.layoutAssessoria.proxy">
+        <put name="topnav" value="/public/portals/assessoria/topnavAssessoria.jsp" />
+        <put name="navigationLeft" value="/public/portals/assessoria/assessoria.jsp" />
+    </definition>
+    <!--Nucleo de Engenharia-->
+    <definition name="page.layoutNucleoENG.proxy" extends="page.layoutNuleoEngenharia.proxy">
+        <put name="topnav" value="/public/portals/nucleoEngenharia/topnavNucleoEngenharia.jsp" />
+        <put name="navigationLeft" value="/public/portals/nucleoEngenharia/nucleoEngenharia.jsp" />
+    </definition>
     <!--Pagina inicial-->
     <definition name="page.welcome" extends="base.layout4">
         <put name="title" value="ESTG" />
         <put name="body" value="/public/index.jsp" />
     </definition>
-    <definition name="page.staff" extends="base.layout1">
-        <put name="title" value="ESTG" />
-        <put name="body" value="/public/staff/index.jsp" />
-    </definition>
-    <definition name="page.alumn" extends="base.layout2">
-        <put name="title" value="ESTG" />
-        <put name="body" value="/public/staff/index.jsp" />
-    </definition>
     <!-- Autenticacao -->
     <definition name="page.authentication" extends="base.layout1">
         <put name="title" value="Authentication" />
 ,6 → 277,10
         <put name="title" value="Logout Success" />
         <put name="body" value="/auth/logoutok.jsp" />
     </definition>
+    <definition name="page.first.time.authenticate" extends="base.layout1">
+        <put name="title" value="First Time Authenticate" />
+        <put name="body" value="/auth/firstTimeAuthenticate.jsp" />
+    </definition>
     <!-- ERRORS DEFINITIONS -->
     <definition name="page.error.500" extends="base.error.definition">

 /impl/conf/WEB-INF/struts/struts-processworkflow.xml
 ,13 → 1,13
 <?xml version="1.0" encoding="UTF-8"?>
-<!--<!DOCTYPE struts-config PUBLIC-->
-        <!--"-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"-->
-        <!--"http://struts.apache.org/dtds/struts-config_1_3.dtd">-->
+<!DOCTYPE struts-config PUBLIC
+        "-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"
+        "http://struts.apache.org/dtds/struts-config_1_3.dtd">
 <struts-config>
     <form-beans>
+       <form-bean type="pt.estgp.estgweb.web.form.TesteForm" name="TesteForm"/>
     </form-beans>
     <global-exceptions>
 ,6 → 20,17
     <action-mappings>
+         <!--Authentication-->
+        <action path="/testeStart" forward="page.teste"/>
+        <action path="/teste"
+                type="pt.estgp.estgweb.web.controllers.TesteController"
+                name="TesteForm"
+                scope="request"
+                parameter="dispatch"
+                validate="false"
+                input="page.teste">
+            <forward name="ok" path="page.teste"/>
+        </action>
     </action-mappings>
 </struts-config>

 /impl/conf/WEB-INF/struts/validator-rules.xml
 ,7 → 270,29
               depends=""
                   msg="errors.creditcard"/>
+       <validator name="notrequired"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateNotRequired"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.notrequired"/>
+        <validator name="notrequiredif"
+                 classname="org.apache.struts.validator.FieldChecks"
+                 method="validateNotRequiredIf"
+                 methodParams="java.lang.Object,
+                               org.apache.commons.validator.ValidatorAction,
+                               org.apache.commons.validator.Field,
+                               org.apache.struts.action.ActionMessages,
+                               org.apache.commons.validator.Validator,
+                               javax.servlet.http.HttpServletRequest"
+                 msg="errors.notrequired"/>
       <validator name="email"
             classname="org.apache.struts.validator.FieldChecks"
                method="validateEmail"

 /impl/conf/WEB-INF/struts/struts-announcements.xml
 ,8 → 1,8
 <?xml version="1.0" encoding="UTF-8"?>
-<!--<!DOCTYPE struts-config PUBLIC-->
-        <!--"-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"-->
-        <!--"http://struts.apache.org/dtds/struts-config_1_3.dtd">-->
+<!DOCTYPE struts-config PUBLIC
+        "-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"
+        "http://struts.apache.org/dtds/struts-config_1_3.dtd">
 <struts-config>

 /impl/conf/WEB-INF/tlds/estgweb.tld
 ,8 → 31,8
         <tagclass>pt.estgp.estgweb.web.tags.IsAdminTag</tagclass>
     </tag>
     <tag>
-        <name>isAdmin</name>
-        <tagclass>pt.estgp.estgweb.web.tags.IsAdminTag</tagclass>
+        <name>isNotAdmin</name>
+        <tagclass>pt.estgp.estgweb.web.tags.IsNotAdminTag</tagclass>
     </tag>
     <tag>
         <name>pageUrlStat</name>
 ,6 → 62,21
             <rtexprvalue>false</rtexprvalue>
         </attribute>
     </tag>
+        <tag>
+        <name>ownerImageRole</name>
+        <tagclass>pt.estgp.estgweb.web.tags.OwnerImageRoleTag</tagclass>
+        <attribute>
+            <name>name</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+         <attribute>
+            <name>property</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
     <!--<tag>-->
         <!--<name>urlStat</name>-->
         <!--<tagclass>pt.estgp.estgweb.web.tags.UrlStatTag</tagclass>-->

 /impl/conf/WEB-INF/web.xml
 ,6 → 111,10
         <servlet-name>tmpStream</servlet-name>
         <servlet-class>pt.estgp.estgweb.web.TmpStream</servlet-class>
     </servlet>
+    <servlet>
+        <servlet-name>imageStream</servlet-name>
+        <servlet-class>pt.estgp.estgweb.web.ImageStream</servlet-class>
+    </servlet>
     <!--MAPPINGS-->
     <servlet-mapping>
 ,6 → 141,10
         <servlet-name>tmpStream</servlet-name>
         <url-pattern>/tmpStream/*</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>imageStream</servlet-name>
+        <url-pattern>/imageStream/*</url-pattern>
+    </servlet-mapping>
     <!--START FILES-->
     <welcome-file-list>

 /impl/conf/app.properties
 ,5 → 1,5
 tmp.dir=@tmp.dir@
-use.ldap=false
+use.ldap=true
 system.language=pt
 #Session Settings
 user.session.timeout.minutes=15
 ,6 → 17,8
 ionline.user=Baco_web
 server.estgp=http://www.estgp.pt/testes/nova_web
+server.estgweb=http://www.estgp.pt/testes/estgweb
+estgweb.encoding=UTF-8
 estgp.encoding=UTF-8
 ################################################
 ,7 → 44,10
 user.role.16=pedagogicCouncil
 user.role.17=erasmusCouncil
 user.role.18=courseCoordinator
+user.role.19=sudentAssociation
+user.role.20=representativeCouncil
 #########################################################################
 #
 # Modules
 ,17 → 57,40
 #########################################################################
 # Announcements
 #
+announcements.text.summary.size=250
+announcements.text.summary.size.small=100
 announcements.automatic.validation.role.1=all
 announcements.automatic.validation.role.2=admin
 announcements.automatic.validation.role.3=ci
 announcements.automatic.validation.role.4=administrativeCouncil
+student.auto.validation.targets=student,oldStudent,futureStudent,erasmusStudent
+student.auto.validation.types=news,top.flash.news
 announcements.max.visible=10
+announcements.top.flash.news.timeout.miliseconds=7000
 announcements.type.0=news
 announcements.type.1=top.flash.news
 announcements.type.2=bottom.flash.news
+#role images for announcements
+announcement.default.img=/imgs/rolesIcons/nd.gif
+role.admin.img=/imgs/rolesIcons/estg.gif
+role.sudentAssociation.img=/imgs/rolesIcons/ae.gif
+role.administrativeCouncil.img=/imgs/rolesIcons/c_directivo.gif
+role.scientificCouncil.img=/imgs/rolesIcons/c_cientifico.gif
+role.representativeCouncil.img=/imgs/rolesIcons/ass_repre.gif
+role.teacher.eg.img=/imgs/rolesIcons/ne.gif
+role.teacher.dg.img=/imgs/rolesIcons/ngm.gif
+role.services.img=/imgs/rolesIcons/secretaria.gif
 #########################################################################
 # Link Analysis
 #
 ,6 → 107,12
 url.stat.ignore.extension.8=.swf
 url.stat.ignore.prefix.1=/urlstat
+url.stat.ignore.prefix.2=/public/
+url.stat.ignore.prefix.3=/admin/
+url.stat.ignore.prefix.4=/user/
+url.stat.ignore.prefix.5=/css/
+url.stat.ignore.prefix.6=/js/
+url.stat.ignore.prefix.7=/auth/
 #See java.text.SimpleDateFormat
 urlstat.chart.week.days=EEE dd-MMM

 /impl/conf/berserk/sd.xml
 ,5 → 152,27
             <chain name="Logger"/>
         </filterChains>
     </service>
+    <service>
+        <name>LoadTopFlashNewsIterate</name>
+        <implementationClass>pt.estgp.estgweb.services.announcements.LoadTopFlashNewsIterateService</implementationClass>
+        <description>Load an Announcement one flash News</description>
+        <isTransactional>true</isTransactional>
+        <filterChains>
+            <chain name="Logger"/>
+            <chain name="Session"/>
+        </filterChains>
+    </service>
+    <!--Teste-->
+      <service>
+        <name>TesteSaver</name>
+        <implementationClass>pt.estgp.estgweb.services.teste.TesteService</implementationClass>
+        <description>Saves a teste</description>
+        <isTransactional>true</isTransactional>
+        <filterChains>
+            <chain name="Logger"/>
+        </filterChains>
+    </service>
 </serviceDefinitions>

 /impl/src/java/jomm/dao/impl/AbstractDao.java
 ,6 → 15,7
 import java.sql.SQLException;
 import java.util.Collection;
 import java.util.List;
+import java.util.Date;
 /**
 ,8 → 398,11
      * using the current value of the identifier property if the assigned
      * generator is used.)
      */
-    public final Serializable save(CLAZZ obj) {
+    public Serializable save(CLAZZ obj)
+    {
         try {
+            DomainObject o = (DomainObject) obj;
+            o.setSaveDate(new Date());
             return (Serializable) getCurrentSession().save(obj);
         }
         catch (HibernateException e) {

 /impl/src/java/jomm/web/utils/NavPlaceServer.java
 ,6 → 15,7
     private static NavPlaceServer ourInstance = new NavPlaceServer();
     public static final String NAV_PLACES_KEY = "NAV_PLACES_KEY";
+    public static final String PORTAL_MENU_PLACES_KEY = "PORTAL_MENU_PLACES_KEY";
     public static NavPlaceServer getInstance()
 ,13 → 29,22
     public TopNav createTopNav(HttpServletRequest request)
     {
-        return new TopNav(request);
+        return new TopNav(request,NAV_PLACES_KEY);
     }
+    public TopNav createPortalMenuPlacesKey(HttpServletRequest request)
+    {
+        return new TopNav(request,PORTAL_MENU_PLACES_KEY);
+    }
     public static TopNav getTopNav(HttpServletRequest request)
     {
         return (TopNav) request.getAttribute(NavPlaceServer.NAV_PLACES_KEY);
     }
+    public static TopNav getPortalMenuPlacesKey(HttpServletRequest request)
+    {
+        return (TopNav) request.getAttribute(NavPlaceServer.PORTAL_MENU_PLACES_KEY);
+    }
 }

 /impl/src/java/jomm/web/utils/TopNav.java
 ,20 → 6,21
 /**
  * @author Jorge Machado
-* @date 6/Mar/2008
-* @time 17:53:36
-* @see jomm.web.utils
-*/
+ * @date 6/Mar/2008
+ * @time 17:53:36
+ * @see jomm.web.utils
+ */
 public class TopNav
 {
+    private String title;
     List<NavPlace> navPlaces = new ArrayList<NavPlace>();
-    protected TopNav(HttpServletRequest request)
+    protected TopNav(HttpServletRequest request, String key)
     {
-        request.setAttribute(NavPlaceServer.NAV_PLACES_KEY,this);
+        request.setAttribute(key,this);
     }
     public List<NavPlace> getNavPlaces()
     {
         return navPlaces;
 ,7 → 28,15
     public void addNavPlace(String url, String messageKey)
     {
-        NavPlace n = new NavPlace(url,messageKey);
+        NavPlace n = new NavPlace(url,messageKey,navPlaces.size());
         navPlaces.add(n);
     }
+    public String getTitle() {
+        return title;
+    }
+    public void setTitle(String title) {
+        this.title = title;
+    }
 }

 /impl/src/java/jomm/web/utils/NavPlace.java
 ,26 → 7,39
 public class NavPlace
 {
+    private int pos;
     private String url;
     private String key;
     /**
      * Creates a new instance of NavPlace
-     *
+     *
      * @param url to go
      * @param key in messages
      * */
-    public NavPlace(String url,String key)
+    public NavPlace(String url,String key, int pos)
     {
         this.url = url;
         this.key = key;
+        this.pos = pos;
     }
-    public String getUrl() {
-        return url;
+    public String getUrl()
+    {
+        if(url != null)
+        {
+            if(url.indexOf("?")>=0)
+                return url + "&pos=" + pos;
+            else
+                return url + "?pos=" + pos;
+        }
+        return null;
     }
-    public void setUrl(String url) {
+    public void setUrl(String url)
+    {
         this.url = url;
     }
 ,5 → 51,5
         this.key = key;
     }
 }

 /impl/src/java/openldap/Test.java
 ,40 → 7,106
 import java.util.Set;
 import openldap.LdapManagerFactory;
-public class Test
+public class Test
 {
-    public static void main(String[] args) throws Exception
+    public String getName(HashMap text)
     {
-        //System.out.println(LdapManagerFactory.getLdapManager().login("a8824","21286"));
-        HashMap map = LdapManagerFactory.getLdapManager().getUserInfo("a8822");
-        Set s = map.entrySet();
+        Set s = text.entrySet();
         Iterator iter = s.iterator();
-       /* while(iter.hasNext())
+        int iterCount=0;
+        String name=null;
+        while(iter.hasNext())
         {
             Map.Entry e = (Entry) iter.next();
-            System.out.println(e.getKey() + ":" + e.getValue());
+            if(iterCount==3)
+            {
+                name=e.getValue().toString();
+            }
+            iterCount++;
         }
-        map = LdapManagerFactory.getLdapManager().getUserInfo("a8822");
-        s = map.entrySet();
-        iter = s.iterator();*/
-        int iterNumber=0;
-        String[] messageBrokenDot=null;
-        String[] spliters={",","="};
+        return name;
+    }
+    public String getRoles(HashMap text)
+    {
+        Set s = text.entrySet();
+        Iterator iter = s.iterator();
+        int iterCount=0;
+        String roles=null;
         while(iter.hasNext())
         {
             Map.Entry e = (Entry) iter.next();
-            if(iterNumber==3)
+            if(iterCount==0)
             {
-                messageBrokenDot=e.getValue().toString().split(spliters[0]);
+                String[] splitText=e.getValue().toString().split(",");
+                if(splitText[1].contains("CN"))
+                {
+                    roles="student";
+                }
+                else if(splitText[1].contains("OU"))
+                {
+                    roles="teacher";
+                }
             }
-            iterNumber++;
-            //System.out.println(e.getKey() + ":" + e.getValue());
+            iterCount++;
         }
-        for (int i = 0 ; i < iterNumber ; i++) {
-             //   System.out.println("->" + messageBrokenDot[i].split(spliters[1]));
+        return roles;
+    }
+    public static void main(String[] args) throws Exception
+    {
+        //System.out.println(LdapManagerFactory.getLdapManager().login("a8824","21286"));
+        HashMap map = LdapManagerFactory.getLdapManager().getUserInfo("jmachado");
+        Set s = map.entrySet();
+        Iterator iter = s.iterator();
+        /* while(iter.hasNext())
+      {
+          Map.Entry e = (Entry) iter.next();
+          System.out.println(e.getKey() + ":" + e.getValue());
+      }
+      map = LdapManagerFactory.getLdapManager().getUserInfo("a8822");
+      s = map.entrySet();
+      iter = s.iterator();*/
+        /*while(iter.hasNext())
+       {
+           Map.Entry e = (Entry) iter.next();
+           System.out.println(e.getKey() + "-->" + e.getValue());
+       } */
+        //Set s = text.entrySet();
+        //Iterator iter = s.iterator();
+        int iterCount=0;
+        String name=null;
+        String roles=null;
+        while(iter.hasNext())
+        {
+            Map.Entry e = (Entry) iter.next();
+            if(iterCount==0)
+            {
+                String[] splitText=e.getValue().toString().split(",");
+                if(splitText[1].contains("CN"))
+                {
+                    roles="student";
+                }
+                else if(splitText[1].contains("OU"))
+                {
+                    roles="teacher";
+                }
+            }
+            if(iterCount==3)
+            {
+                name=e.getValue().toString();
+            }
+            iterCount++;
         }
+        System.out.println("nome-->" + name);
+        System.out.println("nome-->" + roles);
     }
 }

 /impl/src/java/pt/estgp/estgweb/Globals.java
 ,7 → 16,7
     public static final String ACTUAL_RELATIVE_PATH = "ACTUAL_RELATIVE_PATH";
     public static final String ADMIN_ROLE = ConfigProperties.getProperty("user.admin");
     public static final String SUPER_USER_ROLE = ConfigProperties.getProperty("user.super");
-    public static final String USER_SESSION_KEY = "USER_SESSION_KEY";
+    public static final String USER_SESSION_KEY = "UserSession";
     public static final List<String> AUTOMATIC_VALIDATION_ROLES = ConfigProperties.getListValues("announcements.automatic.validation.role");
     public static final String TMP_DIR = ConfigProperties.getProperty("tmp.dir");
     public static final String EMAIL_SERVER_HOST = ConfigProperties.getProperty("email.server");
 ,4 → 24,9
     public static final String ANNOUNCEMENT_TYPE_NEWS = "news";
     public static final String ANNOUNCEMENT_TYPE_TOP_FLASH_NEWS = "top.flash.news";
     public static final String ANNOUNCEMENT_TYPE_BOTTOM_FLASH_NEWS = "bottom.flash.news";
+    public static final int NUMBER_ANNOUNCEMENT_TYPE_NEW_INDEX=5;
+    public static final int NUMBER_ANNOUNCEMENT_TYPE_TOP_FLASH_NEWS_INDEX=1;
+    public static final int NUMBER_ANNOUNCEMENT_TYPE_BOTTOM_FLASH_NEWS_INDEX=2;
+    public static final int ANNOUNCEMENT_TYPE_TOP_FLASH_NEWS_TIMEOUT=ConfigProperties.getIntProperty("announcements.top.flash.news.timeout.miliseconds");
 }

 /impl/src/java/pt/estgp/estgweb/services/teste/TesteService.java
 New file
 ,0 → 1,34
+package pt.estgp.estgweb.services.teste;
+import pt.utl.ist.berserk.logic.serviceManager.IService;
+import pt.estgp.estgweb.services.authenticate.LogoutService;
+import pt.estgp.estgweb.services.expceptions.ServiceException;
+import pt.estgp.estgweb.domain.UserSession;
+import pt.estgp.estgweb.domain.UserSessionImpl;
+import pt.estgp.estgweb.domain.Teste;
+import pt.estgp.estgweb.domain.dao.DaoFactory;
+import org.apache.log4j.Logger;
+/*
+ * @author Goncalo Luiz gedl [AT] rnl [DOT] ist [DOT] utl [DOT] pt
+ *
+ *
+ * Created at 17/Out/2003 , 23:45:24
+ *
+ */
+/**
+ * @author Jorge Machado
+ *
+ *
+ * Created at 17/Out/2003 , 23:45:24
+ *
+ */
+public class TesteService implements IService
+{
+    private static final Logger logger = Logger.getLogger(TesteService.class);
+    public void run(Teste t) throws ServiceException
+    {
+        DaoFactory.getTesteDaoImpl().save(t);
+    }
+}

 /impl/src/java/pt/estgp/estgweb/services/announcements/CreateAnnouncementService.java
 ,11 → 42,86
         announcement.setOwner(userSession.getUser());
         announcement.setSaveDate(new Date());
-        //Se for de validacao automatica ha de aparecer a combobox na web page e o user é que escolhe
-        //se não pomos false
-        if(!RoleManager.hasRole(userSession.getUser(),Globals.AUTOMATIC_VALIDATION_ROLES))
-            announcement.setStatus(false);
+        if(RoleManager.hasRole(userSession.getUser(),Globals.AUTOMATIC_VALIDATION_ROLES))
+            announcement.setStatus(true);
+        else
+        {
+            String[] userRoles=announcement.getChoosedOwnerRole().split(",");
+            Boolean validation=false;
+            for(String role: userRoles)
+            {
+                if(!role.equals("all")&&validation==false)
+                {
+                    try
+                    {
+                        String validationTargets=role+".auto.validation.targets";
+                        String userAutoValitation=ConfigProperties.getProperty(validationTargets);
+                        String[] userAutoValitationRoles=userAutoValitation.split(",");
+                        int validTargetRoles=0;
+                        if(announcement.getTargetRoles().contains(","))
+                        {
+                            String[] targetRolesAnnouncementSplited=announcement.getTargetRoles().split(",");
+                            //Percorre os targets todos a quem se destina
+                            for(String target: targetRolesAnnouncementSplited)
+                            {
+                                //Percorre todos os validation targets
+                                for(String userTargetRoles: userAutoValitationRoles)
+                                {
+                                    //Se o target a quem se destina constar na lista dos validation targets então incrementa
+                                    //o validTargetRoles
+                                    if(target.equals(userTargetRoles))
+                                    {
+                                        validTargetRoles++;
+                                    }
+                                }
+                            }
+                            //Se o numero de roles validados for igual ao numero de targets a quem se destina
+                            //Vai verificar se possui validationType para o type announcement
+                            if(validTargetRoles==targetRolesAnnouncementSplited.length)
+                            {
+                                String validationTypes=role +".auto.validation.types";
+                                String userAutoTypes=ConfigProperties.getProperty(validationTypes);
+                                String[] userAutoValitationTypes=userAutoTypes.split(",");
+                                for(String types: userAutoValitationTypes)
+                                {
+                                    if(types.equals(announcement.getType()))
+                                        validation=true;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            String targetRolesAnnouncement=announcement.getTargetRoles();
+                            //Percorre todos os validation targets
+                            for(String userTargetRoles: userAutoValitationRoles)
+                            {
+                                if(targetRolesAnnouncement.equals(userTargetRoles))
+                                {
+                                    validTargetRoles++;
+                                }
+                            }
+                            if(validTargetRoles==1)
+                            {
+                                String validationTypes=role +".auto.validation.types";
+                                String userAutoTypes=ConfigProperties.getProperty(validationTypes);
+                                String[] userAutoValitationTypes=userAutoTypes.split(",");
+                                for(String types: userAutoValitationTypes)
+                                {
+                                    if(types.equals(announcement.getType()))
+                                        validation=true;
+                                }
+                            }
+                        }
+                    }
+                    catch(Exception e){}
+                }
+            }
+            announcement.setStatus(validation);
+        }
         DaoFactory.getAnnouncementDaoImpl().save(announcement);
         logger.info("Creating announcement:" + announcement.getId());
         return new AnnouncementView(announcement);

 /impl/src/java/pt/estgp/estgweb/services/announcements/LoadRoleTypeMaxAnnouncementsService.java
 ,10 → 30,22
     private static final Logger logger = Logger.getLogger(LoadRoleTypeMaxAnnouncementsService.class);
     private static final int MAX_ANNOUNCEMENTS = ConfigProperties.getIntProperty("announcements.max.visible");
-    public List<AnnouncementView> run(String targetRole,String typeNews)
+    public List<AnnouncementView> run(String roles,String typeNews)
     {
-        List<Announcement> announcements = DaoFactory.getAnnouncementDaoImpl().findAnnouncements(MAX_ANNOUNCEMENTS,targetRole,typeNews);
+        List<String> targetRoles = new ArrayList<String>();
+        if (roles.contains(","))
+        {
+            String[] rolesRequestSplited = roles.split(",");
+            for (String role : rolesRequestSplited)
+            {
+                targetRoles.add(role);
+            }
+        }
+        else
+        {
+            targetRoles.add(roles);
+        }
+        List<Announcement> announcements = DaoFactory.getAnnouncementDaoImpl().findAnnouncements(MAX_ANNOUNCEMENTS,targetRoles,typeNews,null);
         if(announcements == null)
             return null;
         List<AnnouncementView> announcementViews = new ArrayList<AnnouncementView>();
 ,17 → 58,17
         return announcementViews;
     }
-    //todo tens de ter cuidado com o nome que metes no servico, tavas a meter LoadRoleTypeMaxAnnouncements e no XML estava LoadRoleTypeMaxAnnouncementsService, o nome nao tem de ser igual a classe mas convem, por norma eu tenho tirado a palavra service do nome do servico
+    //tens de ter cuidado com o nome que metes no servico, tavas a meter LoadRoleTypeMaxAnnouncements e no XML estava LoadRoleTypeMaxAnnouncementsService, o nome nao tem de ser igual a classe mas convem, por norma eu tenho tirado a palavra service do nome do servico
     //ou seja esta LoadRoleTypeMaxAnnouncements para a classe LoadRoleTypeMaxAnnouncementsService logo no sm.execute tem de estar LoadRoleTypeMaxAnnouncements
-    //mudei a propriedade log.file build.properties para log.file=${data.dir}/estgweb.log assim já não dá o erro do log
-    //adicionei as libs jsp-api.jar da pasta tomcat/common/lib para não te falhar os imports nas TAGS aqui no Intellij
+    //mudei a propriedade log.file build.properties para log.file=${data.dir}/estgweb.log assim ja nao da o erro do log
+    //adicionei as libs jsp-api.jar da pasta tomcat/common/lib para nao te falhar os imports nas TAGS aqui no Intellij
     //adiciona sempre todos os jars da common aqui no Intellij faltava-te o activation.jar do jaxb e era preciso para o MimeTypeGuesser
     public static void main(String[] args) throws Throwable {
         IServiceManager sm = ServiceManager.getInstance();
         String[] names = new String[]{};
-        Object[] arguments = new Object[]{"student", Globals.ANNOUNCEMENT_TYPE_NEWS};
+        Object[] arguments = new Object[]{"student", Globals.ANNOUNCEMENT_TYPE_BOTTOM_FLASH_NEWS};
         List<AnnouncementView> announcementViews = (List<AnnouncementView>) sm.execute("testecookie", "LoadRoleTypeMaxAnnouncements",arguments,names);
-        System.out.println(announcementViews.size());
+        System.out.println("-->"+announcementViews.size());
     }

 /impl/src/java/pt/estgp/estgweb/services/announcements/LoadTargetMaxAnnouncementsService.java
 ,7 → 27,7
         List<String> targetRoles = null;
         if(userSession.getUser() != null)
             targetRoles = userSession.getUser().getTargetRolesList();
-        List<Announcement> announcements = DaoFactory.getAnnouncementDaoImpl().findAnnouncements(MAX_ANNOUNCEMENTS,targetRoles);
+        List<Announcement> announcements = DaoFactory.getAnnouncementDaoImpl().findAnnouncements(MAX_ANNOUNCEMENTS,targetRoles,null);
         if(announcements == null)
             return null;
         List<AnnouncementView> announcementViews = new ArrayList<AnnouncementView>();

 /impl/src/java/pt/estgp/estgweb/services/announcements/LoadTopFlashNewsIterateService.java
 New file
 ,0 → 1,70
+package pt.estgp.estgweb.services.announcements;
+import pt.utl.ist.berserk.logic.serviceManager.IService;
+import pt.utl.ist.berserk.logic.serviceManager.IServiceManager;
+import pt.utl.ist.berserk.logic.serviceManager.ServiceManager;
+import pt.estgp.estgweb.utils.ConfigProperties;
+import pt.estgp.estgweb.domain.views.AnnouncementView;
+import pt.estgp.estgweb.domain.Announcement;
+import pt.estgp.estgweb.domain.UserSession;
+import pt.estgp.estgweb.domain.UserSessionImpl;
+import pt.estgp.estgweb.domain.dao.DaoFactory;
+import pt.estgp.estgweb.Globals;
+import org.apache.log4j.Logger;
+import java.util.List;
+import java.util.ArrayList;
+/**
+ * Created by IntelliJ IDEA.
+ * User: Fabio
+ * Date: 28/Mar/2008
+ * Time: 11:42:28
+ * To change this template use File | Settings | File Templates.
+ */
+public class LoadTopFlashNewsIterateService implements IService
+{
+    private static final String flashNewsIterator = "flashNewsIterator";
+    private static final Logger logger = Logger.getLogger(LoadTopFlashNewsIterateService.class);
+    public AnnouncementView run(UserSession sess)
+    {
+        Integer iterator = (Integer) ((UserSessionImpl)sess).get(flashNewsIterator);
+        if(iterator == null)
+            iterator = 0;
+        int size = DaoFactory.getAnnouncementDaoImpl().countAnnouncements(1,null,Globals.ANNOUNCEMENT_TYPE_TOP_FLASH_NEWS,null);
+        iterator = iterator % size;
+        List<Announcement> announcements = DaoFactory.getAnnouncementDaoImpl().findAnnouncements(iterator, 1,null,Globals.ANNOUNCEMENT_TYPE_TOP_FLASH_NEWS,null);
+        iterator++;
+        ((UserSessionImpl)sess).put(flashNewsIterator,iterator);
+        if(announcements == null)
+            return null;
+        logger.info("Loading announcement top flash iterator");
+        if(announcements.size() > 0)
+        {
+            AnnouncementView announcementView = new AnnouncementView(announcements.get(0));
+            return announcementView;
+        }
+        return null;
+    }
+    //tens de ter cuidado com o nome que metes no servico, tavas a meter LoadRoleTypeMaxAnnouncements e no XML estava LoadRoleTypeMaxAnnouncementsService, o nome nao tem de ser igual a classe mas convem, por norma eu tenho tirado a palavra service do nome do servico
+    //ou seja esta LoadRoleTypeMaxAnnouncements para a classe LoadRoleTypeMaxAnnouncementsService logo no sm.execute tem de estar LoadRoleTypeMaxAnnouncements
+    //mudei a propriedade log.file build.properties para log.file=${data.dir}/estgweb.log assim ja nao da o erro do log
+    //adicionei as libs jsp-api.jar da pasta tomcat/common/lib para nao te falhar os imports nas TAGS aqui no Intellij
+    //adiciona sempre todos os jars da common aqui no Intellij faltava-te o activation.jar do jaxb e era preciso para o MimeTypeGuesser
+    public static void main(String[] args) throws Throwable {
+        IServiceManager sm = ServiceManager.getInstance();
+        String[] names = new String[]{};
+        Object[] arguments = new Object[]{};
+        AnnouncementView announcementView = (AnnouncementView) sm.execute("testecookie", "LoadTopFlashNewsIterate",arguments,names);
+        System.out.println("-->"+announcementView.getTitle());
+    }
+}

 /impl/src/java/pt/estgp/estgweb/services/authenticate/AuthenticateService.java
 ,6 → 13,9
 import openldap.LdapManagerFactory;
 import java.util.HashMap;
+import java.util.Set;
+import java.util.Iterator;
+import java.util.Map;
 /*
 ,7 → 40,7
     ILdapManager ldapManager = LdapManagerFactory.getLdapManager();
-    public User run(String username, String password, UserSession userSession) throws ServiceException
+    public UserSession run(String username, String password, UserSession userSession) throws ServiceException
     {
         if(userSession.getUser() != null)
             throw new AuthenticateException(AuthenticateException.ALREADY_AUTHENTICATED);
 ,21 → 76,66
         userSession.setUsername(u.getUsername());
         userSession.setUser(u);
         DaoFactory.getUserSessionDaoImpl().reattach(userSession);
-        return u;
+        return userSession;
     }
-    //todo completar isto
     private User getUserInfo(String username)
     {
         HashMap map = ldapManager.getUserInfo(username);
         UserImpl u = DomainObjectFactory.createUserImpl();
-        u.setUsername(username);
-        u.setEmail((String) map.get("email"));
-        u.setName((String) map.get("name"));   //isto esta mal e so para exemplificar depois tem de se ver isto bem
+        u.setUsername(username);
+        u.setName(getName(map));
+        u.setRoles(getRoles(map));
         u.setNewUser(true);
         DaoFactory.getUserDaoImpl().save(u);
         return u;
     }
+    private String getName(HashMap text)
+    {
+       Set s = text.entrySet();
+       Iterator iter = s.iterator();
+       int iterCount=0;
+       String name=null;
+       while(iter.hasNext())
+        {
+            Map.Entry e = (Map.Entry) iter.next();
+            if(iterCount==3)
+            {
+               name=e.getValue().toString();
+            }
+            iterCount++;
+        }
+        return name;
+    }
+    public String getRoles(HashMap text)
+    {
+        Set s = text.entrySet();
+        Iterator iter = s.iterator();
+        int iterCount=0;
+        String roles=null;
+        while(iter.hasNext())
+        {
+            Map.Entry e = (Map.Entry) iter.next();
+            if(iterCount==0)
+            {
+                String[] splitText=e.getValue().toString().split(",");
+                if(splitText[1].contains("CN"))
+                {
+                    roles="student";
+                }
+                else if(splitText[1].contains("OU"))
+                {
+                    roles="teacher";
+                }
+            }
+            iterCount++;
+        }
+        return roles;
+    }
 }

 /impl/src/java/pt/estgp/estgweb/services/urlstat/UrlStatService.java
 ,7 → 39,7
         {
             String relativePath = entry.getKey();
             UrlStatFilter.IntegerContainer ic = entry.getValue();
             UrlStatImpl urlStat = (UrlStatImpl) DaoFactory.getUrlStatDaoImpl().loadOrNullLockUpgrade(relativePath);
             if(urlStat == null)
             {

 /impl/src/java/pt/estgp/estgweb/services/urlstat/ChartBuilderService.java
 ,7 → 105,7
     private String build(HttpServletRequest request, String messageTitle, List<String> relativePaths, Date startDate, Date endDate,ChartTypeEnum type)
     {
-        String location = linkToFileName(relativePaths,startDate,endDate,type.getScale());
+        String location = linkToFileNameEncode(relativePaths,startDate,endDate,type.getScale(),true);
         File img = new File(Globals.TMP_DIR + location);
         if(img.exists() && ((System.currentTimeMillis() - img.lastModified()) < LINK_CHART_EXPIRE_INTERVAL))
         {
 ,7 → 195,7
             String dates = sp.format(startDate) + "_UNTIL_" + sp.format(endDate) + "_" + seriesScaleEnum.getType();
             String path;
             if(encode)
-                path = URIUtil.encodeAll(relativePathName.replaceAll("/","_"),"ISO-8859-1");
+                path = URIUtil.encodePath(relativePathName.replaceAll("/","_"),"ISO-8859-1");
             else
                 path = relativePathName.replaceAll("/","_");
             return LINK_CHART_TMP_DIR + "/" + path + "_" + dates + ".png";
 ,7 → 219,7
 //        UrlStatService.main(null);
         AbstractDao.getCurrentSession().beginTransaction();
         List<String> relativePaths = new ArrayList<String>();
-        relativePaths.add("/Welcome.do");
+        relativePaths.add("/public/announcements/getFlashNews.jsp?sid=0.9998549583612295");
 //        relativePaths.add("/teste2");
         System.out.println(new ChartBuilderService().run(new TestHttpServletRequest(),relativePaths, ChartTypeEnum.weekDays));
         System.out.println(new ChartBuilderService().run(new TestHttpServletRequest(),relativePaths, ChartTypeEnum.monthDays));

 /impl/src/java/pt/estgp/estgweb/domain/UserImpl.java
 ,7 → 14,6
  */
 public class UserImpl extends User
 {
     private boolean newUser = false;
 ,8 → 23,7
     public void setNewUser(boolean newUser) {
         this.newUser = newUser;
-    }
+    }
     /**
      * check if user is in some group
      * @param g to check

/impl/src/java/pt/estgp/estgweb/domain/UserSessionImpl.java
55,13 → 55,13
sessionObjectId.setKeyId(key);
sessionObjectId.setUserSession(this);
sessionObject.setId(sessionObjectId);
getObjects().add(sessionObject);
}
ByteArrayOutputStream os = new ByteArrayOutputStream();
XMLEncoder xenc = new XMLEncoder(os);
xenc.writeObject(obj);
xenc.close();
sessionObject.setXmlObject(os.toString());
getObjects().add(sessionObject);
}

/**

 /impl/src/java/pt/estgp/estgweb/domain/TesteImpl.java
 New file
 ,0 → 1,10
+package pt.estgp.estgweb.domain;
+/**
+ * @author Jorge Machado
+ * @date 9/Abr/2008
+ * @time 16:57:12
+ * @see pt.estgp.estgweb.domain
+ */
+public class TesteImpl extends Teste{
+}

 /impl/src/java/pt/estgp/estgweb/domain/views/AnnouncementView.java
 ,6 → 4,7
 import pt.estgp.estgweb.domain.Image;
 import pt.estgp.estgweb.domain.AnnouncementImpl;
 import pt.estgp.estgweb.utils.RoleManager;
+import pt.estgp.estgweb.utils.ConfigProperties;
 import java.util.List;
 import java.util.Date;
 ,9 → 18,13
  */
 public class AnnouncementView extends DomainObjectView
 {
+    public static final int TEXT_SUMMARY_SIZE = ConfigProperties.getIntProperty("announcements.text.summary.size");
+    public static final int TEXT_SUMMARY_SIZE_SMALL = ConfigProperties.getIntProperty("announcements.text.summary.size.small");
     private long id;
     private String title;
     private String text;
+    private String choosedOwnerRole;
     private List<String> targetRoles;
     private Image bigImage;
     private Image smallImage;
 ,7 → 37,7
     public AnnouncementView()
     {}
     public AnnouncementView(Announcement announcement)
     {
 ,6 → 53,7
         this.counter =announcement.getCounter();
         this.startDate = announcement.getStartDate();
         this.expireDate = announcement.getExpireDate();
+        this.choosedOwnerRole = announcement.getChoosedOwnerRole();
     }
     public void persistViewInObject(Announcement announcement)
 ,9 → 69,18
         announcement.setExpireDate(expireDate);
         announcement.setStatus(status);
         announcement.setCounter(counter);
+        announcement.setChoosedOwnerRole(choosedOwnerRole);
     }
+    public String getChoosedOwnerRole() {
+        return choosedOwnerRole;
+    }
+    public void setChoosedOwnerRole(String choosedOwnerRole) {
+        this.choosedOwnerRole = choosedOwnerRole;
+    }
     public Date getExpireDate() {
         return expireDate;
     }
 ,4 → 194,30
     public void setCounter(Integer counter) {
         this.counter = counter;
     }
+    public String getTextSummary()
+    {
+        if(getText().length() > TEXT_SUMMARY_SIZE)
+            return getText().substring(0,getText().substring(0,TEXT_SUMMARY_SIZE).lastIndexOf(' ')) + "...";
+        return getText();
+    }
+    public String getTextSummarySmall()
+    {
+        if(getText().length() > TEXT_SUMMARY_SIZE_SMALL)
+            return getText().substring(0,getText().substring(0,TEXT_SUMMARY_SIZE_SMALL).lastIndexOf(' ')) + "...";
+        return getText();
+    }
+    public Boolean getHaveAllText()
+    {
+        if(getType().equals("top.flash.news"))
+        {
+            return getText().length() > TEXT_SUMMARY_SIZE;
+        }
+        else
+        {
+            return getText().length() > TEXT_SUMMARY_SIZE_SMALL;
+        }
+    }
 }

 /impl/src/java/pt/estgp/estgweb/domain/dao/impl/AnnouncementDaoImpl.java
 ,6 → 1,8
 package pt.estgp.estgweb.domain.dao.impl;
 import pt.estgp.estgweb.domain.Announcement;
+import pt.estgp.estgweb.domain.User;
+import pt.estgp.estgweb.domain.GenericUser;
 import java.util.List;
 import java.util.ArrayList;
 ,7 → 31,7
         return (AnnouncementDaoImpl) myInstance;
     }
-    public List<Announcement> findAnnouncements(int maxAnnouncements,List<String> roles)
+    public List<Announcement> findAnnouncements(int maxAnnouncements,List<String> roles,String subTarget)
     {
         if(roles == null)
         {
 ,28 → 48,73
             else
                 co = or(co,cor);
         }
+        Criterion coSubTargets=null;
+        if(subTarget==null)
+        {
+             coSubTargets=isNull("subTargets");
+        }
+        else
+        {
+          coSubTargets =eq("subTargets",subTarget);
+        }
         MyCalendar cNow = new MyCalendar();
         MyCalendar calendarWithOutTime = new MyCalendar(cNow.getYear(),cNow.getMonth(),cNow.getDay());
         Date now = calendarWithOutTime.getTime();
         criteria.add(co)
                 .add(or(or(lt("startDate",now),eq("startDate",now)),isNull("startDate")))
                 .add(or(or(gt("expireDate",now),eq("expireDate",now)),isNull("expireDate")))
+                .add(eq("status",true))
+                .add(coSubTargets)
                 .setMaxResults(maxAnnouncements)
                 .addOrder(Order.desc("saveDate"));
         return criteria.list();
     }
-    public List<Announcement> findAnnouncements(int maxAnnouncements,String targetRole,String type)
+    public List<Announcement> findAnnouncements(int maxAnnouncements,List<String> roles,String type,String subTarget)
     {
-        if(targetRole == null)
+        return findAnnouncements(0,maxAnnouncements,roles, type,subTarget);
+    }
+    public List<Announcement> findAnnouncements(int startPage, int maxAnnouncements,List<String> roles,String type,String subTarget)
+    {
+        Criteria criteria = createMaxAnnouncementsRolesTypeCriteria(maxAnnouncements, roles,type,subTarget);
+        return criteria.setFirstResult(maxAnnouncements*startPage).list();
+    }
+    public int countAnnouncements(int maxAnnouncements,List<String> roles,String type,String subTarget)
+    {
+        Criteria criteria = createMaxAnnouncementsRolesTypeCriteria(Integer.MAX_VALUE, roles,type,subTarget);
+        return criteria.list().size();
+    }
+    private Criteria createMaxAnnouncementsRolesTypeCriteria(int maxAnnouncements,List<String> roles,String type,String subTarget)
+    {
+        if(roles == null)
         {
-            targetRole="all";
+            roles = new ArrayList<String>();
+            roles.add("all");
         }
         Criteria criteria = createCriteria();
-        Criterion coRole = like("targetRoles","%" + targetRole + "%");
-        Criterion coType=like("type","%"+type+"%");
+        Criterion coRole = null;
+        for(String role: roles)
+        {
+            Criterion cor = like("targetRoles","%" + role + "%");
+            if(coRole == null)
+                coRole = cor;
+            else
+                coRole = or(coRole,cor);
+        }
+        Criterion coSubTargets=null;
+        if(subTarget==null)
+        {
+             coSubTargets=isNull("subTargets");
+        }
+        else
+        {
+          coSubTargets =eq("subTargets",subTarget);
+        }
+        Criterion coType=eq("type",type);
         MyCalendar cNow = new MyCalendar();
         MyCalendar calendarWithOutTime = new MyCalendar(cNow.getYear(),cNow.getMonth(),cNow.getDay());
         Date now = calendarWithOutTime.getTime();
 ,22 → 122,32
                 .add(coType)
                 .add(or(or(lt("startDate",now),eq("startDate",now)),isNull("startDate")))
                 .add(or(or(gt("expireDate",now),eq("expireDate",now)),isNull("expireDate")))
-                .add(like("targetRoles","%" + targetRole + "%"))
+                .add(eq("status",true))
+                .add(coSubTargets)
                 .setMaxResults(maxAnnouncements)
                 .addOrder(Order.desc("saveDate"));
-        return criteria.list();
+        return criteria;
     }
-    public static void main(String[] args)
+   /* public static void main(String[] args)
     {
         AbstractDao.getCurrentSession().beginTransaction();
-        String role="student";
+        List<String> roles = new ArrayList<String>();
+        roles.add("student");
+        roles.add("teacher");
         String typeNews="news";
-        List<Announcement> as =  new AnnouncementDaoImpl().findAnnouncements(5,role,typeNews);
+        List<Announcement> as =  new AnnouncementDaoImpl().findAnnouncements(5,roles,typeNews);
         for(Announcement a : as)
         {
+            GenericUser us = a.getOwner();
+            List<String> userRoles=us.getOwnerRoles();
+            for(String role:userRoles){
+                System.out.println("--->"+role);
+            }
             System.out.println(a.getSaveDate() + ":" + a.getTitle() + " " + a.getOwner().getName() );
         }
         AbstractDao.getCurrentSession().beginTransaction().commit();
-    }
+    }*/
 }

 /impl/src/java/pt/estgp/estgweb/domain/dao/impl/UserDaoImpl.java
 ,8 → 8,11
 import java.util.List;
+import java.util.Date;
+import java.io.Serializable;
 import pt.estgp.estgweb.domain.User;
+import pt.estgp.estgweb.domain.Announcement;
 /**
  * @author Jorge Machado
 ,7 → 20,7
  * @time 2:51:06
  * @see pt.estgp.estgweb.domain.dao.impl
  */
-public class UserDaoImpl extends UserDao
+public class UserDaoImpl<Announcement> extends UserDao
 {
     public static UserDaoImpl getInstance()
     {
 ,6 → 76,27
         }
     }
+     /**
+     * Used by the base DAO classes but here for your modification Load object
+     * matching the given key and return it.
+     *
+     * @param ID to load
+     * @return a user
+     */
+     public final User loadByID(String ID)
+    {
+        try
+        {
+            return (User) createCriteria()
+                    .add(eq("id",ID))
+                    .uniqueResult();
+        }
+        catch (HibernateException e)
+        {
+            throw new DaoException(e);
+        }
+    }
     /**
      * Used by the base DAO classes but here for your modification Load object
      * matching the given key and return it.
 ,4 → 120,16
         }
     }
+    public Serializable save(User obj)
+    {
+        try {
+            obj.setSaveDate(new Date());
+            return super.save(obj);
+        }
+        catch (HibernateException e) {
+            throw new DaoException(e);
+        }
+    }
 }

 /impl/src/java/pt/estgp/estgweb/domain/dao/impl/ImageDaoImpl.java
 ,5 → 1,14
 package pt.estgp.estgweb.domain.dao.impl;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Criterion;
+import static org.hibernate.criterion.Restrictions.*;
+import pt.estgp.estgweb.domain.Image;
+import java.util.List;
+import jomm.dao.impl.AbstractDao;
 /**
  * @author Jorge Machado
  * @date 28/Fev/2008

 /impl/src/java/pt/estgp/estgweb/domain/dao/impl/TesteDaoImpl.java
 New file
 ,0 → 1,42
+package pt.estgp.estgweb.domain.dao.impl;
+import pt.estgp.estgweb.domain.DomainObjectFactory;
+import pt.estgp.estgweb.domain.Teste;
+import pt.estgp.estgweb.domain.dao.DaoFactory;
+import pt.utl.ist.berserk.logic.serviceManager.IServiceManager;
+import pt.utl.ist.berserk.logic.serviceManager.ServiceManager;
+import pt.utl.ist.berserk.logic.serviceManager.exceptions.ServiceManagerException;
+import pt.utl.ist.berserk.logic.filterManager.exceptions.*;
+/**
+ * @author Jorge Machado
+ * @date 28/Fev/2008
+ * @time 2:51:06
+ * @see pt.estgp.estgweb.domain.dao.impl
+ */
+public class TesteDaoImpl extends TesteDao {
+    public static TesteDaoImpl getInstance() {
+        if (myInstance == null)
+            myInstance = new TesteDaoImpl();
+        return (TesteDaoImpl) myInstance;
+    }
+    public static void main(String[] args) throws ClassNotIFilterException, InvalidFilterException, ServiceManagerException, InvalidFilterExpressionException, IncompatibleFilterException, FilterRetrieveException {
+        Teste t = DomainObjectFactory.createTesteImpl();
+        t.setMorada("portalegre");
+        t.setName("jorge");
+        Object[] args2 = {t};
+        IServiceManager sm = ServiceManager.getInstance();
+        try {
+            sm.execute("123", "TesteSaver", args2);
+        }
+        catch (Throwable e) {
+            System.out.println("Already exist fail creation, gone login now");
+        }
+    }
+}

 /impl/src/java/pt/estgp/estgweb/domain/dao/DaoFactory.java
 ,4 → 64,9
     {
         return UrlStatDayDaoImpl.getInstance();
     }
+    public static TesteDaoImpl getTesteDaoImpl()
+    {
+        return TesteDaoImpl.getInstance();
+    }
 }

/impl/src/java/pt/estgp/estgweb/domain/IOwned.java
14,5 → 14,6
public boolean isOwnedBy(GenericUser u);
public GenericUser getOwner();
public List<String> getOwnerRoles();
public String getChoosedOwnerRole();

}

 /impl/src/java/pt/estgp/estgweb/domain/DomainObjectFactory.java
 ,4 → 72,10
     {
         return new UrlStatDayImpl();
     }
+    public static TesteImpl createTesteImpl()
+    {
+        return new TesteImpl();
+    }
 }

 /impl/src/java/pt/estgp/estgweb/domain/DomainObject.java
 ,6 → 21,8
     private static final String ALL_ROLE = ConfigProperties.getProperty("user.super");
+    public void setSaveDate(Date d){}
     /**
      * can be override in proper classes
      * @return generic user owner of object
 ,7 → 84,12
         return false;
     }
+    public String getChoosedOwnerRole()
+    {
+        return null;
+    }
     public Date getStartTime()
     {
         return MIN_DATE;

 /impl/src/java/pt/estgp/estgweb/web/LayoutProxy.java
 ,7 → 44,7
         {
             try
             {
-                getServletContext().getRequestDispatcher("/layout.do?server=" + server + "&path=" + path + "&layout=" + layout).forward(request,response);
+                getServletContext().getRequestDispatcher("/layout.do?server=" + server + "&path=" + path + "&layout=" + layout + "&" + request.getQueryString()).forward(request,response);
             }
             catch(FileNotFoundException e)
             {

 /impl/src/java/pt/estgp/estgweb/web/Globals.java
 New file
 ,0 → 1,34
+package pt.estgp.estgweb.web;
+import javax.servlet.http.HttpServletRequest;
+/**
+ * @author Fabio
+ * @date 31/Mar/2008
+ * @time 11:19:06
+ * @see pt.estgp.estgweb.web
+ */
+public class Globals
+{
+    private static final String PORTAL_MENU_START_LINK_START = "/proxy/";
+    private static final String PORTAL_MENU_START_LINK_END = "/estgp/public/portal";
+    private static final String PORTAL_MENU_START_LINK_END_AA = "/estgweb/aa";
+    private static final String PORTAL_MENU_START_LINK_END_NUCLEO_ENG = "/estgweb/nucleoeng";
+    public static final String PORTAL_ROLE_VIEW_STUDENT ="?role=student&menu=menu.alunos";
+    public static final String PORTAL_ROLE_VIEW_FUTURE_STUDENT ="?role=futureStudent&menu=menu.futurosAlunos";
+    public static final String PORTAL_ROLE_VIEW_OLD_STUDENT ="?role=oldStudent&menu=menu.antigosAlunos";
+    public static final String PORTAL_ROLE_VIEW_TEACHER ="?role=teacher&menu=menu.docentes";
+    public static String getStartLinkPortalMenu(String layout)
+    {
+        if(layout.contains("AA"))
+            return PORTAL_MENU_START_LINK_START + layout + PORTAL_MENU_START_LINK_END_AA;
+        else if(layout.contains("NucleoEng"))
+            return PORTAL_MENU_START_LINK_START + layout + PORTAL_MENU_START_LINK_END_NUCLEO_ENG;
+        else
+            return PORTAL_MENU_START_LINK_START + layout + PORTAL_MENU_START_LINK_END;
+    }
+}

 /impl/src/java/pt/estgp/estgweb/web/form/TesteForm.java
 New file
 ,0 → 1,26
+package pt.estgp.estgweb.web.form;
+import org.apache.struts.action.ActionForm;
+import pt.estgp.estgweb.domain.Teste;
+import pt.estgp.estgweb.domain.DomainObjectFactory;
+/**
+ * @author Jorge Machado
+ * @date 28/Fev/2008
+ * @time 20:42:25
+ * @see pt.estgp.estgweb.web.form
+ */
+public class TesteForm extends ApplicationForm
+{
+    Teste teste = DomainObjectFactory.createTesteImpl();
+    public Teste getTeste() {
+        return teste;
+    }
+    public void setTeste(Teste teste) {
+        this.teste = teste;
+    }
+}

 /impl/src/java/pt/estgp/estgweb/web/form/announcements/AnnouncementsForm.java
 ,21 → 1,18
 package pt.estgp.estgweb.web.form.announcements;
-import org.apache.struts.action.ActionForm;
+import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionMessages;
-import org.apache.struts.action.ActionMessage;
 import org.apache.struts.upload.FormFile;
+import pt.estgp.estgweb.domain.UserSessionImpl;
 import pt.estgp.estgweb.domain.views.AnnouncementView;
-import pt.estgp.estgweb.domain.Image;
-import pt.estgp.estgweb.domain.DomainObjectFactory;
 import pt.estgp.estgweb.utils.ConfigProperties;
+import pt.estgp.estgweb.web.UserSessionProxy;
 import pt.estgp.estgweb.web.form.ApplicationForm;
 import pt.estgp.estgweb.web.utils.DatesUtils;
+import java.util.ArrayList;
 import java.util.List;
-import jomm.utils.MessageResources;
 /**
  * @author Jorge Machado
  * @date 28/Fev/2008
 ,11 → 22,16
 public class AnnouncementsForm extends ApplicationForm
 {
+    private static final Logger logger = Logger.getLogger(AnnouncementsForm.class);
+    private static final String TARGET_ROLES_KEY = "targetRoles";
     private AnnouncementView announcementView;
     private String role;
     private String startDate;
     private String expireDate;
+    private String urlProtocol;
+    private String url;
     private FormFile bigImage;
     private FormFile smallImage;
     private String targetRolesStr;
 ,6 → 40,7
     private List<String> selectedRoles;
     private static List<String> targetRoles = ConfigProperties.getListValues("user.role");
     private static List<String> announcementTypes = ConfigProperties.getListValues("announcements.type");
     private static List<String> targetPriorities = ConfigProperties.getListValues("announcements.priority");
 ,6 → 162,22
     }
+    public String getUrlProtocol() {
+        return urlProtocol;
+    }
+    public void setUrlProtocol(String urlProtocol) {
+        this.urlProtocol = urlProtocol;
+    }
+    public String getUrl() {
+        return url;
+    }
+    public void setUrl(String url) {
+        this.url = url;
+    }
     public Integer getCounter() {
         return counter;
     }
 ,9 → 188,34
     public ActionErrors validate(org.apache.struts.action.ActionMapping actionMapping, javax.servlet.http.HttpServletRequest httpServletRequest)
     {
+        UserSessionImpl userSession = null;
+        try
+        {
+            userSession = (UserSessionImpl) UserSessionProxy.loadUserSessionFromRequest(httpServletRequest);
+            List<String> roles = (List<String>) userSession.get(TARGET_ROLES_KEY);
+            if(roles == null || roles.size() == 0)
+            {
+                roles = new ArrayList<String>();
+                roles.add(targetRolesStr);
+                announcementView.setTargetRoles(roles);
+            }
+        }
+        catch (Throwable throwable)
+        {
+            logger.error(throwable,throwable);
+        }
         if(httpServletRequest.getParameter("dispatch").equals("addRole") || httpServletRequest.getParameter("dispatch").equals("removeRole"))
             return null;
         ActionErrors errors = new ActionErrors();
+        if(url.contains("http://"))
+            addMessageWithKeys(errors,httpServletRequest,"errors.notrequired","announcement.protocol.error.http","announcement.linkAnnouncement");
+        if(url.contains("https://"))
+            addMessageWithKeys(errors,httpServletRequest,"errors.notrequired","announcement.protocol.error.https","announcement.linkAnnouncement");
+        if(url.contains("ftp://"))
+            addMessageWithKeys(errors,httpServletRequest,"errors.notrequired","announcement.protocol.error.ftp","announcement.linkAnnouncement");
         if(announcementView.getTitle() == null || announcementView.getTitle().trim().length() == 0)
             addMessageWithKeys(errors,httpServletRequest,"errors.required","announcement.title");
         if(announcementView.getText() == null || announcementView.getText().trim().length() == 0)

 /impl/src/java/pt/estgp/estgweb/web/controllers/TesteController.java
 New file
 ,0 → 1,66
+package pt.estgp.estgweb.web.controllers;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.*;
+import pt.estgp.estgweb.web.controllers.authenticate.AuthenticateController;
+import pt.estgp.estgweb.web.utils.RequestUtils;
+import pt.estgp.estgweb.web.UserSessionProxy;
+import pt.estgp.estgweb.web.form.TesteForm;
+import pt.estgp.estgweb.web.exceptions.NoCookiesException;
+import pt.estgp.estgweb.services.authenticate.AuthenticateException;
+import pt.estgp.estgweb.domain.UserSession;
+import pt.estgp.estgweb.Globals;
+import pt.utl.ist.berserk.logic.serviceManager.IServiceManager;
+import pt.utl.ist.berserk.logic.serviceManager.ServiceManager;
+import pt.utl.ist.berserk.logic.serviceManager.exceptions.ServiceManagerException;
+import pt.utl.ist.berserk.logic.filterManager.exceptions.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import java.io.IOException;
+/**
+ * @author Jorge Machado
+ * @date 26/Fev/2008
+ * @time 18:01:54
+ * @see pt.estgp.estgweb.web
+ */
+public class TesteController extends ApplicationDispatchController
+{
+    private static final Logger logger = Logger.getLogger(TesteController.class);
+    public ActionForward save(ActionMapping mapping,
+                                 ActionForm form ,
+                                 HttpServletRequest request,
+                                 HttpServletResponse response)
+            throws IOException, ServletException
+    {
+        TesteForm tf = (TesteForm) form;
+        Object[] args2 = {tf.getTeste()};
+        IServiceManager sm = null;
+        try
+        {
+            sm = ServiceManager.getInstance();
+        }
+        catch (Exception e)
+        {
+            logger.error(e);
+        }
+        try
+        {
+            sm.execute(RequestUtils.getRequester(request), "TesteSaver", args2);
+        }
+        catch (Throwable e)
+        {
+            System.out.println("Already exist fail creation, gone login now");
+        }
+        return mapping.findForward("ok");
+    }
+}

 /impl/src/java/pt/estgp/estgweb/web/controllers/announcements/AnnouncementsController.java
 ,7 → 38,7
 {
     private static final Logger logger = Logger.getLogger(AnnouncementsController.class);
     private static final String TARGET_ROLES_KEY = "targetRoles";
     public ActionForward save(ActionMapping mapping,
 ,14 → 54,10
             if(announcementsForm.getAnnouncementView().getId() <= 0)
             {
                 Announcement a = DomainObjectFactory.createAnnouncementImpl();
-                UserSessionImpl userSession = null;
-                userSession = (UserSessionImpl) request.getAttribute(Globals.USER_SESSION_KEY);
-                List<String> roles = (List<String>) userSession.get(TARGET_ROLES_KEY);
-                announcementsForm.getAnnouncementView().setTargetRoles(roles);
                 announcementsForm.getAnnouncementView().persistViewInObject(a);
                 IServiceManager sm = ServiceManager.getInstance();
-                if(announcementsForm.getBigImage()!= null)
+                if(announcementsForm.getBigImage().getFileSize()!= 0)
                 {
                     FormFile bigImage = announcementsForm.getBigImage();
                     InputStream stream = bigImage.getInputStream();
 ,13 → 71,15
                     b.close();
                     Image i = DomainObjectFactory.createImageImpl();
                     i.setImage(b.toByteArray());
+                    i.setContentType(bigImage.getContentType());
+                    i.setSize(bigImage.getFileSize());
                     i.setDescription(a.getTitle());
                     i.setName(bigImage.getFileName());
                     i.setSaveDate(new Date());
                     a.setBigImage(i);
                 }
-                if(announcementsForm.getSmallImage()!= null)
+                if(announcementsForm.getSmallImage().getFileSize()!= 0)
                 {
                     FormFile smallImage = announcementsForm.getSmallImage();
                     InputStream stream2 = smallImage.getInputStream();
 ,11 → 94,24
                     Image i2 = DomainObjectFactory.createImageImpl();
                     i2.setImage(b2.toByteArray());
                     i2.setDescription(a.getTitle());
+                    i2.setContentType(smallImage.getContentType());
+                    i2.setSize(smallImage.getFileSize());
                     i2.setName(smallImage.getFileName());
                     i2.setSaveDate(new Date());
                     a.setSmallImage(i2);
                 }
+                String finalUrl="";
+                if(!announcementsForm.getUrl().equals(""))
+                {
+                    finalUrl=announcementsForm.getUrlProtocol()+announcementsForm.getUrl();
+                    a.setUrl(finalUrl);
+                }
+                else
+                {
+                    a.setUrl(finalUrl);
+                }
                 String[] names = new String[]{"object"};
                 Object[] args = new Object[]{a};
                 AnnouncementView aV = (AnnouncementView) sm.execute(RequestUtils.getRequester(request),"CreateAnnouncement",args,names);
 ,10 → 120,7
             }
             else
             {
-                UserSessionImpl userSession = (UserSessionImpl) request.getAttribute(Globals.USER_SESSION_KEY);
-                List<String> roles = (List<String>) userSession.get(TARGET_ROLES_KEY);
                 AnnouncementView a = announcementsForm.getAnnouncementView();
-                a.setTargetRoles(roles);
                 IServiceManager sm = ServiceManager.getInstance();
                 String[] names = new String[]{"object"};
                 Object[] args = new Object[]{a};
 ,7 → 164,7
         }
     }
+    //TODO verificar problema com com dispatch=edit
     public ActionForward edit(ActionMapping mapping,
                               ActionForm form ,
                               HttpServletRequest request,
 ,7 → 176,6
             UserSessionImpl sess = (UserSessionImpl) UserSessionProxy.loadUserSession(request);
             sess.clearObjects();
             sess.serialize(request);
             IServiceManager sm = ServiceManager.getInstance();
             String[] names = new String[]{"serializable"};
             Object[] args = new Object[]{new Long(request.getParameter("id"))};

 /impl/src/java/pt/estgp/estgweb/web/controllers/authenticate/AuthenticateController.java
 ,6 → 12,9
 import pt.estgp.estgweb.services.authenticate.AuthenticateException;
 import pt.estgp.estgweb.Globals;
 import pt.estgp.estgweb.domain.UserSession;
+import pt.estgp.estgweb.domain.User;
+import pt.estgp.estgweb.domain.UserImpl;
+import pt.estgp.estgweb.domain.UserSessionImpl;
 import pt.utl.ist.berserk.logic.serviceManager.IServiceManager;
 import pt.utl.ist.berserk.logic.serviceManager.ServiceManager;
 import pt.utl.ist.berserk.logic.serviceManager.exceptions.ServiceManagerException;
 ,12 → 40,12
     private static final Logger logger = Logger.getLogger(AuthenticateController.class);
     public ActionForward login(ActionMapping mapping,
-                                 ActionForm form ,
-                                 HttpServletRequest request,
-                                 HttpServletResponse response)
-            throws IOException, ServletException
+                               ActionForm form ,
+                               HttpServletRequest request,
+                               HttpServletResponse response)
+            throws IOException,ServletException
     {
         String username = request.getParameter("username");
         String password = request.getParameter("password");
 ,9 → 53,13
         {
             IServiceManager sm = ServiceManager.getInstance();
             Object[] args = new Object[]{username,password};
-            sm.execute(RequestUtils.getRequester(request),"Authenticate",args);
-            UserSessionProxy.loadUserSession(request);
-            return mapping.findForward("success");
+            UserSession userSession = (UserSession) sm.execute(RequestUtils.getRequester(request),"Authenticate",args);
+            request.setAttribute(Globals.USER_SESSION_KEY,userSession);
+            if(!((UserImpl)userSession.getUser()).isNewUser())
+                return mapping.findForward("success");
+            else
+                return mapping.findForward("firstTimeAuthenticate");
         }
         catch (AuthenticateException e)
         {
 ,9 → 78,9
     }
     public ActionForward logout(ActionMapping mapping,
-                                 ActionForm form ,
-                                 HttpServletRequest request,
-                                 HttpServletResponse response)
+                                ActionForm form ,
+                                HttpServletRequest request,
+                                HttpServletResponse response)
             throws IOException, ServletException
     {

 /impl/src/java/pt/estgp/estgweb/web/filters/UserSessionFilter.java
 ,7 → 43,9
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
             throws IOException, ServletException
     {
         HttpServletRequest hrequest = (HttpServletRequest) request;
         if(((HttpServletRequest)request).getServletPath().indexOf("errorNoCookies.do")>=0 || !hrequest.isRequestedSessionIdFromCookie())
             chain.doFilter(request,response);
         try

 /impl/src/java/pt/estgp/estgweb/web/ImageStream.java
 New file
 ,0 → 1,54
+package pt.estgp.estgweb.web;
+import pt.estgp.estgweb.domain.Image;
+import pt.estgp.estgweb.domain.dao.impl.ImageDaoImpl;
+import java.io.*;
+import javax.servlet.*;
+import javax.servlet.http.*;
+import jomm.dao.impl.AbstractDao;
+import org.apache.log4j.Logger;
+/**
+ * @author Fabio
+ * @date 4/Abr/2008
+ * @time 11:03:00
+ * @see pt.estgp.estgweb.web
+ */
+public class ImageStream extends HttpServlet
+{
+    private static final Logger logger = Logger.getLogger(ImageStream.class);
+    public void doGet (HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException
+    {
+        String imageRequarired = request.getPathInfo();
+        imageRequarired=imageRequarired.substring(1);
+        long id=Long.parseLong(imageRequarired.trim());
+        AbstractDao.getCurrentSession().beginTransaction();
+        Image image = new ImageDaoImpl().get(id);
+        try {
+            response.setContentType(image.getContentType());
+            byte[] imagemStream = image.getImage();
+            response.setContentLength(imagemStream.length);
+            OutputStream out = response.getOutputStream();
+            if(imagemStream!=null)
+                out.write(imagemStream);
+            else
+                logger.warn("Image "+image.getId()+" has 0 bytes");
+            out.flush();
+            out.close();
+        }
+        catch (Exception e1)
+        {
+            e1.printStackTrace();
+        }
+        AbstractDao.getCurrentSession().getTransaction().commit();
+    }
+}

 /impl/src/java/pt/estgp/estgweb/web/tags/IsAdminTag.java
 ,7 → 21,7
     public int doEndTag() throws JspException {
         UserSessionImpl userSession = (UserSessionImpl) pageContext.getRequest().getAttribute(Globals.USER_SESSION_KEY);
-        if(userSession!=null && userSession.getUser() !=null && ((UserImpl)userSession.getUser()).hasRole(Globals.ADMIN_ROLE))
+        if(userSession!=null && userSession.getUser() !=null && (((UserImpl)userSession.getUser()).hasRole(Globals.ADMIN_ROLE) || ((UserImpl)userSession.getUser()).isSuperuser()))
         {
             String toPage = bodyContent.getString().trim();
             JspWriter writer = pageContext.getOut();

 /impl/src/java/pt/estgp/estgweb/web/tags/IsNotAdminTag.java
 New file
 ,0 → 1,44
+package pt.estgp.estgweb.web.tags;
+import org.apache.log4j.Logger;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import pt.estgp.estgweb.domain.UserSessionImpl;
+import pt.estgp.estgweb.domain.UserImpl;
+import pt.estgp.estgweb.Globals;
+public class IsNotAdminTag extends BodyTagSupport {
+    private static final Logger logger = Logger.getLogger(IsNotAdminTag.class);
+    public int doStartTag() throws JspException {
+        return EVAL_BODY_TAG;
+    }
+    public int doEndTag() throws JspException {
+        UserSessionImpl userSession = (UserSessionImpl) pageContext.getRequest().getAttribute(Globals.USER_SESSION_KEY);
+        if(userSession == null || userSession.getUser() == null || !(((UserImpl)userSession.getUser()).hasRole(Globals.ADMIN_ROLE) && !((UserImpl)userSession.getUser()).isSuperuser()))
+        {
+            String toPage = bodyContent.getString().trim();
+            JspWriter writer = pageContext.getOut();
+            try
+            {
+                writer.write(toPage);
+            }
+            catch(Exception e)
+            {
+                logger.error(e,e);
+                throw new JspException(e);
+            }
+        }
+        // Continue processing this page
+        return EVAL_PAGE;
+    }
+}

 /impl/src/java/pt/estgp/estgweb/web/tags/OwnerImageRoleTag.java
 New file
 ,0 → 1,67
+package pt.estgp.estgweb.web.tags;
+import org.apache.log4j.Logger;
+import org.apache.struts.util.RequestUtils;
+import javax.servlet.jsp.tagext.TagSupport;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.http.HttpServletRequest;
+import jomm.utils.MessageResources;
+import pt.estgp.estgweb.domain.IOwned;
+import pt.estgp.estgweb.domain.GenericUser;
+import pt.estgp.estgweb.utils.ConfigProperties;
+public class OwnerImageRoleTag extends TagSupport {
+    private static final Logger logger = Logger.getLogger(OwnerImageRoleTag.class);
+    private String name;
+    private String property;
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getProperty() {
+        return property;
+    }
+    public void setProperty(String property) {
+        this.property = property;
+    }
+    public int doStartTag() throws JspException {
+        HttpServletRequest hrequest = (HttpServletRequest) pageContext.getRequest();
+         Object bean = null;
+        if(name != null)
+            bean = RequestUtils.lookup(pageContext, name, property, null);
+        IOwned owned = (IOwned) bean;
+        String role = null;
+        if(owned != null)
+            role = owned.getChoosedOwnerRole();
+        String img = ConfigProperties.getProperty("role." + role + ".img");
+        if(role == null || role.trim().length() == 0 || img == null || img.equals("role." + role + ".img"))
+            img = ConfigProperties.getProperty("announcement.default.img");
+        String imgStr = "<img alt=\"" + MessageResources.getMessage(hrequest,"user.role." + role) + "\" src=\"" + hrequest.getContextPath() + img + "\">";
+        JspWriter writer = pageContext.getOut();
+        try
+        {
+            writer.write(imgStr);
+        }
+        catch(Exception e)
+        {
+            logger.error(e,e);
+            throw new JspException(e);
+        }
+        return (SKIP_BODY);
+    }
+}

 /impl/src/java/pt/estgp/estgweb/examples/DBInit.java
 ,10 → 21,15
     {
         AbstractDao.getCurrentSession().beginTransaction();
         UserImpl user = DomainObjectFactory.createUserImpl();
-        user.setUsername("1");
+        user.setUsername("super");
         user.setRoles("all,admin");
         user.setPassword(BytesUtils.getMD5("1"));
         DaoFactory.getUserDaoImpl().save(user);
+        UserImpl userStudent = DomainObjectFactory.createUserImpl();
+        userStudent.setUsername("student");
+        userStudent.setRoles("student");
+        userStudent.setPassword(BytesUtils.getMD5("1"));
+        DaoFactory.getUserDaoImpl().save(userStudent);
         AbstractDao.getCurrentSession().getTransaction().commit();
     }
 }

 /impl/src/hbm/pt/estgp/estgweb/domain/GenericUser.hbm.xml
 New file
 ,0 → 1,47
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping
+        PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+    <class name="pt.estgp.estgweb.domain.GenericUser" table="user" abstract="true">
+        <meta attribute="extends">pt.estgp.estgweb.domain.DomainObject</meta>
+        <meta attribute="scope-class">public abstract</meta>
+        <id name="id" type="long">
+            <generator class="native"/>
+        </id>
+        <discriminator column="discrimitator"/>
+        <timestamp name="updateDate" unsaved-value="null"/>
+        <property name="saveDate" type="timestamp"/>
+        <property name="superuser" type="boolean"/>
+        <property name="name" type="string"/>
+        <subclass name="pt.estgp.estgweb.domain.Group">
+            <meta attribute="scope-class">public abstract</meta>
+            <set name="users" table="group_users">
+                <key column="group_id"/>
+                <many-to-many column="user_id" class="pt.estgp.estgweb.domain.User"/>
+            </set>
+            <subclass name="pt.estgp.estgweb.domain.GroupImpl" discriminator-value="GroupImpl"/>
+        </subclass>
+        <subclass name="pt.estgp.estgweb.domain.User">
+            <meta attribute="scope-class">public abstract</meta>
+            <property name="username" type="string" unique="true" length="50"/>
+            <property name="password" type="string"/>
+            <property name="roles" type="text"/>
+            <property name="address" type="text"/>
+            <property name="zip" type="string"/>
+            <property name="country" type="string"/>
+            <property name="email" type="string"/>
+            <property name="phonenumber" type="string"/>
+            <set name="groups" table="group_users">
+                <key column="user_id"/>
+                <many-to-many column="group_id" class="pt.estgp.estgweb.domain.Group"/>
+            </set>
+            <set name="courses" order-by="course.name asc" lazy="true">
+                <key column="user_id"/>
+                <one-to-many class="pt.estgp.estgweb.domain.CourseUserAssociation"/>
+            </set>
+            <subclass name="pt.estgp.estgweb.domain.UserImpl" discriminator-value="UserImpl"/>
+        </subclass>
+    </class>
+</hibernate-mapping>

 /impl/src/hbm/pt/estgp/estgweb/domain/Image.hbm.xml
 ,6 → 14,8
         <timestamp name="updateDate" unsaved-value="null"/>
         <property name="saveDate" type="timestamp"/>
         <property name="name" type="string"/>
+        <property name="contentType" type="string"/>
+        <property name="size" type="int"/>
         <property name="description" type="text"/>
         <property name="image" type="binary" length="4194304"/>
         <subclass name="pt.estgp.estgweb.domain.ImageImpl" discriminator-value="ImageImpl"/>

 /impl/src/hbm/pt/estgp/estgweb/domain/Teste.hbm.xml
 New file
 ,0 → 1,20
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping
+        PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+    <class name="pt.estgp.estgweb.domain.Teste" table="teste" abstract="true">
+        <meta attribute="extends">pt.estgp.estgweb.domain.DomainObject</meta>
+        <meta attribute="scope-class">public abstract</meta>
+        <id name="id" type="long">
+            <generator class="native"/>
+        </id>
+        <discriminator column="discrimitator"/>
+        <timestamp name="updateDate" unsaved-value="null"/>
+        <property name="saveDate" type="timestamp"/>
+        <property name="name" type="string"/>
+        <property name="morada" type="string"/>
+        <subclass name="pt.estgp.estgweb.domain.TesteImpl" discriminator-value="TesteImpl"/>
+    </class>
+</hibernate-mapping>

 /impl/src/hbm/pt/estgp/estgweb/domain/Announcement.hbm.xml
 ,15 → 15,17
         <property name="saveDate" type="timestamp"/>
         <property name="startDate" type="timestamp"/>
         <property name="expireDate" type="timestamp"/>
+        <property name="subTargets" type="string"/>
         <property name="title" type="string"/>
+        <property name="choosedOwnerRole" type="string"/>
         <property name="text" type="text"/>
         <property name="targetRoles" type="text"/>
         <property name="type" type="string" />
         <property name="url" type="string"/>
         <property name="status" type="boolean" />
         <property name="counter" type="integer" />
-        <many-to-one name="bigImage" class="pt.estgp.estgweb.domain.Image" lazy="no-proxy" outer-join="false" cascade="all"/>
-        <many-to-one name="smallImage" class="pt.estgp.estgweb.domain.Image" lazy="no-proxy" outer-join="false" cascade="all"/>
+        <many-to-one name="bigImage" column="bigImage" class="pt.estgp.estgweb.domain.Image" lazy="no-proxy" outer-join="false" cascade="all" />
+        <many-to-one name="smallImage" column="smallImage" class="pt.estgp.estgweb.domain.Image" lazy="no-proxy" outer-join="false" cascade="all"/>
         <many-to-one name="owner" class="pt.estgp.estgweb.domain.GenericUser" lazy="proxy" outer-join="false"/>
         <subclass name="pt.estgp.estgweb.domain.AnnouncementImpl" discriminator-value="AnnouncementImpl"/>
     </class>

/impl/src/web/imgs/rolesIcons/c_cientifico.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream

/impl/src/web/imgs/rolesIcons/nd.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream

/impl/src/web/imgs/rolesIcons/ngm.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream

/impl/src/web/imgs/rolesIcons/estg.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream

/impl/src/web/imgs/rolesIcons/ne.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream

/impl/src/web/imgs/rolesIcons/secretaria.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream

/impl/src/web/imgs/rolesIcons/ass_repre.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream

/impl/src/web/imgs/rolesIcons/c_pedagogico.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream

/impl/src/web/imgs/rolesIcons/ae.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream

/impl/src/web/imgs/rolesIcons/c_directivo.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream

/impl/src/web/imgs/destaque_3_1.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream

/impl/src/web/imgs/destaque_3_3.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream

/impl/src/web/imgs/destaque_3_4.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream

/impl/src/web/imgs/destaque_3_5.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream

/impl/src/web/imgs/docente.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream

/impl/src/web/imgs/destaque_1.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream

/impl/src/web/imgs/destaque_2_1.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream

/impl/src/web/imgs/destaque_2_2.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream

/impl/src/web/imgs/grafico.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream

 /impl/src/web/teste.jsp
 New file
 ,0 → 1,13
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-html.tld"  prefix="html" %>
+<html:form action="/teste">
+    <input type="hidden" name="dispatch" value="save">
+    Nome <html:text property="teste.name"/><br>
+    Morada <html:text property="teste.morada"/><br>
+    <html:submit/>
+</html:form>

 /impl/src/web/auth/firstTimeAuthenticate.jsp
 New file
 ,0 → 1,34
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld"  prefix="bean" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld"  prefix="logic" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-html.tld"  prefix="html" %>
+<bean:message key="authentication.first.time"/> <bean:write name="UserSession" property="name"/>
+<table>
+    <tr>
+        <th><bean:message key="login.firts.time.name"/></th>
+        <td>
+            <html:text name="UserSession" property="name" maxlength="250"/>
+        </td>
+    </tr>
+    <tr>
+        <th><bean:message key="login.first.time.address"/></th>
+        <td>
+        </td>
+    </tr>
+    <tr>
+        <th><bean:message key="login.first.time.zip"/></th>
+        <td>
+        </td>
+    </tr>
+    <tr>
+        <th><bean:message key="login.first.time.email"/></th>
+        <td>
+        </td>
+    </tr>
+    <tr>
+        <th><bean:message key="login.first.time.phone.number"/></th>
+        <td>
+        </td>
+    </tr>
+</table>

/impl/src/web/auth/autenticationok.jsp
8,4 → 8,4
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>

<bean:message key="authentication.ok"/> <bean:write name="USER_SESSION_KEY" property="username"/>
<bean:message key="authentication.ok"/> <bean:write name="UserSession" property="name"/>

 /impl/src/web/admin/announcements/submitAnnouncement.jsp
 ,117 → 4,173
 <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld"  prefix="bean" %>
 <%@ taglib uri="/WEB-INF/tlds/struts-nested.tld"  prefix="nested" %>
 <%@ taglib uri="/WEB-INF/tlds/jomm.tld"  prefix="jomm" %>
+<%@ taglib uri="/WEB-INF/tlds/estgweb.tld" prefix="estgweb" %>
 <jsp:useBean id="AnnouncementsForm" type="pt.estgp.estgweb.web.form.announcements.AnnouncementsForm" scope="request"/>
+<jsp:useBean id="UserSession" type="pt.estgp.estgweb.domain.UserSession" scope="request"/>
 <html:messages id="messages"/>
 <html:errors/>
 <html:form action="/submitAnnouncement" enctype="multipart/form-data">
-    <html:hidden property="role"/>
-    <html:hidden property="announcementView.id"/>
-    <input type="hidden" name="dispatch" value="addRole">
-    <table class="form">
+<html:hidden property="role"/>
+<html:hidden property="announcementView.id"/>
+<input type="hidden" name="dispatch" value="addRole">
+<table class="form">
+<estgweb:isAdmin>
+<tr>
+    <th>
+        <bean:message key="announcement.status"/>
+    </th>
+    <td>
+        <html:select property="announcementView.status">
+            <html:option value="true"><bean:message key="yes"/></html:option>
+            <html:option value="false"><bean:message key="no"/></html:option>
+        </html:select>
+    </td>
+</tr>
+</estgweb:isAdmin>
+<tr>
+    <th>
+        <bean:message key="announcement.typeAnnouncement"/>
+    </th>
+    <td>
+        <html:select property="announcementView.type">
+            <logic:present name="AnnouncementsForm" property="announcementTypes">
+                <logic:iterate id="item" name="AnnouncementsForm" property="announcementTypes">
+                    <jomm:option itemName="item" comparableObjectName="AnnouncementsForm" comparableObjectProperty="announcementView.type">
+                        <bean:message key="announcements.type.${item}"/>
+                    </jomm:option>
+                </logic:iterate>
+            </logic:present>
+        </html:select>
+    </td>
+</tr>
+<logic:present name="UserSession" property="user">
+    <logic:notEmpty name="UserSession" property="user.ownerRoles">
         <tr>
             <th>
-                <bean:message key="announcement.title"/>
+                <bean:message key="announcement.sendAnnouncementLike"/>
             </th>
             <td>
-                <html:text property="announcementView.title" maxlength="250"/>
+                <html:select property="announcementView.choosedOwnerRole">
+                    <logic:iterate id="item" name="UserSession" property="user.ownerRoles">
+                        <jomm:option itemName="item" comparableObjectName="AnnouncementsForm" comparableObjectProperty="announcementView.choosedOwnerRole">
+                            <bean:message key="user.role.${item}"/>
+                        </jomm:option>
+                    </logic:iterate>
+                </html:select>
             </td>
         </tr>
-        <tr>
-            <th>
-                <bean:message key="announcement.startDate"/>
-            </th>
-            <td>
-                <html:text styleClass="date" property="startDate" styleId="startDate" readonly="true"/> <a href="#" onClick="cal.select(getObjectById('startDate'),'anchor1','yyyy/MM/dd'); return false;" name="anchor1" id="anchor1">Escolha a Data</A>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                <bean:message key="announcement.expireDate"/>
-            </th>
-            <td>
-                <html:text styleClass="date" property="expireDate" styleId="expireDate" readonly="true"/> <a href="#" onClick="cal.select(getObjectById('expireDate'),'anchor2','yyyy/MM/dd'); return false;" name="anchor2" id="anchor2">Escolha a Data</A>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                <bean:message key="announcement.bigImage"/>
-            </th>
-            <td>
-                    <html:file property="bigImage"/>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                <bean:message key="announcement.smallImage"/>
-            </th>
-            <td>
-                    <html:file property="smallImage"/>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                <bean:message key="announcement.target.roles"/>
-            </th>
-            <td>
-                <select name="targetRolesStr">
-                    <logic:present name="AnnouncementsForm" property="targetRoles">
-                        <logic:iterate id="item" name="AnnouncementsForm" property="targetRoles">
-                            <jomm:option itemName="item" comparableObjectName="AnnouncementsForm" comparableObjectProperty="targetRolesStr">
-                                <jomm:message patternMessage="user.role.{0}" name0="item"/>
-                            </jomm:option>
-                        </logic:iterate>
-                    </logic:present>
-                </select>
+    </logic:notEmpty>
+</logic:present>
+<tr>
+    <th>
+        <bean:message key="announcement.target.roles"/>
+    </th>
+    <td>
+        <html:select property="targetRolesStr">
+            <estgweb:isAdmin>
+            <logic:present name="AnnouncementsForm" property="targetRoles">
+                <logic:iterate id="item" name="AnnouncementsForm" property="targetRoles">
+                    <jomm:option itemName="item" comparableObjectName="AnnouncementsForm" comparableObjectProperty="targetRolesStr">
+                        <jomm:message patternMessage="user.role.{0}" name0="item"/>
+                    </jomm:option>
+                </logic:iterate>
                 <input type="button" value="<bean:message key="add"/>" onclick="set(this.form,'addRole');this.form.submit()">
+            </logic:present>
+            </estgweb:isAdmin>
+            <estgweb:isNotAdmin>
+                <html:option value="all"><bean:message key="user.role.all"/></html:option>
+                <html:option value="student"><bean:message key="user.role.student"/></html:option>
+                <html:option value="oldStudent"><bean:message key="user.role.oldStudent"/></html:option>
+                <html:option value="futureStudent"><bean:message key="user.role.futureStudent"/></html:option>
+                <html:option value="teacher"><bean:message key="user.role.teacher"/></html:option>
+            </estgweb:isNotAdmin>
+        </html:select>
-                <logic:present name="AnnouncementsForm" property="selectedRoles">
-                    <logic:notEmpty name="AnnouncementsForm" property="selectedRoles">
-                        <ul>
-                            <logic:iterate id="item" name="AnnouncementsForm" property="selectedRoles">
-                                <li><jomm:message patternMessage="user.role.{0}" name0="item"/> <a href="AnnouncementForm.role.value='${item}';set(AnnouncementsForm,'removeRole');AnnouncementForm.submit();"/></li>
-                            </logic:iterate>
-                        </ul>
-                    </logic:notEmpty>
-                </logic:present>
-            </td>
-        </tr>
-         <tr>
-            <th>
-                <bean:message key="announcement.typeAnnouncement"/>
-            </th>
-            <td>
-               <html:select property="announcementView.type">
-                    <logic:present name="AnnouncementsForm" property="announcementTypes">
-                        <logic:iterate id="item" name="AnnouncementsForm" property="announcementTypes">
-                            <jomm:option itemName="item" comparableObjectName="AnnouncementsForm" comparableObjectProperty="announcementView.type">
-                                <bean:message key="announcements.type.${item}"/>
-                            </jomm:option>
-                        </logic:iterate>
-                    </logic:present>
-                </html:select>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                <bean:message key="announcement.linkAnnouncement"/>
-            </th>
-            <td>
-                <html:text property="announcementView.url" maxlength="250"/>
-            </td>
-        </tr>
-        <tr>
-            <th>
-                <bean:message key="announcement.text"/>
-            </th>
-            <td>
-                <html:textarea property="announcementView.text"/>
-            </td>
-        </tr>
-        <tr class="buttons">
-            <td colspan="2">
-                <input type="button" onclick="set(this.form,'save');this.form.submit()" value="<bean:message key="confirm"/>"/>
-            </td>
-        </tr>
-    </table>
+        <logic:present name="AnnouncementsForm" property="selectedRoles">
+            <logic:notEmpty name="AnnouncementsForm" property="selectedRoles">
+                <ul>
+                    <logic:iterate id="item" name="AnnouncementsForm" property="selectedRoles">
+                        <li><jomm:message patternMessage="user.role.{0}" name0="item"/> <a href="AnnouncementForm.role.value='${item}';set(AnnouncementsForm,'removeRole');AnnouncementForm.submit();"/></li>
+                    </logic:iterate>
+                </ul>
+            </logic:notEmpty>
+        </logic:present>
+    </td>
+</tr>
+<tr>
+    <th>
+        <bean:message key="announcement.title"/>
+    </th>
+    <td>
+        <html:text property="announcementView.title" maxlength="250"/>
+    </td>
+</tr>
+<estgweb:isAdmin>
+<tr>
+    <th>
+        <bean:message key="announcement.startDate"/>
+    </th>
+    <td>
+        <html:text styleClass="date" property="startDate" styleId="startDate" readonly="true"/> <a href="#" onClick="cal.select(getObjectById('startDate'),'anchor1','yyyy/MM/dd'); return false;" name="anchor1" id="anchor1">Escolha a Data</A>
+    </td>
+</tr>
+<tr>
+    <th>
+        <bean:message key="announcement.expireDate"/>
+    </th>
+    <td>
+        <html:text styleClass="date" property="expireDate" styleId="expireDate" readonly="true"/> <a href="#" onClick="cal.select(getObjectById('expireDate'),'anchor2','yyyy/MM/dd'); return false;" name="anchor2" id="anchor2">Escolha a Data</A>
+    </td>
+</tr>
+</estgweb:isAdmin>
+<tr>
+    <th>
+        <bean:message key="announcement.bigImage"/>
+    </th>
+    <td>
+        <html:file property="bigImage"/>
+    </td>
+</tr>
+<tr>
+    <th>
+        <bean:message key="announcement.smallImage"/>
+    </th>
+    <td>
+        <html:file property="smallImage"/>
+    </td>
+</tr>
+<tr>
+    <th>
+        <bean:message key="announcement.linkAnnouncement"/>
+    </th>
+    <td>
+        <html:select property="urlProtocol">
+            <html:option value="http://">Http://</html:option>
+            <html:option value="ftp://">ftp://</html:option>
+            <html:option value="https://">Https://</html:option>
+        </html:select>
+        <html:text property="url" maxlength="250"/>
+    </td>
+</tr>
+<tr>
+    <th>
+        <bean:message key="announcement.text"/>
+    </th>
+    <td>
+        <html:textarea property="announcementView.text"/>
+    </td>
+</tr>
+<tr class="buttons">
+    <td colspan="2">
+        <input type="button" onclick="set(this.form,'save');this.form.submit()" value="<bean:message key="confirm"/>"/>
+    </td>
+</tr>
+</table>
 </html:form>

 /impl/src/web/css/style.css
 ,30 → 1,25
-<STYLE>
 /*********** Site Struture *************/
-BODY *
+BODY *, .contentPortal, .contentPortal p, .contentPortal li
 {
-    FONT-FAMILY:  Helvetica;
-    FONT-SIZE:1em;
+    FONT-FAMILY:  "Lucida Grande","Trebuchet MS","bitstream vera sans",Verdana,Arial,Helvetica,sans-serif;
+    FONT-SIZE:0.98em;
 }
 #body
 {
-   width:950px;
-   margin-left: auto;
-   margin-right: auto;
+    width:950px;
+    margin-left: auto;
+    margin-right: auto;
 }
-#header
+#pageStructure
 {
+    border-collapse :collapse ;
     LEFT: 0;
     WIDTH: 100%;
-    BACKGROUND-COLOR: white
 }
-#pageStructure
-{
-    border-collapse :collapse ;
-}
 /*#page
 {
     LEFT: 0;
 ,25 → 38,17
     CLEAR: left;
     LEFT: 0;
     FLOAT: left;
-    PADDING-BOTTOM: 20px;
-    PADDING-TOP: 30px;
+    PADDING-TOP: 43px;
 }
-TD#rightPage{
+TD.rightPage,TD.rightPagePortal
+{
     VERTICAL-ALIGN: top;
     WIDTH: 160px;
 }
-#rightPage
+.rightPagePosition
 {
-    background-color:#ededed;
-    border-right: #8EC73F solid 2px;
-    border-top: #8EC73F solid 2px;
-    border-bottom: #8EC73F solid 2px;
-}
-#rightPagePosition
-{
     CLEAR: left;
     LEFT: 0;
     FLOAT: left;
 ,11 → 83,11
 h1
 {
-    font-size:14pt;
+    font-size:1.2em;
 }
 h2
 {
-    font-size:12pt;
+    font-size:1em;
 }
 /*************************************************************************************/
 ,32 → 96,34
 .portal
 {
 }
-/*.header h1
+.portalContent
 {
-    font-size:20px;
-    color:#FFFFFF;
-    background-color:#8EC73F;
     padding-left:10px;
-    padding-right:10px;
-}*/
+}
+td.column
+{
+    vertical-align:top;
+}
 .portalContent
 {
-padding-left:10px;
+    padding-left:10px;
+    padding-right:10px;
 }
-.block P
+.block P,.navLeftMenu h2
 {
     background-color:#ededed;
     padding-left:10px;
+    margin:0;
 }
 .block UL
 {
     LIST-STYLE-TYPE: none;
-    padding:0;
+    padding-left:10px;
 }
 .block a:link
 ,7 → 138,7
     text-decoration:none;
 }
-.block a:hover
+.block a:hover,.linkUnderlineGrayToGreen a:hover
 {
     color:#8EC73F;
     text-decoration:underline;
 ,262 → 146,307
 .portalLeftAnnouncements table
 {
-table-layout:fixed;
-width:180px;
+    table-layout:fixed;
+    width:180px;
+    padding-top:10px;
 }
 .portalRightAnnouncements table
 {
-table-layout:fixed;
-width:250px;
+    table-layout:fixed;
+    width:250px;
 }
-/*.portalRightAnnouncements table
+.portalAnnouncement a:link,.portalAnnouncement a:visited
 {
-    background-color:#ededed;
-} */
-.portalLeftAnnouncements h1,.portalRightAnnouncements h1
-{
-font-size:10pt;
-margin:0;
+    font-size:10pt;
+    margin:0;
 }
-.portalAnnouncementText
+.portalAnnouncementTitle a
 {
-font-size:10pt;
-color:#4d4d4d;
+    color:#000000;
 }
-/**********************************************************************************/
-/****************************** Standard Page Template ***************************/
-.page,.pageText
+.portalAnnouncement a
 {
-    font-size :11.5pt;
+    text-decoration :none;
 }
-.page P
+.portalAnnouncementText a:link,.portalAnnouncementText a:visited
 {
+    color:#4d4d4d;
 }
-.page h1,.pageHeader h1
+.navleftMenu
 {
-    font-size:15pt;
+    width:180px;
+    padding-left:10px;
 }
-.page h2,.sectionTitle h2
+#portalMenu li.selected  a
 {
-    font-size:13pt;
-    font-weight:bold;
+    color:#8EC73F;
 }
+/**********************************************************************************/
-.page h3,.sectionTitle h3
+/****************************** Standard Page Template ***************************/
+.contentPortal h1
 {
-    font-size:10pt;
-    font-weight:bold;
-    color:#000000;
+    background-color:#8EC73F;
+    color:#FFFFFF;
 }
-.pageHeader h1
+.contentPortal p
 {
-    color:#FFFFFF;
-    background-color:#8EC73F;
-    padding-left:10px;
-    padding-right:10px;
+    margin:0;
+    color:#4d4d4d;
 }
-.portalContent
+.section
 {
+    margin-bottom:10px;
 }
-.pageBlock a:hover
+.contentPortal li a:link,.contentPortal a:visited,.contentPortal li
 {
-  color:#8EC73F;
-  text-decoration :underline;
+    color:#4d4d4d;
 }
-.pageColumnTableSolid
+.contentPortal li a:hover
 {
-    border:#000000 solid 1px;
+    color:#8EC73F;
 }
 .listClean UL /*Lista sem nada*/
 {
-   LIST-STYLE-TYPE: none;
-   padding:0;
+    LIST-STYLE-TYPE: none;
+    padding:0;
 }
 .listCircleWhite UL/*Lista circulo branco*/
 {
-   LIST-STYLE-TYPE: circle;
+    LIST-STYLE-TYPE: circle;
 }
 .listDecimal UL/*Lista decimal*/
 {
-   LIST-STYLE-TYPE: decimal;
+    LIST-STYLE-TYPE: decimal;
 }
 .listDisc UL/*Lista circulo preto*/
 {
-   LIST-STYLE-TYPE: disc;
+    LIST-STYLE-TYPE: disc;
 }
 .listSquare UL/*Lista quadrado preto*/
 {
-   LIST-STYLE-TYPE: square;
+    LIST-STYLE-TYPE: square;
 }
-.pageSection
-{
-}
-.sectionTitle h2
+.portalLeftAnnouncements img
 {
-  color:#000000;
+    height:133px;
+    width:177px;
 }
-.pageText,.pageBlock a,.pageBlock a:visited
+/*PASSA PARA AQUI TUDO O QUE SEJA DE BLOCOS E VAMOS LIMPAR TUDO */
+/*Isto tem de ser generico o H1 jáe um header nao necessita da classe .header para nada*/
+/*Block Titles*/
+.content h1, #lastnews h1
 {
-    color:#4d4d4d;
-    text-decoration:none;
+    margin-bottom:1px;
+    color:#FFFFFF;
+    background-color:#8EC73F;
+    padding-left:10px;
 }
-/*********************************************************************************/
+/*********************************************************************************/
 /******************************* Index Page***************************************/
-.indexPage Table
+#flashTopNews * td, #flashCenterNews * td, #flashBottomNews * td
 {
-    width:100%;
-    border-collapse: collapse;
+    vertical-align:top;
 }
-.flashTopNews
+/*FlashTopNews*/
+#flashTopNews
 {
-   text-align :right;
+    padding:0;
+    margin:0;
 }
-.flashTopNews tr
+#flashTopNews .container
 {
     background-color:#4d4d4d;
+    height:100px;
+    width:100%;
+    margin:0;
 }
-.flashTopNews td,.flashCenterNews td,.flashBottomNews td
+#flashTopNews .container .textContainer
 {
+    margin:0;
+    text-align :justify;
+}
+#flashTopNews .container .imageContainer
+{
+    margin:0;
+    text-align :right;
+    text-decoration:none;
+}
+#flashTopNews img
+{
+    height:167px;
+    width:341px;
+}
+#flashTopNews * td
+{
     vertical-align:top;
 }
-.flashCenterNews
+#flashTopNews .container .textContainer h2
 {
-    border-top-style: dotted;
-    border-top-color:#DEDEDD;
+    margin:0;
+    margin-top:1px;
 }
-.textNewsTop
+#flashTopNews .container .textContainer p
 {
-    text-align :left;
+    margin:0;
+    margin-top:1px;
 }
+#flashTopNews h2 a:link,#flashTopNews h2 a:visited
+{
+    color:#8EC73F;
+    font-weight:bold;
+    text-decoration:none;
+}
+#flashTopNews p a:link, #flashTopNews p a:visited
+{
+    color:#FFFFFF;
+    text-decoration:none;
+}
-.textNewsCenter,.textNewsBottom
+/*FlashCenterNews*/
+#flashCenterNews
 {
+    margin-top:2px;
+    border-top-style: dotted;
+    border-top-color:gray;
+}
+#flashCenterNews .container
+{
+    width:100%;
+    margin:0;
+}
+#flashCenterNews .textContainer
+{
     padding-top :10px;
 }
-.titleNewsTop a:link,.titleNewsCenter a:link,.titleNewsBottom a:link
+#flashCenterNews h2 a:link,#flashCenterNews h2 a:visited
 {
     color:#8EC73F;
     font-weight:bold;
+    text-decoration:none;
 }
-.titleNewsCenter,.descriptionNewsCenter,.descriptionNewsBottom
+#flashCenterNews p a:link, #flashCenterNews p a:visited
 {
-    text-decoration:underline;
+    color:#4d4d4d;
+    text-decoration:none;
 }
-.descriptionNewsCenter a:link,.descriptionNewsCenter a:visited,.descriptionNewsBottom a:link,.descriptionNewsBottom a:visited
+#flashCenterNews img,#flashCenterNews td.imageContainer
 {
-    color:#4d4d4d;
+    width:133px;
+    height:133px;
 }
-.descriptionNewsTop a:link,.descriptionNewsTop a:visited
+/*FlashBottomNews*/
+#flashBottomNews img
 {
-    color:#FFFFFF;
+    width:100px;
+    height:100px;
 }
-.imageNewsCenter
+#flashBottomNews h2 a:link,#flashBottomNews h2 a:visited
 {
-    width:50px;
+    color:#8EC73F;
+    font-weight:bold;
 }
-.titleNewsTop,.titleNewsCenter,.titleNewsBottom,.descriptionNewsCenter,.descriptionNewsBottom,.descriptionNewsTop
+#flashBottomNews p a:link,#flashBottomNews p a:visited
 {
-    padding-left :10px;
+    color:#4d4d4d;
 }
-/*********************************************************************************/
-/*****************************Left Menu Style************************************/
-#leftMenuModule LI A:link
+/*Last News Block*/
+#lastnews ul
 {
-    PADDING-RIGHT: 0;
-    FONT-SIZE: 14px;
-    DISPLAY: block;
-    PADDING-LEFT: 10px;
-    PADDING-BOTTOM: 0;
-    PADDING-TOP: 0;
-    HEIGHT: 1%;
+    list-style: none;
+    width:160px;
+    LIST-STYLE-TYPE: none;
+    padding:0;
+    margin:0;
 }
-#leftMenuModule LI A:visited
+#lastnews li
 {
-    PADDING-RIGHT: 0;
-    DISPLAY: block;
-    PADDING-LEFT: 10px;
-    PADDING-BOTTOM: 0;
-    PADDING-TOP: 0;
-    HEIGHT: 1%;
-    FONT-SIZE: 14px;
+    margin:0;
+    padding:0;
 }
+#lastnews li h2
+{
+    padding:0;
+    padding-left:2px;
+    margin:1px;
+}
+#lastnews li h2 a,.linkLeftMenu a
+{
+    text-decoration:none;
+}
+#lastnews li h2 a:link,.linkLeftMenu a:link
+{
+    color:#4d4d4d;
+}
+#lastnews li h2 a:visited,.linkLeftMenu a:visited
+{
+    color:#4d4d4d;
+}
+#lastnews li h2 a:hover,.linkLeftMenu a:hover
+{
+    color:#8EC73F;
+}
-#leftMenuModule P
+/**/
+/*LEFT MENUS*/
+#leftMenuModule h2
 {
-    COLOR:#8EC73F;
     MARGIN: 0;
-    PADDING-LEFT: 5px ;
-    FONT-SIZE: 14px;
+    color:#8EC73F;
 }
 #leftMenuModule UL
 {
-    PADDING-RIGHT: 0;
-    PADDING-LEFT: 0;
     MARGIN: 0;
     WIDTH: 155px;
-    LINE-HEIGHT: 1.5em;
 }
+/*********************************************************************************/
-#leftMenuModule LI
-{
-    COLOR:#8EC73F;
-    FONT-SIZE: 14px;
-    LIST-STYLE-TYPE: none;
-}
-/**********************************************************************************/
 /****************** topnav **********************/
 #topnav
 {
-    BACKGROUND-COLOR: #FDE1CD;
-    BORDER-RIGHT-COLOR: #ccc;
+    color:#FFFFFF;
+    text-decoration:none;
+    BACKGROUND-COLOR: #8EC73F;
     FONT: 11px/20px "bitstream vera sans", "Lucida Grande", "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif
 }
 #topnav LI A:hover
 {
-    COLOR: #000000;
-    BACKGROUND-COLOR: #ffffcc
+    COLOR:#4d4d4d;
+    BACKGROUND-COLOR: #FFFFFF
 }
+#topnav LI A
+{
+    color:#FFFFFF;
+    text-decoration:none;
+}
 #topnav UL
 {
 ,32 → 467,44
     PADDING-LEFT: 0;
     PADDING-BOTTOM: 0;
     MARGIN: 0;
-    PADDING-TOP: 0
+    PADDING-TOP: 0;
 }
-*****************************************************************************************/
+/*****************************************************************************************/
 /************************************** Content Structure ********************************/
-#content1,#content2,#content3,#content4
+.content,.contentPortal
 {
     LEFT: 0;
     RIGHT: 0;
     WIDTH: 100%;
     PADDING-BOTTOM: 10px;
     VERTICAL-ALIGN: top;
+}
+.contentPortal
+{
     border-left: #8EC73F solid 2px;
     border-top: #8EC73F solid 2px;
     border-bottom: #8EC73F solid 2px;
 }
+.rightPagePortal
+{
+    background-color:#ededed;
+    border-right: #8EC73F solid 2px;
+    border-top: #8EC73F solid 2px;
+    border-bottom: #8EC73F solid 2px;
+}
 /*****************************************************************************************/
 /************************************* Footer Modules ***********************************/
 #license UL
 {
-    COLOR: #4D4D4D;
+    COLOR: #4D4D4D;
     PADDING-RIGHT: 0;
     PADDING-LEFT: 0;
     FONT-SIZE: 12px;
 ,6 → 521,15
 {
 }
+#footer a:link,#footer a:visited
+{
+    color:#4d4d4d;
+}
+#footer a:hover
+{
+    color:#8EC73F;
+}
 /**************************************************************************************/
 /******************************** Bar Module Color ************************************/
 ,268 → 545,31
 /******************************** Background Color ************************************/
 /*Gray background*/
-#backOne
+#backOne
 {
     background-color:#4D4D4D;
 }
 /**************************************************************************************/
-/********************************* Link Types Color************************************/
-/*Gray to green */
-#linkTypeOne LI A:link
-{
-    COLOR:#4D4D4D;
-    TEXT-DECORATION: none;
-}
-#linkTypeOne UL LI A:hover
-{
-    COLOR:#8EC73F;
-    TEXT-DECORATION: none;
-}
-#linkTypeOne LI A:visited
-{
-    COLOR:#4D4D4D;
-    TEXT-DECORATION: none;
-}
-/*Gray to green underline*/
-.linkTypeTwo li a:hover
-{
-    text-decoration: underline;
-    color:#8EC73F;
-    list-style:none;
-}
-.linkTypeTwo a:link
-{
-    text-decoration: none;
-    color:#4D4D4D;
-    list-style:none;
-}
-.linkTypeTwo a:visited
-{
-    text-decoration: none;
-    color:#4D4D4D;
-    list-style:none;
-}
-/*Green to green underline*/
-.linkTypeThree a:hover
-{
-    text-decoration: underline;
-    color:#8EC73F;
-    list-style:none;
-}
-.linkTypeThree a:link
-{
-    text-decoration: none;
-    color:#8EC73F;
-    list-style:none;
-}
-.linkTypeThree a:visited
-{
-    text-decoration: none;
-    color:#4D4D4D;
-    list-style:none;
-}
-/*Gray underline to green underline*/
-#linkTypeFour A:link
-{
-  COLOR:#4D4D4D;
-  list-style:none;
-}
-#linkTypeFour A:hover
-{
-  list-style:none;
-  COLOR:#8EC73F;
-}
-#linkTypeFour A:visited
-{
-  list-style:none;
-  COLOR:#4D4D4D;
-}
-/*White to White underline*/
-.linkTypeFive a:hover
-{
-    text-decoration: underline;
-    color:#FFFFFF;
-    list-style:none;
-}
-.linkTypeFive a:link
-{
-    text-decoration: none;
-    color:#FFFFFF;
-    list-style:none;
-}
-.linkTypeFive a:visited
-{
-    text-decoration: none;
-    color:#FFFFFF;
-    list-style:none;
-}
-/*Gray*/
-.linkTypeSix a:hover
-{
-    color:#4D4D4D;
-    list-style:none;
-}
-.linkTypeSix a:link
-{
-    text-decoration: none;
-    color:#4D4D4D;
-    list-style:none;
-}
-.linkTypeSix a:visited
-{
-    text-decoration: none;
-    color:#4D4D4D;
-    list-style:none;
-}
-/*Green*/
-.linkTypeSeven a:hover
-{
-    color:#8EC73F;
-    list-style:none;
-}
-.linkTypeSeven a:link
-{
-    text-decoration: none;
-    color:#8EC73F;
-    list-style:none;
-}
-.linkTypeSeven a:visited
-{
-    text-decoration: none;
-    color:#8EC73F;
-    list-style:none;
-}
-/*White*/
-.linkTypeHeight a:hover
-{
-    color:#FFFFFF;
-    list-style:none;
-}
-.linkTypeHeight a:link
-{
-    text-decoration: none;
-    color:#FFFFFF;
-    list-style:none;
-}
-.linkTypeHeight a:visited
-{
-    text-decoration: none;
-    color:#FFFFFF;
-    list-style:none;
-}
-/*Gray Underline*/
-.linkTypeNine a:hover
-{
-     text-decoration: underline;
-    color:#4D4D4D;
-    list-style:none;
-}
-.linkTypeNine a:link
-{
-    text-decoration: underline;
-    color:#4D4D4D;
-    list-style:none;
-}
-.linkTypeNine a:visited
-{
-    text-decoration: underline;
-    color:#4D4D4D;
-    list-style:none;
-}
-/*Green Underline*/
-.linkTypeTen a:hover
-{
-    text-decoration: underline;
-    color:#8EC73F;
-    list-style:none;
-}
-.linkTypeTen a:link
-{
-    text-decoration: underline;
-    color:#8EC73F;
-    list-style:none;
-}
-.linkTypeTen a:visited
-{
-    text-decoration: underline;
-    color:#8EC73F;
-    list-style:none;
-}
-/**************************************************************************************/
 /*************************Staff Links Structure***************************************/
 .staffLinks P
 {
-  font-weight :bold;
+    font-weight :bold;
 }
 /*************************************************************************************/
-/************************Announcements Structure*********************************/
-.lastAnnouncementsModule td
+form , .boxHorizontal
 {
-    padding-top:3px;
-    padding-right:15px;
-    text-align: left;
+    margin:0;
+    padding:3px;
+    border:0px #793B0D solid ;
+    background-color:#FFFFFF;
 }
-.lastAnnouncementsModule td ul
+.boxHorizontal
 {
-    list-style:none;
-    padding:0;
-    padding-left:5px;
-    WIDTH: 155px;
+    padding-top:33px;
+    padding-left:180px;
 }
-.padLeft10
-{
-    padding-left:10px;
-}
-.topSpace
-{
-    padding-Top :10px;
-}
-/**********************************************************************************/
-.form , .boxHorizontal
-{
-    margin:0;
-    padding:3px;
-    border:1px #793B0D solid ;
-    background-color:#F5BB91;
-}
 .form th, .boxHorizontal th
 {
     margin:0;
 ,10 → 577,10
     padding-top:3px;
     padding-bottom:3px;
     padding-right:15px;
-    color:#793B0D;
-    background-color: #F5BB91;
-    border: 1px solid #793B0D;
-    font-size:0.76em;
+    color:#4d4d4d;
+    background-color: #FFFFFF;
+    border: 0px solid #793B0D;
+    font-size:0.86em;
     font-weight:bold;
     font-family:Helvetica,sans-serif;
     text-align:left;
 ,7 → 595,7
     padding-right:15px;
     color:#793B0D;
     background-color: #FFFFFF;
-    border: 1px solid #793B0D;
+    border: 0px solid #793B0D;
     font-size:0.8em;
     font-family:Helvetica,sans-serif;
     vertical-align:middle;
 ,7 → 604,7
 .form .buttons td, .boxHorizontal .buttons td
 {
     text-align:center;
-    background-color: #FDE1CD;
+    background-color: #FFFFFF;
 }
 .form textarea, .boxHorizontal textarea
 ,7 → 665,7
 input[type="button"], input[type="submit"]
 {
-    color: black;
+    color: #4d4d4d;
     border-top-width: 1px;
     border-right-width: 1px;
     border-bottom-width: 1px;
 ,10 → 674,10
     border-right-style: solid;
     border-bottom-style: solid;
     border-left-style: solid;
-    border-top-color: black;
-    border-right-color: black;
-    border-bottom-color: black;
-    border-left-color: black;
+    border-top-color:#4d4d4d;
+    border-right-color: #4d4d4d;
+    border-bottom-color: #4d4d4d;
+    border-left-color: #4d4d4d;
     background-color: transparent;
     background-image: none;
     background-repeat: repeat;
 ,7 → 686,7
 input[type="button"]:hover, input[type="submit"]:hover
 {
-    background-color: #909090;
+    background-color: #8EC73F;
     background-image: none;
     background-repeat: repeat;
     background-attachment: scroll;
 ,89 → 725,95
 /********************************************** Navigation Menu ********************************/
 ul.menubar{
-  margin: 0px;
-  padding: 0px;
-  background-color: #FFFFFF; /* IE6 Bug */
-  font-size: 100%;
+    margin: 0px;
+    padding: 0px;
+    background-color: #FFFFFF; /* IE6 Bug */
+    font-size: 100%;
 }
 .submenu
 {
-font: bold 16px sans;
+    font: bold 16px sans;
 }
 .menu
 {
-font: normal 14px sans;
+    font: normal 14px sans;
 }
 ul.menubar .submenu{
-  margin: 0px;
-  padding: 0px;
-  list-style: none;
-  background-color: #FFFFFF;
-  float:left;
+    margin: 0px;
+    padding: 0px;
+    list-style: none;
+    background-color: #FFFFFF;
+    float:left;
 }
 ul.menubar ul.menu{
-  display: none;
-  position: absolute;
-  margin: 0px;
+    display: none;
+    position: absolute;
+    margin: 0px;
 }
 ul.menubar a{
-  padding: 5px;
-  display:block;
-  text-decoration: none;
-  color: #4D4D4D;
-  padding: 5px;
+    padding: 5px;
+    display:block;
+    text-decoration: none;
+    color: #4D4D4D;
+    padding: 5px;
 }
 ul.menubar a:hover{
-  padding: 5px;
-  display:block;
-  text-decoration: none;
-  color: #4D4D4D;
-  padding: 5px;
+    padding: 5px;
+    display:block;
+    text-decoration: none;
+    color: #4D4D4D;
+    padding: 5px;
 }
+.menuTop
+{
+}
 .menu a:hover{
-  padding: 5px;
-  display:block;
- /* border-left: none;
+    padding: 5px;
+    display:block;
+    /* border-left: none;
   border-right: none;
   border-top: none;
   border-bottom: none; */
-  padding: 5px;
+    padding: 5px;
 }
 ul.menu, ul.menu ul{
-  margin: 0;
-  padding: 2px;
- /* border-left: 1px solid #ccc;
-  border-bottom: 1px solid #ccc;
-  border-top: 1px solid #ccc;
-  border-right: 1px solid #ccc;     */
-  background-color: #FFFFFF; /* IE6 Bug */
+    margin: 0;
+    padding: 2px;
+    /* border-left: 1px solid #ccc;
+border-bottom: 1px solid #ccc;
+border-top: 1px solid #ccc;
+border-right: 1px solid #ccc;     */
+    background-color: #FFFFFF; /* IE6 Bug */
 }
 ul.menu li{
-  position: relative;
-  list-style: none;
-  /*border: 0px;*/
-  background-color: #4D4D4D;
-  width:250px;
+    position: relative;
+    list-style: none;
+/*border: 0px;*/
+    opacity:0.9;
+    background-color: #4D4D4D;
+    width:250px;
 }
 ul.menu li a{
-  display: block;
-  text-decoration: none;
- /* border-bottom: 0px;*/
-  /*color: #4D4D4D;*/
- /* background-color: #FFFFFF;  */
-  color: #4d4d4d;
-  background-color: #CCCCCC;
-  padding: 5px 10px 5px 5px;
+    display: block;
+    text-decoration: none;
+/* border-bottom: 0px;*/
+/*color: #4D4D4D;*/
+/* background-color: #FFFFFF;  */
+    color: #4d4d4d;
+    background-color: #CCCCCC;
+    padding: 5px 10px 5px 5px;
 }
 /*
 ,9 → 835,9
 }
 ul.menu li sup{
-  font-weight:bold;
-  font-size:7px;
-  color: red;
+    font-weight:bold;
+    font-size:7px;
+    color: red;
 }
 /* Fix IE. Hide from IE Mac \*/
 ,10 → 846,10
 /* End */
 ul.menu ul{
-  position: absolute;
-  display: none;
-  left: 149px; /* Set 1px less than menu width */
-  top: 0px;
+    position: absolute;
+    display: none;
+    left: 149px; /* Set 1px less than menu width */
+    top: 0px;
 }
 ul.menu li.submenu ul
 ,4 → 866,4
 /***********************************************************************************************/
-</STYLE>

 /impl/src/web/js/ajax.js
 ,121 → 1,161
-var xmlHttp;
-var servidorBaseUrl = "@server.base.url@";
+/**
+*
+* AJAX Functions
+*
+* This code is protected under GNU LGPL License
+*
+* @author Jorge Machado
+* @date April 2008
+**/
+/**
+ * Starts XMLHTTP Ajax request
+ *
+ * @author Jorge Machado
+ * @date April 2008
+ *
+ * params:
+ * @params HTTP GET Parameters for query string
+ * @xmlHttpRequest request
+ * @id target element
+ * @stateChanged target function
+ * @innerPhrase to put while waiting for response
+ * @navjsp requested jsp
+ */
+function startRequest(xmlHttpRequest,params,id,stateChanged,innerPhrase,navjsp)
+{
+    if(innerPhrase != '')
+        getObjectById(id).innerHTML = innerPhrase;
+    if (xmlHttpRequest==null)
+    {
+        alert ("Browser does not support HTTP Request");
+        return;
+    }
+    var url= navjsp;
+    if(params != null && params.length > 0)
+    {
+        url=url+"?"+ params;
+        url=url+"&sid="+Math.random();
+    }
+    else
+    {
+        url=url+"?sid="+Math.random();
+    }
+    xmlHttpRequest.onreadystatechange=stateChanged;
+    xmlHttpRequest.open("GET",url,true);
+    xmlHttpRequest.send(null);
+}
-function getObjectById(objectId) {
-                // cross-browser function to get an object's style object given its id
-        try
+/**
+ * Return an HTML element given ID
+ *
+ * @author Jorge Machado
+ * @date April 2008
+ *
+ * params:
+ * @objectId required object
+ */
+function getObjectById(objectId)
+{
+    // cross-browser function to get an object's style object given its id
+    try
+    {
+        if(document.getElementById && document.getElementById(objectId))
         {
-            if(document.getElementById && document.getElementById(objectId)) {
             // W3C DOM
-                return document.getElementById(objectId);
-            } else if (document.all(objectId)) {
+            return document.getElementById(objectId);
+        }
+        else if (document.all(objectId))
+        {
             // MSIE 4 DOM
-                return document.all(objectId);
-            } else if (document.layers && document.layers[objectId]) {
+            return document.all(objectId);
+        }
+        else if (document.layers && document.layers[objectId])
+        {
             // NN 4 DOM.. note: this won't find nested layers
-                return document.layers[objectId];
-            } else {
-                return false;
-            }
+            return document.layers[objectId];
         }
-        catch(e)
+        else
         {
             return false;
         }
-    } // getObjectById
-function GetXmlHttpObject()
-{
-        var objXMLHttp=null;
-        if (window.XMLHttpRequest)
-        {
-                objXMLHttp=new XMLHttpRequest();
-        }
-        else if (window.ActiveXObject)
-        {
-                objXMLHttp=new ActiveXObject("Microsoft.XMLHTTP");
-        }
-        return objXMLHttp;
+    }
+    catch(e)
+    {
+        return false;
+    }
 }
+/**
+ * Creates a new XmlHttpObject
+ * @author Jorge Machado
+ * @date April 2008
+ *
+ * params:
+ * @handler target xmlHttpObject function
+ */
 function GetXmlHttpObject(handler)
 {
-        var objXmlHttp=null;
-        if (navigator.userAgent.indexOf("Opera")>=0)
-        {
-                alert("This example doesn't work in Opera") ;
-                return ;
-        }
-        if (navigator.userAgent.indexOf("MSIE")>=0)
-        {
-                var strName="Msxml2.XMLHTTP";
-                if (navigator.appVersion.indexOf("MSIE 5.5")>=0)
-                {
-                        strName="Microsoft.XMLHTTP";
-                }
-                try
-                {
-                        objXmlHttp=new ActiveXObject(strName);
-                        objXmlHttp.onreadystatechange=handler ;
-                        return objXmlHttp;
-                }
-                catch(e)
-                {
-                        alert("Error. Scripting for ActiveX might be disabled") ;
-                        return ;
-                }
-        }
-        if (navigator.userAgent.indexOf("Mozilla")>=0)
-        {
-                objXmlHttp=new XMLHttpRequest();
-                objXmlHttp.onload=handler;
-                objXmlHttp.onerror=handler;
-                return objXmlHttp;
-        }
+    var objXmlHttp = null;
+    if (navigator.userAgent.indexOf("Opera")>=0)
+    {
+        alert("This example doesn't work in Opera") ;
+        return objXmlHttp;
+    }
+    if (navigator.userAgent.indexOf("MSIE")>=0)
+    {
+        var strName="Msxml2.XMLHTTP";
+        if (navigator.appVersion.indexOf("MSIE 5.5")>=0)
+        {
+            strName="Microsoft.XMLHTTP";
+        }
+        try
+        {
+            objXmlHttp=new ActiveXObject(strName);
+            objXmlHttp.onreadystatechange=handler ;
+            return objXmlHttp;
+        }
+        catch(e)
+        {
+            alert("Error. Scripting for ActiveX might be disabled") ;
+            return objXmlHttp;
+        }
+    }
+    if (navigator.userAgent.indexOf("Mozilla")>=0)
+    {
+        objXmlHttp=new XMLHttpRequest();
+        objXmlHttp.onload=handler;
+        objXmlHttp.onerror=handler;
+        return objXmlHttp;
+    }
 }
-/**
- *
- * Application Methods Examples
- *
- *
- */
+/***************************************************
+ TopFlashNews
+***************************************************/
+var xmlHttpTopFlashNews;
+var getFlashNewsTimeout;
+var getFlashNewsJsp;
-function getImportState()
+function getFlashNews(jsp,timeout)
 {
-    xmlHttp=GetXmlHttpObject(stateChangedGetImportState);
-        getObjectById("importState").innerHTML = "<div class=\"statusSearch\">Updating import state ....</div>";
-        if (xmlHttp==null)
-        {
-                alert ("Browser does not support HTTP Request");
-                return;
-        }
-    //http://servidor:8080
-    var url= servidorBaseUrl + "/jsp/import/getImportState.jsp";
-        url=url+"?sid="+Math.random();
-        xmlHttp.onreadystatechange=stateChangedGetImportState;
-        xmlHttp.open("GET",url,true);
-        xmlHttp.send(null);
+    getFlashNewsJsp = jsp;
+    getFlashNewsTimeout = timeout;
+    getFlashNewsTimeoutCall();
 }
-function stateChangedGetImportState()
+function getFlashNewsTimeoutCall()
 {
-        if (xmlHttp.readyState==4 || xmlHttp.readyState=="complete")
-        {
-        var html = xmlHttp.responseText;
-        getObjectById("importState").innerHTML=html;
-        if(!(getObjectById("importStateStatus") != null && getObjectById("importStateStatus").value == 'STOPPED'))
-        {
-            setTimeout(getImportState,5000);
-        }
-        }
+    xmlHttpTopFlashNews=GetXmlHttpObject(stateChangedGetFlashNews);
+    startRequest(xmlHttpTopFlashNews,"","flashTopNews",stateChangedGetFlashNews,"",getFlashNewsJsp)
 }
+function stateChangedGetFlashNews()
+{
+    if (xmlHttpTopFlashNews.readyState==4 || xmlHttpTopFlashNews.readyState=="complete")
+    {
+        getObjectById("flashTopNews").innerHTML=xmlHttpTopFlashNews.responseText;
+        setTimeout(getFlashNewsTimeoutCall,getFlashNewsTimeout);
+    }
+}

 /impl/src/web/layout/footer.jsp
 ,7 → 15,7
         </td>
         <td align="center"  width="33%">
             <div id="license">
-                <ul id="linkTypeFour">
+                <ul class="copyRightLink">
                     <li>Copyright © <a href="http://www.estgp.com">ESTG</a> 2008</li>
                     <!--<li>Contact ESTG Webmaster at (webmaster [AT] estgp [DOT] pt)</li>-->
                 </ul>

 /impl/src/web/layout/layout1.jsp
 ,7 → 34,7
             <div id="header">
                 <tiles:insert attribute="header"/>
             </div>
-            <table >
+            <table class="pageDefault">
                 <tr>
                     <td colspan="2"><tiles:insert attribute="navigationTop"/></td>
                 </tr>
 ,7 → 42,7
                     <td id="leftPage">
                         <tiles:insert attribute="navigation" />
                     </td>
-                    <td>
+                    <td class="content">
                         <tiles:insert attribute="topnav"/>
                         <tiles:insert attribute="body" />
                     </td>

 /impl/src/web/layout/layout2.jsp
 ,7 → 39,7
                     <td><tiles:insert attribute="navigationTop"/></td>
                 </tr>
                 <tr>
-                    <td id="content2">
+                    <td class="content">
                         <tiles:insert attribute="topnav"/>
                         <tiles:insert attribute="body" />
                     </td>

 /impl/src/web/layout/layoutPortal.jsp
 New file
 ,0 → 1,68
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@ 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" %>
+<html:html locale="true">
+    <head>
+        <title><bean:message key="site.title"/> - <tiles:getAsString name="title"/></title>
+        <jsp:include page="/layout/scripts.jsp"/>
+         <script type="text/javascript">
+            function horizontal() {
+               var navItems = document.getElementById("menu_dropdown").getElementsByTagName("li");
+               for (var i=0; i< navItems.length; i++) {
+                  if(navItems[i].className == "submenu")
+                  {
+                     if(navItems[i].getElementsByTagName('ul')[0] != null)
+                     {
+                        navItems[i].onmouseover=function() {
+                        this.getElementsByTagName('ul')[0].style.display="block";}
+                        navItems[i].onmouseout=function() {this.getElementsByTagName('ul')[0].style.display="none";}
+                     }
+                  }
+               }
+            }
+        </script>
+    </head>
+    <body class="small" marginwidth="0" marginheight="0" bgcolor="#ffffff" topmargin="0" leftmargin="0" onload="horizontal();">
+    <div id="body">
+        <div id="header">
+            <tiles:insert attribute="header"/>
+        </div>
+        <table id="pageStructure">
+            <tr>
+                <td colspan="3"><tiles:insert attribute="navigationTop"/></td>
+            </tr>
+            <tr>
+                <td colspan="3">
+                    <tiles:insert attribute="topnav"/>
+                </td>
+            </tr>
+            <tr>
+                <td id="leftPage">
+                    <tiles:insert attribute="navigationLeft" />
+                </td>
+                <td class="contentPortal">
+                    <tiles:insert attribute="body" />
+                </td>
+                <td class="rightPagePortal">
+                    <tiles:insert attribute="navigationRight"/>
+                </td>
+            </tr>
+        </table>
+        <div id="footer">
+            <tiles:insert attribute="footer"/>
+        </div>
+    </div>
+    </body>
+</html:html>

 /impl/src/web/layout/navigationLeftMenu.jsp
 ,11 → 1,4
-<%--
-  Created by IntelliJ IDEA.
-  User: Fabio Velez
-  Date: 14/Mar/2008
-  Time: 16:50:15
-  To change this template use File | Settings | File Templates.
---%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ 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-nested.tld"  prefix="nested" %>
 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld"  prefix="logic" %>
 ,20 → 6,22
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld"  prefix="tiles" %>
 <div id="leftMenuModule">
-    <div id="linkTypeOne">
-        <ul>
-            <li>
-                <a href="<%=request.getContextPath()%>/proxy/portal/estgp/portal/alunos.html?role=student&menu=menu.alunos"><bean:message key="menu.alunos"/></a>
-            </li>
-            <li>
-                <a href="<%=request.getContextPath()%>/proxy/portal/estgp/portal/futurosAlunos.html?role=futureStudent&menu=menu.futurosAlunos"><bean:message key="menu.futurosAlunos"/></a>
-            </li>
-            <li>
-                <a href="<%=request.getContextPath()%>/proxy/portal/estgp/portal/antigosAlunos.html?role=oldStudent&menu=menu.antigosAlunos"><bean:message key="menu.antigosAlunos"/></a>
-            </li>
-            <li>
-                <a href="<%=request.getContextPath()%>/proxy/portal/estgp/portal/docentes.html?role=teacher&menu=menu.docentes"><bean:message key="menu.docentes"/></a>
-            </li>
-        </ul>
+    <div class="linkLeftMenu">
+        <div class="listClean">
+            <ul>
+                <li>
+                    <a href="<%=request.getContextPath()%>/student.do?role=student&menu=menu.alunos"><bean:message key="menu.alunos"/></a>
+                </li>
+                <li>
+                    <a href="<%=request.getContextPath()%>/futureStudent.do?role=futureStudent&menu=menu.futurosAlunos"><bean:message key="menu.futurosAlunos"/></a>
+                </li>
+                <li>
+                    <a href="<%=request.getContextPath()%>/oldStudent.do?role=oldStudent&menu=menu.antigosAlunos"><bean:message key="menu.antigosAlunos"/></a>
+                </li>
+                <li>
+                    <a href="<%=request.getContextPath()%>/teacher.do?role=teacher&menu=menu.docentes"><bean:message key="menu.docentes"/></a>
+                </li>
+            </ul>
+        </div>
     </div>
 </div>

 /impl/src/web/layout/layout3.jsp
 ,11 → 39,11
                     <td colspan="2"><tiles:insert attribute="navigationTop"/></td>
                 </tr>
                 <tr>
-                    <td id="content3">
+                    <td class="content">
                         <tiles:insert attribute="topnav"/>
                         <tiles:insert attribute="body" />
                     </td>
-                    <td id="rightPage">
+                    <td class="rightPage">
                         <tiles:insert attribute="navigation" />
                     </td>
                 </tr>

 /impl/src/web/layout/layout4.jsp
 ,7 → 13,6
             function horizontal() {
                var navItems = document.getElementById("menu_dropdown").getElementsByTagName("li");
                for (var i=0; i< navItems.length; i++) {
                   if(navItems[i].className == "submenu")
                   {
 ,11 → 43,11
                 <td id="leftPage">
                     <tiles:insert attribute="navigationLeft" />
                 </td>
-                <td id="content4">
+                <td class="content">
                     <tiles:insert attribute="topnav"/>
                     <tiles:insert attribute="body" />
                 </td>
-                <td id="rightPage">
+                <td class="rightPage">
                     <tiles:insert attribute="navigationRight"/>
                 </td>
             </tr>

 /impl/src/web/layout/topnav.jsp
 ,8 → 9,8
     <%
         TopNav topNav = NavPlaceServer.getTopNav(request);
         List<NavPlace> navKeys = topNav.getNavPlaces();
-        for (NavPlace navKey : navKeys) {
-            NavPlace navPlace = (NavPlace) navKey;
+        for (NavPlace navPlace : navKeys)
+        {
             if (navPlace.getUrl() != null) {
     %>
     <li class="navPlace"><a

 /impl/src/web/layout/navigationLeft.jsp
 ,18 → 13,18
         <%-- USER MENUS--%>
         <div id="leftMenuModule">
-            <div id="linkTypeOne">
+            <div class="linkLeftMenu">
+                <div class="listClean">
                 <estgweb:isAuthenticated>
                     <%--SERVICES--%>
                     <ul>
-                        <p><bean:message key="services"/></p>
+                        <h2><bean:message key="services"/></h2>
                         <li>
                             <html:link action="/startSubmitAnnouncement"><bean:message key="submit.announcement"/></html:link>
                         </li>
                         <!--OTHER PLACES-->
-                        <p><bean:message key="Others"/></p>
+                        <h2><bean:message key="Others"/></h2>
                         <li>
                             <html:link action="/user/startCourses"><bean:message key="courses"/></html:link>
                         </li>
 ,7 → 33,8
                         </li>
                     </ul>
                     </estgweb:isAuthenticated>
-                </div>
+             </div>
+        </div>
     </div>
 </div>

 /impl/src/web/layout/navigationTop.jsp
 ,7 → 13,7
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld"  prefix="tiles" %>
 <%@ taglib uri="/WEB-INF/tlds/estgweb.tld"  prefix="estgweb" %>
-<div>
+<div class="menuTop">
     <ul id="menu_dropdown" class="menubar">
        <li class="submenu"><a href="#">Apresentação</a>
         <div class="shadow ">

 /impl/src/web/layout/navigationLeftAdmin.jsp
 ,25 → 6,27
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld"  prefix="tiles" %>
 <%@ taglib uri="/WEB-INF/tlds/estgweb.tld"  prefix="estgweb" %>
 <div id="leftMenuModule">
-    <div id="linkTypeOne">
-        <ul>
-            <li>
-                <html:link action="/Welcome"><bean:message key="Home"/></html:link>
-            </li>
-            <estgweb:isNotAuthenticated>
+    <div class="linkLeftMenu">
+        <div class="listClean">
+            <ul>
                 <li>
-                    <html:link action="/StartAuthentication"><bean:message key="authenticate"/></html:link>
+                    <html:link action="/Welcome"><bean:message key="Home"/></html:link>
                 </li>
-            </estgweb:isNotAuthenticated>
+                <estgweb:isNotAuthenticated>
+                    <li>
+                        <html:link action="/StartAuthentication"><bean:message key="authenticate"/></html:link>
+                    </li>
+                </estgweb:isNotAuthenticated>
-            <estgweb:isAuthenticated>
-                <li>
-                    <html:link action="/Logout"><bean:message key="logout"/></html:link>
-                </li>
-            </estgweb:isAuthenticated>
-        </ul>
+                <estgweb:isAuthenticated>
+                    <li>
+                        <html:link action="/Logout"><bean:message key="logout"/></html:link>
+                    </li>
+                </estgweb:isAuthenticated>
+            </ul>
+        </div>
     </div>
 </div>

 /impl/src/web/public/index.jsp
 ,6 → 3,7
 <%@ page import="pt.estgp.estgweb.web.utils.RequestUtils" %>
 <%@ page import="pt.estgp.estgweb.domain.views.AnnouncementView" %>
 <%@ page import="java.util.List" %>
+<%@ page import="pt.estgp.estgweb.Globals" %>
 <%@page language="java" %>
 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld"  prefix="logic" %>
 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld"  prefix="html" %>
 ,90 → 14,138
     IServiceManager sm = ServiceManager.getInstance();
     String[] names = new String[]{};
     Object[] args = new Object[]{};
+    int topAnnouncements=1;
+    int centerAnnouncements=1;
+    int bottomAnnouncements=1;
     List<AnnouncementView> announcementViews = (List<AnnouncementView>) sm.execute(RequestUtils.getRequester(request), "LoadTargetMaxAnnouncements", args, names);
     request.setAttribute("Announcements", announcementViews);
 %>
 <jomm:messages/>
 <html:errors/>
-<div class="indexPage" >
+<script type="text/javascript">
+    <!--
+         getFlashNews('<%=request.getContextPath()%>/public/announcements/getFlashNews.jsp',<%=Globals.ANNOUNCEMENT_TYPE_TOP_FLASH_NEWS_TIMEOUT%>);
+         -->
+</script>
-    <div class="header">
-        <h1> <bean:message key="mainAnnouncements"/></h1>
+<div class="indexPage">
+    <h1><bean:message key="mainAnnouncements"/></h1>
+    <div id="flashTopNews">
+        <table class="container">
+            <tr>
+                <td class="textContainer">
+                    <bean:message key="announcements.loading"/>
+                </td>
+                <td class="imageContainer">
+                </td>
+            </tr>
+        </table>
     </div>
-    <table class="flashTopNews">
-        <tr>
-            <td>
-                <div class="textNewsTop">
-                    <logic:present name="Announcements">
-                        <logic:iterate  id="item" name="Announcements" type="pt.estgp.estgweb.domain.views.AnnouncementView">
-                            <logic:equal value="top.flash.news" name="item" property="type">
-                                <div class="titleNewsTop">
-                                    <html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.title}</html:link>
-                                </div>
-                                <div class="descriptionNewsTop">
-                                    <html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load" >${item.text}</html:link>
-                                </div>
-                            </logic:equal>
-                        </logic:iterate>
-                    </logic:present>
-                </div>
-            </td>
-            <td class="imageNewsTop">
-                <img src="<%=request.getContextPath()%>/imgs/destaque_1.jpg"/>
-            </td>
-        </tr>
-    </table>
+    <logic:iterate  id="item" name="Announcements" type="pt.estgp.estgweb.domain.views.AnnouncementView">
+        <logic:equal value="bottom.flash.news" name="item" property="type">
-    <table class="flashCenterNews">
-        <tr>
-        <div class="textNewsCenter">
-            <logic:iterate  id="item" name="Announcements" type="pt.estgp.estgweb.domain.views.AnnouncementView">
-                <logic:equal value="bottom.flash.news" name="item" property="type">
-                    <td class="imageNewsCenter">
-                        <img src="<%=request.getContextPath()%>/imgs/destaque_2_1.jpg"/>
-                    </td>
-                    <td>
-                        <div class="titleNewsCenter">
-                            <html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load" >${item.title}</html:link>
-                        </div>
-                        <div class="descriptionNewsCenter">
-                            <html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load" >${item.text}</html:link>
-                        </div>
-                    </td>
-                </logic:equal>
-            </logic:iterate>
-        </div>
-    </table>
+            <%if(centerAnnouncements<=Globals.NUMBER_ANNOUNCEMENT_TYPE_BOTTOM_FLASH_NEWS_INDEX)
+            {
+                if(centerAnnouncements==1)
+                {    %>
+            <div id="flashCenterNews">
+                <table class="container">
+                    <tr>
+                        <%}%>
+                        <td class="imageContainer">
+                            <%if(item.getSmallImage() != null){%><img alt="<%=item.getTitle()%>" src="<%=request.getContextPath()%>/imageStream/<%=item.getSmallImage().getId()%>"><%}%>
+                        </td>
+                        <td class="textContainer">
+                            <logic:empty name="item" property="url">
+                                <h2><html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load" >${item.title}</html:link></h2>
+                                <p><html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load" >${item.textSummarySmall}</html:link></p>
+                            </logic:empty>
+                            <logic:notEmpty name="item" property="url">
+                                <%if(!item.getHaveAllText())
+                                {%>
+                                <h2><html:link href="${item.url}">${item.title}</html:link></h2>
+                                <p><html:link href="${item.url}">${item.textSummarySmall}</html:link></p>
+                                <%}
+                                else
+                                {%>
+                                <h2><html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load" >${item.title}</html:link></h2>
+                                <p><html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load" >${item.textSummarySmall}</html:link></p>
+                                <%}%>
+                            </logic:notEmpty>
+                        </td>
-    <table class="flashBottomNews">
-        <tr>
-            <div class="textNewsBottom">
-                <logic:iterate  id="item" name="Announcements" type="pt.estgp.estgweb.domain.views.AnnouncementView">
-                    <logic:equal value="news" name="item" property="type">
-                        <td class="imageNewsBottom">
-                            <img src="<%=request.getContextPath()%>/imgs/destaque_3_3.gif"/>
-                        </td>
-                    </logic:equal>
-                </logic:iterate>
+                        <%if(centerAnnouncements==Globals.NUMBER_ANNOUNCEMENT_TYPE_BOTTOM_FLASH_NEWS_INDEX)
+                        {%>
+                    </tr>
+                </table>
             </div>
-        </tr>
-        <tr>
-            <div class="textNewsBottom">
-                <logic:iterate length="5" id="item" name="Announcements" type="pt.estgp.estgweb.domain.views.AnnouncementView">
-                    <logic:equal value="news" name="item" property="type">
-                        <td width="50px">
-                            <div class="titleNewsBottom">
-                                <html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.title}</html:link>
+            <%
+                }
+                centerAnnouncements++;
+            }
+            else if(bottomAnnouncements<=Globals.NUMBER_ANNOUNCEMENT_TYPE_NEW_INDEX)
+            {
+                if(bottomAnnouncements==1)
+                {
+            %>
+            <div id="flashBottomNews">
+                <table class="container">
+                    <tr>
+                        <%}%>
+                        <td>
+                            <div class="imageContainer">
+                                <%if(item.getSmallImage() != null){%><img alt="<%=item.getTitle()%>" src="<%=request.getContextPath()%>/imageStream/<%=item.getSmallImage().getId()%>"><%}%>
                             </div>
-                            <div class="descriptionNewsBottom">
-                                <html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load" >${item.text}</html:link>
+                            <div class="textContainer">
+                                <logic:empty name="item" property="url">
+                                    <h2><html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.title}</html:link></h2>
+                                    <p><html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load" >${item.textSummarySmall}</html:link></p>
+                                </logic:empty>
+                                <logic:notEmpty name="item" property="url">
+                                <%if(!item.getHaveAllText())
+                                {%>
+                                <h2><html:link href="${item.url}">${item.title}</html:link></h2>
+                                <p><html:link href="${item.url}">${item.textSummarySmall}</html:link></p>
+                                <%}
+                                else
+                                {%>
+                                <h2><html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load" >${item.title}</html:link></h2>
+                                <p><html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load" >${item.textSummarySmall}</html:link></p>
+                                <%}%>
+                            </logic:notEmpty>
                             </div>
                         </td>
-                    </logic:equal>
-                </logic:iterate>
+                        <%if(bottomAnnouncements==Globals.NUMBER_ANNOUNCEMENT_TYPE_NEW_INDEX)
+                        {%>
+                    </tr>
+                </table>
             </div>
-        </tr>
-    </table>
+            <%
+                    }
+                    bottomAnnouncements++;
+                }
+            %>
+        </logic:equal>
+    </logic:iterate>
+    <%if(bottomAnnouncements>1 && bottomAnnouncements<=Globals.NUMBER_ANNOUNCEMENT_TYPE_NEW_INDEX)
+    {
+    %>
+</tr>
+</table>
 </div>
+<%}%>
+<%if(centerAnnouncements>1 && centerAnnouncements<=Globals.NUMBER_ANNOUNCEMENT_TYPE_BOTTOM_FLASH_NEWS_INDEX)
+{
+%>
+</tr>
+</table>
+</div>
+<%}%>
+</div>

 /impl/src/web/public/portals/alunos/topnavServicos.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/student.do" + Globals.PORTAL_ROLE_VIEW_STUDENT, "menu.alunos");
+    topNav.addNavPlace(null, "portal.servicos.online");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /impl/src/web/public/portals/alunos/topnavContactos.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/student.do" + Globals.PORTAL_ROLE_VIEW_STUDENT, "menu.alunos");
+    topNav.addNavPlace(null, "portal.contactos");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

/impl/src/web/public/portals/alunos/informacaoAcademica.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/alunos/informacaoAcademicaLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

 /impl/src/web/public/portals/alunos/student.jsp
 New file
 ,0 → 1,36
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ 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>
+                    <td class="column">
+                        <jsp:include page="servicosLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                        <jsp:include page="contactosLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                    </td>
+                    <td class="column">
+                        <jsp:include page="mobilidadeLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                        <jsp:include page="accaoSocialLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                        <jsp:include page="paginasAlunosLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                    </td>
+                    <td class="column">
+                        <jsp:include page="orgaosLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                        <jsp:include page="institutoPolitecnicoLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                        <jsp:include page="informacaoAcademicaLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+</div>

 /impl/src/web/public/portals/alunos/informacaoAcademicaLinks.jsp
 New file
 ,0 → 1,16
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.informacao.academica");
+    String startLink = Globals.getStartLinkPortalMenu("informacaoAcademicaAlunosPortalMenu");
+    topNav.addNavPlace(startLink + "/informacaoAcademicaCalendarioEscolar.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.informacao.academica.calendario.escolar");
+    topNav.addNavPlace(startLink + "/informacaoAcademicaLicenciaturas.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.informacao.academica.licenciaturas");
+    topNav.addNavPlace(startLink + "/informacaoAcademicaMestrados.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.informacao.academica.mestrados");
+    topNav.addNavPlace(startLink + "/informacaoAcademicaPosGraduacoes.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.informacao.academica.pos.graduacoes");
+    topNav.addNavPlace(startLink + "/informacaoAcademicaCets.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.informacao.academica.cets");
+    topNav.addNavPlace(startLink + "/informacaoAcademicaMaiores23.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.informacao.academica.maiores.23");
+    topNav.addNavPlace(startLink + "/informacaoAcademicaOutrasFormacoes.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.informacao.academica.outras.formacoes");
+%>

 /impl/src/web/public/portals/alunos/topnavAccaoSocial.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/student.do" + Globals.PORTAL_ROLE_VIEW_STUDENT, "menu.alunos");
+    topNav.addNavPlace(null, "portal.accao.social");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

/impl/src/web/public/portals/alunos/mobilidade.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/alunos/mobilidadeLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

 /impl/src/web/public/portals/alunos/mobilidadeLinks.jsp
 New file
 ,0 → 1,14
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.mobilidade");
+    String startLink = Globals.getStartLinkPortalMenu("mobilidadeAlunosPortalMenu");
+    topNav.addNavPlace(startLink + "/mobilidadeAlunosEstrangeirosEstg.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.mobilidade.alunos.estrangeiros");
+    topNav.addNavPlace(startLink + "/mobilidadeAlunosEstgEstrangeiro.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.mobilidade.alunos.estg.estrangeiro");
+    topNav.addNavPlace(startLink + "/mobilidadeProtocolosInternacionais.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.mobilidade.protocolos.internacionais");
+    topNav.addNavPlace(startLink + "/mobilidadeCandidaturas.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.mobilidade.candidaturas");
+    topNav.addNavPlace(startLink + "/mobilidadeProgramaErasmus.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.mobilidade.programa.erasmus");
+%>

/impl/src/web/public/portals/alunos/orgaos.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/alunos/orgaosLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

/impl/src/web/public/portals/alunos/institutoPolitecnico.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/alunos/institutoPolitecnicoLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

 /impl/src/web/public/portals/alunos/orgaosLinks.jsp
 New file
 ,0 → 1,13
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.orgaos");
+    String startLink = Globals.getStartLinkPortalMenu("orgaosAlunosPortalMenu");
+    topNav.addNavPlace(startLink + "/orgaosConselhoPedagogico.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.conselho.pedagogico");
+    topNav.addNavPlace(startLink + "/orgaosConselhoCientifico.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.conselho.cientifico");
+    topNav.addNavPlace(startLink + "/orgaosConselhoDirectivo.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.conselho.directivo");
+    topNav.addNavPlace(startLink + "/orgaosAssembleiaRepresentantes.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.assembleia.representantes");
+%>

 /impl/src/web/public/portals/alunos/institutoPolitecnicoLinks.jsp
 New file
 ,0 → 1,13
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.instituto.politecnico");
+    String startLink = Globals.getStartLinkPortalMenu("institutoPolitecnicoAlunosPortalMenu");
+    topNav.addNavPlace(startLink + "/institutoPolitecnicoServicosCentrais.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.instituto.politecnico.servicos.centrais");
+    topNav.addNavPlace(startLink + "/institutoPolitecnicoLojaAluno.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.instituto.politecnico.loja.alunos");
+    topNav.addNavPlace(startLink + "/institutoPolitecnicoMerchandising.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.instituto.politecnico.merchandising");
+    topNav.addNavPlace(startLink + "/institutoPolitecnicoCulturaLazer.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.instituto.politecnico.cultura.lazer");
+%>

/impl/src/web/public/portals/alunos/contactos.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/alunos/contactosLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

/impl/src/web/public/portals/alunos/servicos.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/alunos/servicosLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

 /impl/src/web/public/portals/alunos/contactosLinks.jsp
 New file
 ,0 → 1,17
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.contactos");
+    String startLink = Globals.getStartLinkPortalMenu("contactosAlunosPortalMenu");
+    topNav.addNavPlace(startLink + "/contactosContactosGeraisEstg.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.contactos.gerais.estg");
+    topNav.addNavPlace(startLink + "/contactosAreasCientificas.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.contactos.areas.cientificas");
+    topNav.addNavPlace(startLink + "/contactosSecretaria.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.contactos.secretaria");
+    topNav.addNavPlace(startLink + "/contactosCentroInformatico.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.contactos.centro.informatico");
+    topNav.addNavPlace(startLink + "/contactosGabineteComunicacao.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.contactos.gabinete.comunicacao");
+    topNav.addNavPlace(startLink + "/contactosReprografia.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.contactos.reprografia");
+    topNav.addNavPlace(startLink + "/contactosDocentesContactos.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.contactos.docentes");
+    topNav.addNavPlace("http://www.global.estgp.pt/ae/"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.contactos.associacao.estudantes");
+%>

 /impl/src/web/public/portals/alunos/servicosLinks.jsp
 New file
 ,0 → 1,19
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.servicos.online");
+    String startLink = Globals.getStartLinkPortalMenu("servicosAlunosPortalMenu");
+    topNav.addNavPlace(startLink + "/servicosWebmail.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.servicos.online.webmail");
+    topNav.addNavPlace(startLink + "/servicosEduroam.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.servicos.online.eduroam");
+    topNav.addNavPlace(startLink + "/servicosSecretaria.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.servicos.online.secretaria");
+    topNav.addNavPlace(startLink + "/servicosBiblioteca.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.servicos.online.biblioteca.online");
+    topNav.addNavPlace(startLink + "/servicosNZero.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.servicos.online.n.zero");
+    topNav.addNavPlace(startLink + "/servicosAcademicosOnline.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.servicos.online.academicos.online");
+    topNav.addNavPlace(startLink + "/servicosGabineteComunicacao.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.servicos.online.gabinete.comunicacao");
+    topNav.addNavPlace(startLink + "/servicosRegie.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.servicos.online.regie");
+    topNav.addNavPlace(startLink + "/servicosCentroInformatico.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.servicos.online.centro.informatico");
+    topNav.addNavPlace(startLink + "/servicosReprografia.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.servicos.online.reprografia");
+%>

/impl/src/web/public/portals/alunos/accaoSocial.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/alunos/accaoSocialLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

 /impl/src/web/public/portals/alunos/accaoSocialLinks.jsp
 New file
 ,0 → 1,17
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.accao.social");
+    String startLink = Globals.getStartLinkPortalMenu("accaoSocialAlunosPortalMenu");
+    topNav.addNavPlace(startLink + "/accaoSocialBolsaEstudo.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.accao.social.bolsa.estudo");
+    topNav.addNavPlace(startLink + "/accaoSocialAlimentacao.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.accao.social.alimentacao");
+    topNav.addNavPlace(startLink + "/accaoSocialAlojamento.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.accao.social.alojamento");
+    topNav.addNavPlace(startLink + "/accaoSocialApoioMedico.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.accao.social.apoio.medico");
+    topNav.addNavPlace(startLink + "/accaoSocialDesportoCultura.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.accao.social.desporto.cultura");
+    topNav.addNavPlace(startLink + "/accaoSocialGaap.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.accao.social.gapp");
+    topNav.addNavPlace(startLink + "/accaoSocialInformacoes.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.accao.social.informacoes");
+    topNav.addNavPlace("http://www.ipportalegre.pt/wwwsas/alimentacao_refeitorios.htm"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.accao.social.cantinas");
+%>

 /impl/src/web/public/portals/alunos/paginasAlunosLinks.jsp
 New file
 ,0 → 1,13
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.paginas.alunos");
+    String startLinkAA = Globals.getStartLinkPortalMenu("layoutAA");
+    String startLinkNucleoENG = Globals.getStartLinkPortalMenu("layoutNucleoEng");
+    topNav.addNavPlace(startLinkAA + "/exemplo.html", "portal.paginas.alunos.assessoria");
+    topNav.addNavPlace(startLinkNucleoENG + "/exemplo.html", "portal.paginas.nucleo.engenharia");
+%>

 /impl/src/web/public/portals/alunos/topnavInformacaoAcademica.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/student.do" + Globals.PORTAL_ROLE_VIEW_STUDENT, "menu.alunos");
+    topNav.addNavPlace(null, "portal.informacao.academica");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /impl/src/web/public/portals/alunos/topnavMobilidade.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/student.do" + Globals.PORTAL_ROLE_VIEW_STUDENT, "menu.alunos");
+    topNav.addNavPlace(null, "portal.mobilidade");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /impl/src/web/public/portals/alunos/topnavOrgaos.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/student.do" + Globals.PORTAL_ROLE_VIEW_STUDENT , "menu.alunos");
+    topNav.addNavPlace(null, "portal.orgaos");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /impl/src/web/public/portals/alunos/topnavInstitutoPolitecnico.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/student.do" + Globals.PORTAL_ROLE_VIEW_STUDENT, "menu.alunos");
+    topNav.addNavPlace(null, "portal.instituto.politecnico");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /impl/src/web/public/portals/menuPortal.jsp
 New file
 ,0 → 1,71
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="jomm.utils.MessageResources" %>
+<%
+    TopNav topNav = NavPlaceServer.getPortalMenuPlacesKey(request);
+    if(topNav.getTitle() != null)
+    {
+%>
+<div class="navLeftMenu">
+<h2><%=MessageResources.getMessage(request, topNav.getTitle())%></h2>
+<%
+    }
+%>
+<div class="linkLeftMenu">
+    <div class="listClean">
+        <ul id="portalMenu">
+            <%
+                String menuPortalPos = request.getParameter("pos");
+                int pos = 0;
+                if(menuPortalPos !=  null)
+                    try
+                    {
+                        pos = Integer.parseInt(menuPortalPos);
+                    }
+                    catch(NumberFormatException e){}
+                List<NavPlace> navKeys = topNav.getNavPlaces();
+                int i = 0;
+                for (NavPlace navKey : navKeys)
+                {
+                    String selectedClass = "";
+                    if(pos == i)
+                        selectedClass = " selected";
+                    i++;
+                    NavPlace navPlace = (NavPlace) navKey;
+                    if (navPlace.getUrl() != null)
+                    {
+                        if(!navPlace.getUrl().contains("http://"))
+                        {
+            %>
+            <li class="navPlace<%=selectedClass%>">
+                <a href="<%=request.getContextPath() + navPlace.getUrl()%>"><%=MessageResources.getMessage(request, navPlace.getKey())%></a>
+            </li>
+            <%
+                }
+                else
+                {
+                %>
+                  <li class="navPlace<%=selectedClass%>">
+                    <a href="<%=navPlace.getUrl()%>"><%=MessageResources.getMessage(request, navPlace.getKey())%></a>
+                  </li>
+                <%
+                }
+            }
+            else
+            {
+            %>
+            <li class="navPlace,<%=selectedClass%>"><%=MessageResources.getMessage(request, navPlace.getKey())%></li>
+            <%
+                    }
+                }
+            %>
+        </ul>
+    </div>
+</div>
+</div>

 /impl/src/web/public/portals/Docentes/topnavServicos.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/teacher.do" + Globals.PORTAL_ROLE_VIEW_TEACHER, "menu.docentes");
+    topNav.addNavPlace(null, "portal.servicos.online");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /impl/src/web/public/portals/Docentes/topnavContactos.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/teacher.do" + Globals.PORTAL_ROLE_VIEW_TEACHER, "menu.docentes");
+    topNav.addNavPlace(null, "portal.contactos");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

/impl/src/web/public/portals/Docentes/informacaoAcademica.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/Docentes/informacaoAcademicaLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

 /impl/src/web/public/portals/Docentes/informacaoAcademicaLinks.jsp
 New file
 ,0 → 1,14
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.informacao.academica");
+    String startLink = Globals.getStartLinkPortalMenu("informacaoAcademicaDocentesPortalMenu");
+    topNav.addNavPlace(startLink + "/informacaoAcademicaCalendarioEscolar.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.informacao.academica.calendario.escolar");
+    topNav.addNavPlace(startLink + "/informacaoAcademicaLicenciaturas.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.informacao.academica.licenciaturas");
+    topNav.addNavPlace(startLink + "/informacaoAcademicaMestrados.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.informacao.academica.mestrados");
+    topNav.addNavPlace(startLink + "/informacaoAcademicaPosGraduacoes.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.informacao.academica.pos.graduacoes");
+    topNav.addNavPlace(startLink + "/informacaoAcademicaCets.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.informacao.academica.cets");
+%>

/impl/src/web/public/portals/Docentes/mobilidade.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/Docentes/mobilidadeLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

 /impl/src/web/public/portals/Docentes/topnavAccaoSocial.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/teacher.do" + Globals.PORTAL_ROLE_VIEW_TEACHER, "menu.docentes");
+    topNav.addNavPlace(null, "portal.accao.social");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /impl/src/web/public/portals/Docentes/mobilidadeLinks.jsp
 New file
 ,0 → 1,14
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.mobilidade");
+    String startLink = Globals.getStartLinkPortalMenu("mobilidadeDocentesPortalMenu");
+    topNav.addNavPlace(startLink + "/mobilidadeDocentesEstrangeirosEstg.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.mobilidade.docentes.estrangeiros");
+    topNav.addNavPlace(startLink + "/mobilidadeDocentesEstgEstrangeiro.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.mobilidade.docentes.estg.estrangeiro");
+    topNav.addNavPlace(startLink + "/mobilidadeProtocolosInternacionais.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.mobilidade.protocolos.internacionais");
+    topNav.addNavPlace(startLink + "/mobilidadeCandidaturas.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.mobilidade.candidaturas");
+    topNav.addNavPlace(startLink + "/mobilidadeProgramaErasmus.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.mobilidade.programa.erasmus");
+%>

/impl/src/web/public/portals/Docentes/orgaos.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/Docentes/orgaosLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

/impl/src/web/public/portals/Docentes/institutoPolitecnico.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/Docentes/institutoPolitecnicoLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

 /impl/src/web/public/portals/Docentes/orgaosLinks.jsp
 New file
 ,0 → 1,13
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.orgaos");
+    String startLink = Globals.getStartLinkPortalMenu("orgaosDocentesPortalMenu");
+    topNav.addNavPlace(startLink + "/orgaosConselhoPedagogico.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.conselho.pedagogico");
+    topNav.addNavPlace(startLink + "/orgaosConselhoCientifico.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.conselho.cientifico");
+    topNav.addNavPlace(startLink + "/orgaosConselhoDirectivo.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.conselho.directivo");
+    topNav.addNavPlace(startLink + "/orgaosAssembleiaRepresentantes.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.assembleia.representantes");
+%>

 /impl/src/web/public/portals/Docentes/institutoPolitecnicoLinks.jsp
 New file
 ,0 → 1,13
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.instituto.politecnico");
+    String startLink = Globals.getStartLinkPortalMenu("institutoPolitecnicoDocentesPortalMenu");
+    topNav.addNavPlace(startLink + "/institutoPolitecnicoServicosCentrais.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.instituto.politecnico.servicos.centrais");
+    topNav.addNavPlace(startLink + "/institutoPolitecnicoLojaAluno.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.instituto.politecnico.loja.alunos");
+    topNav.addNavPlace(startLink + "/institutoPolitecnicoMerchandising.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.instituto.politecnico.merchandising");
+    topNav.addNavPlace(startLink + "/institutoPolitecnicoCulturaLazer.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.instituto.politecnico.cultura.lazer");
+%>

/impl/src/web/public/portals/Docentes/contactos.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/Docentes/contactosLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

/impl/src/web/public/portals/Docentes/servicos.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/Docentes/servicosLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

 /impl/src/web/public/portals/Docentes/contactosLinks.jsp
 New file
 ,0 → 1,15
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.contactos");
+    String startLink = Globals.getStartLinkPortalMenu("contactosDocentesPortalMenu");
+    topNav.addNavPlace(startLink + "/contactosContactosGeraisEstg.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.contactos.gerais.estg");
+    topNav.addNavPlace(startLink + "/contactosAreasCientificas.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.contactos.areas.cientificas");
+    topNav.addNavPlace(startLink + "/contactosSecretaria.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.contactos.secretaria");
+    topNav.addNavPlace(startLink + "/contactosCentroInformatico.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.contactos.centro.informatico");
+    topNav.addNavPlace(startLink + "/contactosReprografia.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.contactos.reprografia");
+    topNav.addNavPlace(startLink + "/contactosDocentesContactos.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.contactos.docentes");
+%>

 /impl/src/web/public/portals/Docentes/servicosLinks.jsp
 New file
 ,0 → 1,19
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.servicos.online");
+    String startLink = Globals.getStartLinkPortalMenu("servicosDocentesPortalMenu");
+    topNav.addNavPlace(startLink + "/servicosWebmail.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.servicos.online.webmail");
+    topNav.addNavPlace(startLink + "/servicosEduroam.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.servicos.online.eduroam");
+    topNav.addNavPlace(startLink + "/servicosSecretaria.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.servicos.online.secretaria");
+    topNav.addNavPlace(startLink + "/servicosInEstg.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.servicos.online.in.estg");
+    topNav.addNavPlace(startLink + "/servicosBiblioteca.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.servicos.online.biblioteca.online");
+    topNav.addNavPlace(startLink + "/servicosNZero.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.servicos.online.n.zero");
+    topNav.addNavPlace(startLink + "/servicosAcademicosOnline.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.servicos.online.academicos.online");
+    topNav.addNavPlace(startLink + "/servicosPortalAssiduidades.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.servicos.online.portal.assiduidade");
+    topNav.addNavPlace(startLink + "/servicosSisgomOcorrencias.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.servicos.online.sisgom.ocorrencias");
+    topNav.addNavPlace(startLink + "/servicosSiadap.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.servicos.online.siadap");
+%>

/impl/src/web/public/portals/Docentes/accaoSocial.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/Docentes/accaoSocialLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

 /impl/src/web/public/portals/Docentes/accaoSocialLinks.jsp
 New file
 ,0 → 1,14
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.accao.social");
+    String startLink = Globals.getStartLinkPortalMenu("accaoSocialDocentesPortalMenu");
+    topNav.addNavPlace(startLink + "/accaoSocialCantinas.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.accao.social.cantinas");
+    topNav.addNavPlace(startLink + "/accaoSocialResidencias.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.accao.social.residencias");
+    topNav.addNavPlace(startLink + "/accaoSocialEmentas.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.accao.social.ementas");
+    topNav.addNavPlace(startLink + "/accaoSocialDesportoCultura.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.accao.social.desporto.cultura");
+    topNav.addNavPlace(startLink + "/accaoSocialApoioPsicopedagogico.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.accao.social.apoio.psicopedagogico");
+%>

 /impl/src/web/public/portals/Docentes/teacher.jsp
 New file
 ,0 → 1,34
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ 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>
+                    <td class="column">
+                        <jsp:include page="institutoPolitecnicoLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                        <jsp:include page="informacaoAcademicaLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                        <jsp:include page="contactosLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                    </td>
+                    <td class="column">
+                        <jsp:include page="mobilidadeLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                        <jsp:include page="accaoSocialLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                        <jsp:include page="orgaosLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                    </td>
+                    <td class="column">
+                        <jsp:include page="servicosLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+</div>

 /impl/src/web/public/portals/Docentes/topnavInformacaoAcademica.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/teacher.do" + Globals.PORTAL_ROLE_VIEW_TEACHER, "menu.docentes");
+    topNav.addNavPlace(null, "portal.informacao.academica");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /impl/src/web/public/portals/Docentes/topnavMobilidade.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/teacher.do" + Globals.PORTAL_ROLE_VIEW_TEACHER, "menu.docentes");
+    topNav.addNavPlace(null, "portal.mobilidade");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /impl/src/web/public/portals/Docentes/topnavOrgaos.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/teacher.do" + Globals.PORTAL_ROLE_VIEW_TEACHER, "menu.docentes");
+    topNav.addNavPlace(null, "portal.orgaos");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /impl/src/web/public/portals/Docentes/topnavInstitutoPolitecnico.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/teacher.do" + Globals.PORTAL_ROLE_VIEW_TEACHER, "menu.docentes");
+    topNav.addNavPlace(null, "portal.instituto.politecnico");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /impl/src/web/public/portals/topnavPortal.jsp
 New file
 ,0 → 1,13
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%
+    String menu = request.getParameter("menu");
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace(null, menu);
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /impl/src/web/public/portals/antigosAlunos/oldStudent.jsp
 New file
 ,0 → 1,32
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ 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>
+                    <td class="column">
+                        <jsp:include page="estgLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                        <jsp:include page="servicosLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                    </td>
+                    <td class="column">
+                        <jsp:include page="formacaoPosGraduadaLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                        <jsp:include page="institutoPolitecnicoLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                    </td>
+                    <td class="column">
+                        <jsp:include page="actividadesLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                        <jsp:include page="contactosLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+</div>

 /impl/src/web/public/portals/antigosAlunos/topnavContactos.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/oldStudent.do" + Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "menu.antigosAlunos");
+    topNav.addNavPlace(null, "portal.contactos");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /impl/src/web/public/portals/antigosAlunos/topnavFormacaoPosGraduada.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/oldStudent.do" + Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "menu.antigosAlunos");
+    topNav.addNavPlace(null, "portal.formacao.pos.graduada");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /impl/src/web/public/portals/antigosAlunos/topnavEstg.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/oldStudent.do" + Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "menu.antigosAlunos");
+    topNav.addNavPlace(null, "portal.estg");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

/impl/src/web/public/portals/antigosAlunos/institutoPolitecnico.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/antigosAlunos/institutoPolitecnicoLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

 /impl/src/web/public/portals/antigosAlunos/institutoPolitecnicoLinks.jsp
 New file
 ,0 → 1,13
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.instituto.politecnico");
+    String startLink = Globals.getStartLinkPortalMenu("institutoPolitecnicoAntigosAlunosPortalMenu");
+    topNav.addNavPlace(startLink + "/institutoPolitecnicoServicosCentrais.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.instituto.politecnico.servicos.centrais");
+    topNav.addNavPlace(startLink + "/institutoPolitecnicoLojaAluno.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.instituto.politecnico.loja.alunos");
+    topNav.addNavPlace(startLink + "/institutoPolitecnicoMerchandising.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.instituto.politecnico.merchandising");
+    topNav.addNavPlace(startLink + "/institutoPolitecnicoCulturaLazer.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.instituto.politecnico.cultura.lazer");
+%>

/impl/src/web/public/portals/antigosAlunos/contactos.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/antigosAlunos/contactosLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

/impl/src/web/public/portals/antigosAlunos/servicos.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/antigosAlunos/servicosLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

 /impl/src/web/public/portals/antigosAlunos/contactosLinks.jsp
 New file
 ,0 → 1,14
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.contactos");
+    String startLink = Globals.getStartLinkPortalMenu("contactosAntigosAlunosPortalMenu");
+    topNav.addNavPlace(startLink + "/contactosContactosGeraisEstg.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.contactos.gerais.estg");
+    topNav.addNavPlace(startLink + "/contactosConselhoDirectivo.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.contactos.conselho.directivo");
+    topNav.addNavPlace(startLink + "/contactosSecretaria.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.contactos.secretaria");
+    topNav.addNavPlace(startLink + "/contactosDocentesContactos.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.contactos.docentes");
+    topNav.addNavPlace(startLink + "/contactosAaaipp.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.contactos.aaaipp");
+%>

 /impl/src/web/public/portals/antigosAlunos/servicosLinks.jsp
 New file
 ,0 → 1,14
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.servicos.online");
+    String startLink = Globals.getStartLinkPortalMenu("servicoAntigosAlunosPortalMenu");
+    topNav.addNavPlace(startLink + "/servicosWebmail.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.servicos.online.webmail");
+    topNav.addNavPlace(startLink + "/servicosEduroam.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.servicos.online.eduroam");
+    topNav.addNavPlace(startLink + "/servicosSecretaria.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.servicos.online.secretaria");
+    topNav.addNavPlace(startLink + "/servicosBiblioteca.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.servicos.online.biblioteca.online");
+    topNav.addNavPlace(startLink + "/servicosNZero.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.servicos.online.n.zero");
+%>

 /impl/src/web/public/portals/antigosAlunos/topnavServico.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/oldStudent.do" + Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "menu.antigosAlunos");
+    topNav.addNavPlace(null, "portal.servicos.online");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

/impl/src/web/public/portals/antigosAlunos/estg.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/antigosAlunos/estgLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

/impl/src/web/public/portals/antigosAlunos/formacaoPosGraduada.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/antigosAlunos/formacaoPosGraduadaLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

 /impl/src/web/public/portals/antigosAlunos/estgLinks.jsp
 New file
 ,0 → 1,18
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.estg");
+    String startLink = Globals.getStartLinkPortalMenu("estgAntigosAlunosPortalMenu");
+    topNav.addNavPlace(startLink + "/estgMensagemPresidente.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.estg.mensagem.presidente");
+    topNav.addNavPlace(startLink + "/estgComoChegarEstg.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.estg.como.chegar.estg");
+    topNav.addNavPlace(startLink + "/estgNumeros.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.estg.numeros");
+    topNav.addNavPlace(startLink + "/estgNossoPassado.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.estg.nosso.passado");
+    topNav.addNavPlace(startLink + "/estgPresente.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.estg.presente");
+    topNav.addNavPlace(startLink + "/estgAreasCientificas.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.estg.areas.cientificas");
+    topNav.addNavPlace(startLink + "/estgCidade.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.estg.cidade");
+    topNav.addNavPlace(startLink + "/estgBolonha.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.estg.bolonha");
+    topNav.addNavPlace(startLink + "/estgEdificio.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.estg.edificio");
+%>

 /impl/src/web/public/portals/antigosAlunos/formacaoPosGraduadaLinks.jsp
 New file
 ,0 → 1,13
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.formacao.pos.graduada");
+    String startLink = Globals.getStartLinkPortalMenu("formacaoPosGraduadaAntigosAlunosPortalMenu");
+    topNav.addNavPlace(startLink + "/formacaoPosGraduadaMestrados.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.informacao.academica.mestrados");
+    topNav.addNavPlace(startLink + "/formacaoPosGraduadaPosGraduacoes.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.informacao.academica.pos.graduacoes");
+    topNav.addNavPlace(startLink + "/formacaoPosGraduadaCets.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.informacao.academica.cets");
+    topNav.addNavPlace(startLink + "/formacaoPosGraduadaOutrasFormacoes.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.informacao.academica.outras.formacoes");
+%>

 /impl/src/web/public/portals/antigosAlunos/topnavActividades.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/oldStudent.do" + Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "menu.antigosAlunos");
+    topNav.addNavPlace(null, "portal.actividades");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

/impl/src/web/public/portals/antigosAlunos/actividades.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/antigosAlunos/actividadesLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

 /impl/src/web/public/portals/antigosAlunos/actividadesLinks.jsp
 New file
 ,0 → 1,13
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.actividades");
+    String startLink = Globals.getStartLinkPortalMenu("actividadesAntigosAlunosPortalMenu");
+    topNav.addNavPlace(startLink + "/actividadesSemanaEngenharia.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.actividades.semana.engenharia");
+    topNav.addNavPlace(startLink + "/actividadesJornadasCienciasEmpresariais.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.actividades.jornadas.ciencias.empresariais");
+    topNav.addNavPlace(startLink + "/actividadesSeminarioDesign.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.actividades.Seminario.design");
+    topNav.addNavPlace(startLink + "/actividadesOutrasActividades.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.actividades.outras.actividades");
+%>

 /impl/src/web/public/portals/antigosAlunos/topnavInstitutoPolitecnico.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/oldStudent.do" + Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "menu.antigosAlunos");
+    topNav.addNavPlace(null, "portal.instituto.politecnico");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

/impl/src/web/public/portals/nucleoEngenharia/nucleoEngenharia.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/nucleoEngenharia/nucleoEngenhariaLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

 /impl/src/web/public/portals/nucleoEngenharia/nucleoEngenhariaLinks.jsp
 New file
 ,0 → 1,10
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.paginas.nucleo.engenharia");
+    String startLink = Globals.getStartLinkPortalMenu("layoutNucleoEng");
+    topNav.addNavPlace(startLink + "/exemplo.html", "portal.paginas.exemplo");
+%>

 /impl/src/web/public/portals/nucleoEngenharia/topnavNucleoEngenharia.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/student.do" + Globals.PORTAL_ROLE_VIEW_STUDENT, "menu.alunos");
+    topNav.addNavPlace(null, "portal.paginas.nucleo.engenharia");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /impl/src/web/public/portals/futurosAlunos/topnavServicos.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/futureStudent.do" + Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "menu.futurosAlunos");
+    topNav.addNavPlace(null, "portal.servicos.online");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /impl/src/web/public/portals/futurosAlunos/topnavContactos.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/futureStudent.do" + Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "menu.futurosAlunos");
+    topNav.addNavPlace(null, "portal.contactos");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

/impl/src/web/public/portals/futurosAlunos/informacaoAcademica.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/futurosAlunos/informacaoAcademicaLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

 /impl/src/web/public/portals/futurosAlunos/informacaoAcademicaLinks.jsp
 New file
 ,0 → 1,16
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.informacao.academica");
+    String startLink = Globals.getStartLinkPortalMenu("informacaoAcademicaFuturosAlunosPortalMenu");
+    topNav.addNavPlace(startLink + "/informacaoAcademicaCalendarioEscolar.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.informacao.academica.calendario.escolar");
+    topNav.addNavPlace(startLink + "/informacaoAcademicaLicenciaturas.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.informacao.academica.licenciaturas");
+    topNav.addNavPlace(startLink + "/informacaoAcademicaMestrados.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.informacao.academica.mestrados");
+    topNav.addNavPlace(startLink + "/informacaoAcademicaPosGraduacoes.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.informacao.academica.pos.graduacoes");
+    topNav.addNavPlace(startLink + "/informacaoAcademicaCets.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.informacao.academica.cets");
+    topNav.addNavPlace(startLink + "/informacaoAcademicaMaiores23.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.informacao.academica.maiores.23");
+    topNav.addNavPlace(startLink + "/informacaoAcademicaOutrasFormacoes.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.informacao.academica.outras.formacoes");
+%>

 /impl/src/web/public/portals/futurosAlunos/topnavAccaoSocial.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/futureStudent.do" + Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "menu.futurosAlunos");
+    topNav.addNavPlace(null, "portal.accao.social");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

/impl/src/web/public/portals/futurosAlunos/mobilidade.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/futurosAlunos/mobilidadeLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

 /impl/src/web/public/portals/futurosAlunos/topnavEstg.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/futureStudent.do" + Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "menu.futurosAlunos");
+    topNav.addNavPlace(null, "portal.estg");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /impl/src/web/public/portals/futurosAlunos/mobilidadeLinks.jsp
 New file
 ,0 → 1,14
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.mobilidade");
+    String startLink = Globals.getStartLinkPortalMenu("mobilidadeFuturosAlunosPortalMenu");
+    topNav.addNavPlace(startLink + "/mobilidadeAlunosEstrangeirosEstg.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.mobilidade.alunos.estrangeiros");
+    topNav.addNavPlace(startLink + "/mobilidadeAlunosEstgEstrangeiro.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.mobilidade.alunos.estg.estrangeiro");
+    topNav.addNavPlace(startLink + "/mobilidadeProtocolosInternacionais.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.mobilidade.protocolos.internacionais");
+    topNav.addNavPlace(startLink + "/mobilidadeCandidaturas.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.mobilidade.candidaturas");
+    topNav.addNavPlace(startLink + "/mobilidadeProgramaErasmus.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.mobilidade.programa.erasmus");
+%>

/impl/src/web/public/portals/futurosAlunos/orgaos.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/futurosAlunos/orgaosLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

/impl/src/web/public/portals/futurosAlunos/institutoPolitecnico.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/futurosAlunos/institutoPolitecnicoLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

 /impl/src/web/public/portals/futurosAlunos/orgaosLinks.jsp
 New file
 ,0 → 1,13
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.orgaos");
+    String startLink = Globals.getStartLinkPortalMenu("orgaosFuturosAlunosPortalMenu");
+    topNav.addNavPlace(startLink + "/orgaosConselhoPedagogico.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.conselho.pedagogico");
+    topNav.addNavPlace(startLink + "/orgaosConselhoCientifico.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.conselho.cientifico");
+    topNav.addNavPlace(startLink + "/orgaosConselhoDirectivo.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.conselho.directivo");
+    topNav.addNavPlace(startLink + "/orgaosAssembleiaRepresentantes.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.assembleia.representantes");
+%>

 /impl/src/web/public/portals/futurosAlunos/institutoPolitecnicoLinks.jsp
 New file
 ,0 → 1,13
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.instituto.politecnico");
+    String startLink = Globals.getStartLinkPortalMenu("institutoPolitecnicoFuturosAlunosPortalMenu");
+    topNav.addNavPlace(startLink + "/institutoPolitecnicoServicosCentrais.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.instituto.politecnico.servicos.centrais");
+    topNav.addNavPlace(startLink + "/institutoPolitecnicoLojaAluno.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.instituto.politecnico.loja.alunos");
+    topNav.addNavPlace(startLink + "/institutoPolitecnicoMerchandising.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.instituto.politecnico.merchandising");
+    topNav.addNavPlace(startLink + "/institutoPolitecnicoCulturaLazer.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.instituto.politecnico.cultura.lazer");
+%>

/impl/src/web/public/portals/futurosAlunos/contactos.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/futurosAlunos/contactosLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

/impl/src/web/public/portals/futurosAlunos/servicos.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/futurosAlunos/servicosLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

 /impl/src/web/public/portals/futurosAlunos/servicosLinks.jsp
 New file
 ,0 → 1,19
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.servicos.online");
+    String startLink = Globals.getStartLinkPortalMenu("servicosFuturosAlunosPortalMenu");
+    topNav.addNavPlace(startLink + "/servicosWebmail.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.servicos.online.webmail");
+    topNav.addNavPlace(startLink + "/servicosEduroam.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.servicos.online.eduroam");
+    topNav.addNavPlace(startLink + "/servicosSecretaria.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.servicos.online.secretaria");
+    topNav.addNavPlace(startLink + "/servicosBiblioteca.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.servicos.online.biblioteca.online");
+    topNav.addNavPlace(startLink + "/servicosNZero.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.servicos.online.n.zero");
+    topNav.addNavPlace(startLink + "/servicosAcademicosOnline.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.servicos.online.academicos.online");
+    topNav.addNavPlace(startLink + "/servicosGabineteComunicacao.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.servicos.online.gabinete.comunicacao");
+    topNav.addNavPlace(startLink + "/servicosRegie.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.servicos.online.regie");
+    topNav.addNavPlace(startLink + "/servicosCentroInformatico.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.servicos.online.centro.informatico");
+    topNav.addNavPlace(startLink + "/servicosReprografia.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.servicos.online.reprografia");
+%>

 /impl/src/web/public/portals/futurosAlunos/contactosLinks.jsp
 New file
 ,0 → 1,16
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.contactos");
+    String startLink = Globals.getStartLinkPortalMenu("contactosFuturosAlunosPortalMenu");
+    topNav.addNavPlace(startLink + "/contactosContactosGeraisEstg.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.contactos.gerais.estg");
+    topNav.addNavPlace(startLink + "/contactosAreasCientificas.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.contactos.areas.cientificas");
+    topNav.addNavPlace(startLink + "/contactosSecretaria.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.contactos.secretaria");
+    topNav.addNavPlace(startLink + "/contactosCentroInformatico.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.contactos.centro.informatico");
+    topNav.addNavPlace(startLink + "/contactosGabineteComunicacao.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.contactos.gabinete.comunicacao");
+    topNav.addNavPlace(startLink + "/contactosReprografia.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.contactos.reprografia");
+    topNav.addNavPlace(startLink + "/contactosDocentesContactos.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.contactos.docentes");
+%>

/impl/src/web/public/portals/futurosAlunos/accaoSocial.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/futurosAlunos/accaoSocialLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

/impl/src/web/public/portals/futurosAlunos/estg.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/futurosAlunos/estgLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

 /impl/src/web/public/portals/futurosAlunos/accaoSocialLinks.jsp
 New file
 ,0 → 1,16
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.accao.social");
+    String startLink = Globals.getStartLinkPortalMenu("accaoSocialFuturosAlunosPortalMenu");
+    topNav.addNavPlace(startLink + "/accaoSocialBolsaEstudo.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.accao.social.bolsa.estudo");
+    topNav.addNavPlace(startLink + "/accaoSocialAlimentacao.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.accao.social.alimentacao");
+    topNav.addNavPlace(startLink + "/accaoSocialAlojamento.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.accao.social.alojamento");
+    topNav.addNavPlace(startLink + "/accaoSocialApoioMedico.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.accao.social.apoio.medico");
+    topNav.addNavPlace(startLink + "/accaoSocialDesportoCultura.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.accao.social.desporto.cultura");
+    topNav.addNavPlace(startLink + "/accaoSocialGaap.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.accao.social.gapp");
+    topNav.addNavPlace(startLink + "/accaoSocialInformacoes.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.accao.social.informacoes");
+%>

 /impl/src/web/public/portals/futurosAlunos/estgLinks.jsp
 New file
 ,0 → 1,18
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.estg");
+    String startLink = Globals.getStartLinkPortalMenu("estgFuturosAlunosPortalMenu");
+    topNav.addNavPlace(startLink + "/estgMensagemPresidente.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.estg.mensagem.presidente");
+    topNav.addNavPlace(startLink + "/estgComoChegarEstg.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.estg.como.chegar.estg");
+    topNav.addNavPlace(startLink + "/estgNumeros.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.estg.numeros");
+    topNav.addNavPlace(startLink + "/estgNossoPassado.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.estg.nosso.passado");
+    topNav.addNavPlace(startLink + "/estgPresente.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.estg.presente");
+    topNav.addNavPlace(startLink + "/estgAreasCientificas.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.estg.areas.cientificas");
+    topNav.addNavPlace(startLink + "/estgCidade.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.estg.cidade");
+    topNav.addNavPlace(startLink + "/estgBolonha.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.estg.bolonha");
+    topNav.addNavPlace(startLink + "/estgEdificio.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.estg.edificio");
+%>

 /impl/src/web/public/portals/futurosAlunos/topnavInformacaoAcademica.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/futureStudent.do" + Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "menu.futurosAlunos");
+    topNav.addNavPlace(null, "portal.informacao.academica");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /impl/src/web/public/portals/futurosAlunos/futureStudent.jsp
 New file
 ,0 → 1,38
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ 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>
+                    <td class="column">
+                        <jsp:include page="estgLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                        <jsp:include page="informacaoAcademicaLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                        <jsp:include page="contactosLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                    </td>
+                    <td class="column">
+                        <jsp:include page="institutoPolitecnicoLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                        <jsp:include page="orgaosLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                        <jsp:include page="accaoSocialLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                    </td>
+                    <td class="column">
+                        <jsp:include page="servicosLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                        <jsp:include page="mobilidadeLinks.jsp"/>
+                        <jsp:include page="../blocoPortal.jsp"/>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+</div>

 /impl/src/web/public/portals/futurosAlunos/topnavMobilidade.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/futureStudent.do" + Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "menu.futurosAlunos");
+    topNav.addNavPlace(null, "portal.mobilidade");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /impl/src/web/public/portals/futurosAlunos/topnavOrgaos.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/futureStudent.do" + Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "menu.futurosAlunos");
+    topNav.addNavPlace(null, "portal.orgaos");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /impl/src/web/public/portals/futurosAlunos/topnavInstitutoPolitecnico.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/futureStudent.do" + Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "menu.futurosAlunos");
+    topNav.addNavPlace(null, "portal.instituto.politecnico");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

 /impl/src/web/public/portals/blocoPortal.jsp
 New file
 ,0 → 1,51
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="jomm.utils.MessageResources" %>
+<%
+    TopNav topNav = NavPlaceServer.getPortalMenuPlacesKey(request);
+    if(topNav.getTitle() != null)
+    {
+%>
+<div class="block">
+    <p><%=MessageResources.getMessage(request, topNav.getTitle())%></p>
+    <%
+        }
+    %>
+    <ul>
+        <%
+            List<NavPlace> navKeys = topNav.getNavPlaces();
+            for (NavPlace navKey : navKeys)
+            {
+                NavPlace navPlace = (NavPlace) navKey;
+                if (navPlace.getUrl() != null)
+                {
+                    if(!navPlace.getUrl().contains("http://"))
+                    {
+        %>
+        <li>
+            <a href="<%=request.getContextPath() + navPlace.getUrl()%>"><%=MessageResources.getMessage(request, navPlace.getKey())%></a>
+        </li>
+        <%
+        }
+        else
+        {
+        %>
+        <li>
+            <a href="<%=navPlace.getUrl()%>"><%=MessageResources.getMessage(request, navPlace.getKey())%></a>
+        </li>
+        <%}
+        }
+        else
+        {
+        %>
+        <li><%=MessageResources.getMessage(request, navPlace.getKey())%></li>
+        <%
+                }
+            }
+        %>
+    </ul>
+</div>

 /impl/src/web/public/portals/assessoria/topnavAssessoria.jsp
 New file
 ,0 → 1,14
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="java.util.*"%>
+<%@ page import="jomm.web.utils.NavPlace" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createTopNav(request);
+    topNav.addNavPlace("/Welcome.do", "Home");
+    topNav.addNavPlace("/student.do" + Globals.PORTAL_ROLE_VIEW_STUDENT, "menu.alunos");
+    topNav.addNavPlace(null, "portal.paginas.alunos.assessoria");
+%>
+<jsp:include page="/layout/topnav.jsp"/>

/impl/src/web/public/portals/assessoria/assessoria.jsp
New file
0,0 → 1,7
<%@ page import="jomm.web.utils.TopNav" %>
<%@ page import="jomm.web.utils.NavPlaceServer" %>
<%@ page import="pt.estgp.estgweb.web.Globals" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>

<jsp:include page="/public/portals/assessoria/assessoriaLinks.jsp"/>
<jsp:include page="/public/portals/menuPortal.jsp"/>

 /impl/src/web/public/portals/assessoria/assessoriaLinks.jsp
 New file
 ,0 → 1,10
+<%@ page import="jomm.web.utils.TopNav" %>
+<%@ page import="pt.estgp.estgweb.web.Globals" %>
+<%@ page import="jomm.web.utils.NavPlaceServer" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
+    topNav.setTitle("portal.paginas.alunos.assessoria");
+    String startLink = Globals.getStartLinkPortalMenu("layoutAA");
+    topNav.addNavPlace(startLink + "/exemplo.html", "portal.paginas.exemplo");
+%>

 /impl/src/web/public/announcements/announcementsPortalLeft.jsp
 ,29 → 1,60
 <%--
-  Created by IntelliJ IDEA.
   User: Fabio
   Date: 27/Mar/2008
   Time: 12:25:30
-  To change this template use File | Settings | File Templates.
 --%>
+<%@ page import="pt.utl.ist.berserk.logic.serviceManager.IServiceManager" %>
+<%@ page import="pt.utl.ist.berserk.logic.serviceManager.ServiceManager" %>
+<%@ page import="pt.estgp.estgweb.domain.views.AnnouncementView" %>
+<%@ page import="java.util.List" %>
+<%@page import="pt.estgp.estgweb.Globals" %>
+<%@ page import="pt.estgp.estgweb.web.utils.RequestUtils" %>
+<%@ page import="java.util.ArrayList" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld"  prefix="logic" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-html.tld"  prefix="html" %>
+<%@ taglib uri="/WEB-INF/tlds/jomm.tld"  prefix="jomm" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld"  prefix="bean" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    IServiceManager sm = ServiceManager.getInstance();
+    String[] names = new String[]{};
+    Object[] args = new Object[]{request.getParameter("role"), Globals.ANNOUNCEMENT_TYPE_TOP_FLASH_NEWS};
+    List<AnnouncementView> announcementViews = (List<AnnouncementView>) sm.execute(RequestUtils.getRequester(request), "LoadRoleTypeMaxAnnouncements", args, names);
+    request.setAttribute("Announcements", announcementViews);
+%>
 <div class="portalLeftAnnouncements">
     <table>
-        <tr>
-            <td>
-            <div class="portalAnnouncementTop">
-                <div class="imageAnnouncementTop">
-                   <img src="<%=request.getContextPath()%>/imgs/destaque_2_1.jpg"/>
-                </div>
-                <div class="portalAnnouncement">
-                    <h1>Titulo</h1>
-                    <div class="portalAnnouncementText">
-                          ewdsdasdasdsdasasddsdasd
-                    </div>
-                </div>
-            </div>
-            </td>
-        </tr>
+        <logic:present name="Announcements">
+            <logic:iterate id="item" name="Announcements" type="pt.estgp.estgweb.domain.views.AnnouncementView">
+                <tr>
+                    <td>
+                        <div class="portalAnnouncementTop">
+                            <div class="imageAnnouncementTop">
+                                <%if(item.getBigImage() != null){%><img alt="<%=item.getTitle()%>" src="<%=request.getContextPath()%>/imageStream/<%=item.getSmallImage().getId()%>"><%}%>
+                            </div>
+                            <div class="portalAnnouncement">
+                                <logic:empty name="item" property="url">
+                                    <div class="portalAnnouncementTitle"><html:link action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.title}</html:link></div>
+                                    <div class="portalAnnouncementText"><html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.textSummarySmall}</html:link></div>
+                                </logic:empty>
+                                <logic:notEmpty name="item" property="url">
+                                    <%if(!item.getHaveAllText())
+                                    {%>
+                                    <div class="portalAnnouncementTitle"><html:link href="${item.url}">${item.title}</html:link></div>
+                                    <div class="portalAnnouncementText"><html:link href="${item.url}">${item.textSummarySmall}</html:link></div>
+                                    <%}
+                                    else
+                                    {%>
+                                    <div class="portalAnnouncementTitle"><html:link action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.title}</html:link></div>
+                                    <div class="portalAnnouncementText"><html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.textSummarySmall}</html:link></div>
+                                    <%}%>
+                                </logic:notEmpty>
+                            </div>
+                        </div>
+                    </td>
+                </tr>
+            </logic:iterate>
+        </logic:present>
     </table>
-</div>
+</div>

 /impl/src/web/public/announcements/getFlashNews.jsp
 New file
 ,0 → 1,46
+<%@ page import="pt.utl.ist.berserk.logic.serviceManager.IServiceManager" %>
+<%@ page import="pt.utl.ist.berserk.logic.serviceManager.ServiceManager" %>
+<%@ page import="pt.estgp.estgweb.domain.views.AnnouncementView" %>
+<%@ page import="java.util.List" %>
+<%@page import="pt.estgp.estgweb.Globals" %>
+<%@ page import="pt.estgp.estgweb.web.utils.RequestUtils" %>
+<%@ page import="java.util.ArrayList" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="/WEB-INF/tlds/estgweb.tld"  prefix="estgweb" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld"  prefix="logic" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-html.tld"  prefix="html" %>
+<%@ taglib uri="/WEB-INF/tlds/jomm.tld"  prefix="jomm" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld"  prefix="bean" %>
+<%
+    //String iterator = request.getParameter("iterator");
+    IServiceManager sm = ServiceManager.getInstance();
+//    String[] names = new String[]{"iterator"};
+    String[] names = new String[]{};
+    //Object[] arguments = new Object[]{Integer.parseInt(iterator)};
+    Object[] arguments = new Object[]{};
+    AnnouncementView announcementView = (AnnouncementView) sm.execute(RequestUtils.getRequester(request), "LoadTopFlashNewsIterate", arguments, names);
+%>
+<table class="container">
+    <tr>
+        <td class="textContainer">
+            <%if(announcementView.getUrl()==null)
+            {%>
+            <h2><a href="<%=request.getContextPath()%>/loadAnnouncement.do?id=<%=announcementView.getId()%>&dispatch=load"><%=announcementView.getTitle()%></a></h2>
+            <p><a href="<%=request.getContextPath()%>/loadAnnouncement.do?id=<%=announcementView.getId()%>&dispatch=load"><%=announcementView.getTextSummary()%></a></p>
+            <%}
+                else if(!announcementView.getHaveAllText())
+            {%>
+            <h2><a href="<%=announcementView.getUrl()%>"><%=announcementView.getTitle()%></a></h2>
+            <p><a href="<%=announcementView.getUrl()%>"><%=announcementView.getText()%></a></p>
+            <%}
+            else
+            {%>
+             <h2><a href="<%=request.getContextPath()%>/loadAnnouncement.do?id=<%=announcementView.getId()%>&dispatch=load"><%=announcementView.getTitle()%></a></h2>
+            <p><a href="<%=request.getContextPath()%>/loadAnnouncement.do?id=<%=announcementView.getId()%>&dispatch=load"><%=announcementView.getTextSummary()%></a></p>
+            <%}%>
+        </td>
+        <td class="imageContainer">
+            <%if(announcementView.getBigImage() != null){%><img alt="<%=announcementView.getTitle()%>" src="<%=request.getContextPath()%>/imageStream/<%=announcementView.getBigImage().getId()%>"><%}%>
+        </td>
+    </tr>
+</table>

 /impl/src/web/public/announcements/loadAnnouncement.jsp
 ,18 → 7,25
 <%@ taglib uri="/WEB-INF/tlds/jomm.tld"  prefix="jomm" %>
 <jsp:useBean id="Announcement" type="pt.estgp.estgweb.domain.views.AnnouncementView" scope="request"/>
-<table class="box">
-    <tr>
-        <th>
-            ${Announcement.title}
-        </th>
-    </tr>
-    <tr>
-        <td>
-            <p>
-                ${Announcement.text}
-            </p>
-        </td>
-    </tr>
-</table>
+<div class="pageSection">
+    <div class="sectionTitle">
+        <h2>${Announcement.title}</h2>
+    </div>
+    <div class="pageText">
+        <%
+            if(Announcement.getBigImage() != null)
+            {
+        %>
+        <img align="left" alt="<%=Announcement.getTitle()%>" src="<%=request.getContextPath()%>/imageStream/<%=Announcement.getBigImage().getId()%>">
+        <%
+            }
+            else if(Announcement.getSmallImage() != null)
+            {
+        %>
+        <img align="left" alt="<%=Announcement.getTitle()%>" src="<%=request.getContextPath()%>/imageStream/<%=Announcement.getSmallImage().getId()%>">
+        <%
+            }
+        %>
+        ${Announcement.text}
+    </div>
+</div>

 /impl/src/web/public/announcements/announcements.jsp
 ,35 → 14,32
     List<AnnouncementView> announcementViews = (List<AnnouncementView>) sm.execute(RequestUtils.getRequester(request), "LoadTargetMaxAnnouncements", args, names);
     request.setAttribute("Announcements", announcementViews);
 %>
-<table class="lastAnnouncementsModule" style=" border-collapse: collapse;">
-    <tr>
-        <td id="topBar">
-            <bean:message key="announcements"/>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <logic:present name="Announcements">
-                <div class="linkTypeTwo">
-                    <ul>
-                        <logic:iterate id="item" name="Announcements" type="pt.estgp.estgweb.domain.views.AnnouncementView">
-                            <li>
-                                <logic:empty name="item" property="url">
-                                    <logic:equal value="news" name="item" property="type">
-                                        <html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.title}</html:link>
-                                    </logic:equal>
-                                </logic:empty>
-                                <logic:notEmpty name="item" property="url">
-                                    <logic:equal value="news" name="item" property="type">
-                                        <html:link href="${item.url}">${item.title}</html:link>
-                                    </logic:equal>
-                                </logic:notEmpty>
-                            </li>
-                        </logic:iterate>
-                    </ul>
-                </div>
-            </logic:present>
-        </td>
-    </tr>
-</table>
+<div id="lastNews">
+    <h1><bean:message key="announcements"/></h1>
+    <div class="linkLeftMenu">
+        <logic:present name="Announcements">
+            <ul>
+                <logic:iterate id="item" name="Announcements" type="pt.estgp.estgweb.domain.views.AnnouncementView">
+                    <logic:equal value="news" name="item" property="type">
+                        <li>
+                            <logic:empty name="item" property="url">
+                                <h2><html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.title}</html:link></h2>
+                            </logic:empty>
+                            <logic:notEmpty name="item" property="url">
+                                <%if(!item.getHaveAllText())
+                                {%>
+                                <h2><html:link href="${item.url}">${item.title}</html:link></h2>
+                                <%}
+                                else
+                                {%>
+                                <h2><html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.title}</html:link></h2>
+                                <%}%>
+                            </logic:notEmpty>
+                        </li>
+                    </logic:equal>
+                </logic:iterate>
+            </ul>
+        </logic:present>
+    </div>
+</div>

 /impl/src/web/public/announcements/announcementsPortalRight.jsp
 ,14 → 11,9
 <%@ page import="java.util.List" %>
 <%@page import="pt.estgp.estgweb.Globals" %>
 <%@ page import="pt.estgp.estgweb.web.utils.RequestUtils" %>
+<%@ page import="java.util.ArrayList" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<!--!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!TENS DE METER ESTAS INCLUSOES
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-VE EM BAIXO DESTE COMENTARIO
--->
+<%@ taglib uri="/WEB-INF/tlds/estgweb.tld"  prefix="estgweb" %>
 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld"  prefix="logic" %>
 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld"  prefix="html" %>
 <%@ taglib uri="/WEB-INF/tlds/jomm.tld"  prefix="jomm" %>
 ,46 → 21,47
 <%
     IServiceManager sm = ServiceManager.getInstance();
     String[] names = new String[]{};
-    Object[] args = new Object[]{request.getParameter("role"),Globals.ANNOUNCEMENT_TYPE_NEWS};
-    List<AnnouncementView> announcementViews = (List<AnnouncementView>) sm.execute(RequestUtils.getRequester(request), "LoadRoleTypeMaxAnnouncements",args,names);
+    Object[] args = new Object[]{request.getParameter("role"), Globals.ANNOUNCEMENT_TYPE_NEWS};
+    List<AnnouncementView> announcementViews = (List<AnnouncementView>) sm.execute(RequestUtils.getRequester(request), "LoadRoleTypeMaxAnnouncements", args, names);
     request.setAttribute("Announcements", announcementViews);
 %>
-NUMERO DE ANUNCIOS CARREGADOS = <%=announcementViews.size()%>
 <div class="portalRightAnnouncements">
     <table>
-        <tr>
-            <logic:present name="Announcements">
-                <logic:iterate id="item" name="Announcements" type="pt.estgp.estgweb.domain.views.AnnouncementView">
-                    ${item.type}
-                    -
-                    ${item.id}
+        <logic:present name="Announcements">
+            <logic:iterate id="item" name="Announcements" type="pt.estgp.estgweb.domain.views.AnnouncementView">
+                <tr>
                     <td width="25%">
                         <div class="imageAnnouncementNews">
+                             <estgweb:ownerImageRole name="item"/>
                         </div>
                     </td>
                     <td>
                         <div class="portalAnnouncementNews">
                             <div class="portalAnnouncement">
                                 <logic:empty name="item" property="url">
-                                        <h1><html:link action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.title}</html:link></h1>
-                                        <div class="portalAnnouncementText"><html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.text}</html:link></div>
+                                    <div class="portalAnnouncementTitle"><html:link action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.title}</html:link></div>
+                                    <div class="portalAnnouncementText"><html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.textSummarySmall}</html:link></div>
                                 </logic:empty>
                                 <logic:notEmpty name="item" property="url">
-                                        <h1><html:link href="${item.url}">${item.title}</html:link></h1>
-                                        <div class="portalAnnouncementText"><html:link href="${item.url}">${item.text}</html:link></div>
+                                    <%if(!item.getHaveAllText())
+                                    {%>
+                                    <div class="portalAnnouncementTitle"><html:link href="${item.url}">${item.title}</html:link></div>
+                                    <div class="portalAnnouncementText"><html:link href="${item.url}">${item.textSummarySmall}</html:link></div>
+                                    <%}
+                                    else
+                                    {%>
+                                    <div class="portalAnnouncementTitle"><html:link action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.title}</html:link></div>
+                                    <div class="portalAnnouncementText"><html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.textSummarySmall}</html:link></div>
+                                    <%}%>
                                 </logic:notEmpty>
                             </div>
                         </div>
                     </td>
-                </logic:iterate>
-            </logic:present>
-        </tr>
+                </tr>
+            </logic:iterate>
+        </logic:present>
     </table>
 </div>

 /impl/src/web/templates/templatePageAssessoria.jsp
 New file
 ,0 → 1,87
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<h1>Página de Assessoria de Administração</h1>
+<div class="section">
+    <h2>O que é a Assessoria de Administração?</h2>
+    <p> O curso de Assessoria de Administração constitui uma licenciatura bietápica,
+        que habilita os alunos a integrar o mercado de trabalho, em organismos públicos ou privados,
+        tecnicamente qualificados para exercerem funções com responsabilidades, no âmbito da Assessoria e
+        apoio à direcção e administração de empresas e junto dos mais diversos níveis hierárquicos e departamentos.</p>
+</div>
+<p>Para a consecução deste objectivo, a formação ao longo do curso fornece aos alunos um conjunto de
+    ferramentas multidisciplinares que lhes proporcionam formação superior e altamente qualificada em
+    áreas tão diversas como as Línguas (Portuguesa e Estrangeiras), Secretariado, Gestão, Contabilidade,
+    Sociologia, Direito, Informática e Novas Tecnologias.</p>
+<div class="section">
+    <h2>Saidas Profissionais</h2>
+    <p>Os profissionais habilitados com o curso de Assessoria de Administração estão aptos a:</p>
+    <div class="listDisc">
+        <ul>
+            <li>Organismos públicos ou privados para exercer funções no âmbito da Assessoria e apoio à Direcção e Administração de empresas/instituições em diversos departamentos e junto dos mais diversos níveis hierárquicos.</li>
+            <li>Estão também habilitados a organizar eventos, congressos e seminários, de nível nacional e internacional.</li>
+            <li>Etc...</li>
+        </ul>
+    </div>
+</div>
+<div class="section">
+    <h2>Outros acessos preferencias:</h2>
+    <div class="listSquare">
+        <ul>
+            <li>R831 Agrupamento 3 / Administração</li>
+            <li>P540 Assistente de Gestão</li>
+            <li>T100 Assistente de Gestão</li>
+            <li>Ets...</li>
+        </ul>
+    </div>
+</div>
+<div class="listClean">
+    <ul>
+        <li><a href="#">Lista de Elemento Sem Estilo</a></li>
+        <li><a href="#">Lista de Elemento Sem Estilo</a></li>
+        <li><a href="#">Lista de Elemento Sem Estilo</a></li>
+        <li><a href="#">Lista de Elemento Sem Estilo</a></li>
+    </ul>
+</div>
+<div class="listCircleWhite">
+    <ul>
+        <li><a href="#">Lista de Elementos Circulo Branco</a></li>
+        <li><a href="#">Lista de Elementos Circulo Branco</a></li>
+        <li><a href="#">Lista de Elementos Circulo Branco</a></li>
+        <li><a href="#">Lista de Elementos Circulo Branco</a></li>
+    </ul>
+</div>
+<div class="listDecimal">
+    <ul>
+        <li><a href="#">Lista de Elementos Decimal</a></li>
+        <li><a href="#">Lista de Elementos Decimal</a></li>
+        <li><a href="#">Lista de Elementos Decimal</a></li>
+        <li><a href="#">Lista de Elementos Decimal</a></li>
+    </ul>
+</div>
+<div class="listDisc">
+    <ul>
+        <li><a href="#">Lista de Elementos Circulo Preto</a></li>
+        <li><a href="#">Lista de Elementos Circulo Preto</a></li>
+        <li><a href="#">Lista de Elementos Circulo Preto</a></li>
+        <li><a href="#">Lista de Elementos Circulo Preto</a></li>
+    </ul>
+</div>
+<div class="listSquare">
+    <ul>
+        <li><a href="#">Lista de Elementos Quadrado</a></li>
+        <li><a href="#">Lista de Elementos Quadrado</a></li>
+        <li><a href="#">Lista de Elementos Quadrado</a></li>
+        <li><a href="#">Lista de Elementos Quadrado</a></li>
+    </ul>
+</div>
+<img src=""/>

 /impl/src/web/templates/templatePageNucleoEng.jsp
 New file
 ,0 → 1,99
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<h1>Página do Nucleo de Engenharia</h1>
+<div class="section">
+    <h2>O que é a Engenharia?</h2>
+    <p>Engenharia é a arte, a ciência e a técnica de bem conjugar os conhecimentos especializados
+        (científicos) de uma dada área do saber com a sua viabilidade técnico-econômica, para produzir
+        novas utilidades e/ou transformar a natureza, em conformidade com idéias bem planejadas. Já se
+        disse que "Engenharia é tão-somente aplicação da física aliada ao bom-senso"
+        [LUZ, Antônio Máximo Ribeiro da, Professor Emérito da UFMG (Belo Horizonte, MG, Brasil]
+        e — com os mais recentes avanços da ciência e da tecnologia, aqui se o pode aperfeiçoar:
+        Engenharia é aplicação prática dalgum conhecimento especializado aliado ao bom-senso.</p>
+</div>
+<p>Digno de nota é o fato de tradicionalmente as engenharias terem lidado apenas com objetos concretos,
+    palpáveis. Modernamente, porém, esse cenário mudou e deu lugar ao trato também de entidades ou objetos
+    abstratos, não-palpáveis. Tais são, por exemplo, as engenharias de custos, informática, de software, entre
+    outras. Numa certa medida, não rigorosa, pode-se incluir nesse novo rol, também as engenharias do ambiente e
+    genética, com as reservas que lhes são próprias. Toda engenharia, contudo, envolve certo grau de abstração.</p>
+<div class="section">
+    <h2>Areas da Engenharia</h2>
+    <p>Várias são as especialidades/ramos de engenharia. Com o progresso das ciências e das tecnologias
+        que lhes são associadas, mais e mais especialidades continuamente estão a surgir. Eis, a seguir,
+        uma lista não-exaustiva das especialidades atuais de engenharia:</p>
+    <div class="listDecimal">
+        <ul>
+            <li>Engenharia Acústica</li>
+            <li>Engenharia Aeroespacial</li>
+            <li>Engenharia Aeronáutica</li>
+            <li>Engenharia Aeroviária</li>
+            <li><a href="http://pt.wikipedia.org/wiki/Engenharia_Agr%C3%ADcola">Engenharia Agrícola</a></li>
+            <li><a href="http://pt.wikipedia.org/wiki/Engenharia_de_Agrimensura">Engenharia de Agrimensura</a></li>
+            <li><a href="http://pt.wikipedia.org/w/index.php?title=Engenharia_Agron%C3%B4mica&action=edit&redlink=1">Engenharia Agronômica</a></li>
+            <li><a href="http://pt.wikipedia.org/wiki/Engenharia_de_Alimentos">Engenharia de Alimentos</a></li>
+            <li>Etc...</li>
+        </ul>
+    </div>
+</div>
+<div class="section">
+    <h2>Ver Também</h2>
+    <div class="listSquare">
+        <ul>
+            <li><a href="http://pt.wikipedia.org/wiki/Ci%C3%AAncia">Ciência</a></li>
+            <li><a href="http://pt.wikipedia.org/wiki/Modelos_f%C3%ADsicos">Modelos Fisicos</a></li>
+            <li><a href="http://pt.wikipedia.org/wiki/Tecnologia">Tecnologia</a></li>
+            <li><a href="http://pt.wikipedia.org/wiki/Toler%C3%A2ncia_%28engenharia%29">Tolerância</a></li>
+        </ul>
+    </div>
+</div>
+<div class="listClean">
+    <ul>
+        <li><a href="#">Lista de Elemento Sem Estilo</a></li>
+        <li><a href="#">Lista de Elemento Sem Estilo</a></li>
+        <li><a href="#">Lista de Elemento Sem Estilo</a></li>
+        <li><a href="#">Lista de Elemento Sem Estilo</a></li>
+    </ul>
+</div>
+<div class="listCircleWhite">
+    <ul>
+        <li><a href="#">Lista de Elementos Circulo Branco</a></li>
+        <li><a href="#">Lista de Elementos Circulo Branco</a></li>
+        <li><a href="#">Lista de Elementos Circulo Branco</a></li>
+        <li><a href="#">Lista de Elementos Circulo Branco</a></li>
+    </ul>
+</div>
+<div class="listDecimal">
+    <ul>
+        <li><a href="#">Lista de Elementos Decimal</a></li>
+        <li><a href="#">Lista de Elementos Decimal</a></li>
+        <li><a href="#">Lista de Elementos Decimal</a></li>
+        <li><a href="#">Lista de Elementos Decimal</a></li>
+    </ul>
+</div>
+<div class="listDisc">
+    <ul>
+        <li><a href="#">Lista de Elementos Circulo Preto</a></li>
+        <li><a href="#">Lista de Elementos Circulo Preto</a></li>
+        <li><a href="#">Lista de Elementos Circulo Preto</a></li>
+        <li><a href="#">Lista de Elementos Circulo Preto</a></li>
+    </ul>
+</div>
+<div class="listSquare">
+    <ul>
+        <li><a href="#">Lista de Elementos Quadrado</a></li>
+        <li><a href="#">Lista de Elementos Quadrado</a></li>
+        <li><a href="#">Lista de Elementos Quadrado</a></li>
+        <li><a href="#">Lista de Elementos Quadrado</a></li>
+    </ul>
+</div>
+<img src=""/>

 /impl/src/web/templates/templatePageOriginal.jsp
 New file
 ,0 → 1,54
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<h1>Titulo Principal a Verde</h1>
+<div class="section">
+    <h2>Titulo da Secção</h2>
+    <p>textotextotextotextotextotextotextotexto</p>
+</div>
+<div class="listClean">
+    <ul>
+        <li><a href="#">Lista de Elemento Sem Estilo</a></li>
+        <li><a href="#">Lista de Elemento Sem Estilo</a></li>
+        <li><a href="#">Lista de Elemento Sem Estilo</a></li>
+        <li><a href="#">Lista de Elemento Sem Estilo</a></li>
+    </ul>
+</div>
+<div class="listCircleWhite">
+    <ul>
+        <li><a href="#">Lista de Elementos Circulo Branco</a></li>
+        <li><a href="#">Lista de Elementos Circulo Branco</a></li>
+        <li><a href="#">Lista de Elementos Circulo Branco</a></li>
+        <li><a href="#">Lista de Elementos Circulo Branco</a></li>
+    </ul>
+</div>
+<div class="listDecimal">
+    <ul>
+        <li><a href="#">Lista de Elementos Decimal</a></li>
+        <li><a href="#">Lista de Elementos Decimal</a></li>
+        <li><a href="#">Lista de Elementos Decimal</a></li>
+        <li><a href="#">Lista de Elementos Decimal</a></li>
+    </ul>
+</div>
+<div class="listDisc">
+    <ul>
+        <li><a href="#">Lista de Elementos Circulo Preto</a></li>
+        <li><a href="#">Lista de Elementos Circulo Preto</a></li>
+        <li><a href="#">Lista de Elementos Circulo Preto</a></li>
+        <li><a href="#">Lista de Elementos Circulo Preto</a></li>
+    </ul>
+</div>
+<div class="listSquare">
+    <ul>
+        <li><a href="#">Lista de Elementos Quadrado</a></li>
+        <li><a href="#">Lista de Elementos Quadrado</a></li>
+        <li><a href="#">Lista de Elementos Quadrado</a></li>
+        <li><a href="#">Lista de Elementos Quadrado</a></li>
+    </ul>
+</div>
+<img src=""/>

/impl/gen/java/pt/estgp/estgweb/domain/Course.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Mar/2008 12:41:21 by Hibernate Tools 3.2.0.b9
// Generated 4/Abr/2008 15:49:07 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/UrlStatMonth.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Mar/2008 12:41:21 by Hibernate Tools 3.2.0.b9
// Generated 4/Abr/2008 15:49:07 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/UrlStatDayId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Mar/2008 12:41:21 by Hibernate Tools 3.2.0.b9
// Generated 4/Abr/2008 15:49:07 by Hibernate Tools 3.2.0.b9

/impl/gen/java/pt/estgp/estgweb/domain/SessionObject.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Mar/2008 12:41:21 by Hibernate Tools 3.2.0.b9
// Generated 4/Abr/2008 15:49:07 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /impl/gen/java/pt/estgp/estgweb/domain/GenericUser.java
 ,5 → 1,5
 package pt.estgp.estgweb.domain;
-// Generated 28/Mar/2008 12:41:21 by Hibernate Tools 3.2.0.b9
+// Generated 4/Abr/2008 15:49:07 by Hibernate Tools 3.2.0.b9
 import java.util.Date;
 ,53 → 10,53
 public abstract class GenericUser extends pt.estgp.estgweb.domain.DomainObject implements java.io.Serializable {
-     private long id;
-     private Date updateDate;
-     private Date saveDate;
-     private boolean superuser;
-     private String name;
+    private long id;
+    private Date updateDate;
+    private Date saveDate;
+    private boolean superuser;
+    private String name;
     public GenericUser() {
     }
     public GenericUser(Date saveDate, boolean superuser, String name) {
-       this.saveDate = saveDate;
-       this.superuser = superuser;
-       this.name = name;
+        this.saveDate = saveDate;
+        this.superuser = superuser;
+        this.name = name;
     }
     public long getId() {
         return this.id;
     }
     public void setId(long id) {
         this.id = id;
     }
     public Date getUpdateDate() {
         return this.updateDate;
     }
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
     public Date getSaveDate() {
         return this.saveDate;
     }
     public void setSaveDate(Date saveDate) {
         this.saveDate = saveDate;
     }
     public boolean isSuperuser() {
         return this.superuser;
     }
     public void setSuperuser(boolean superuser) {
         this.superuser = superuser;
     }
     public String getName() {
         return this.name;
     }
     public void setName(String name) {
         this.name = name;
     }

/impl/gen/java/pt/estgp/estgweb/domain/User.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Mar/2008 12:41:21 by Hibernate Tools 3.2.0.b9
// Generated 4/Abr/2008 15:49:07 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/UrlStatYear.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Mar/2008 12:41:21 by Hibernate Tools 3.2.0.b9
// Generated 4/Abr/2008 15:49:07 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/UrlStatMonthId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Mar/2008 12:41:21 by Hibernate Tools 3.2.0.b9
// Generated 4/Abr/2008 15:49:07 by Hibernate Tools 3.2.0.b9

/impl/gen/java/pt/estgp/estgweb/domain/UserSession.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Mar/2008 12:41:21 by Hibernate Tools 3.2.0.b9
// Generated 4/Abr/2008 15:49:07 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /impl/gen/java/pt/estgp/estgweb/domain/Image.java
 ,5 → 1,5
 package pt.estgp.estgweb.domain;
-// Generated 28/Mar/2008 12:41:21 by Hibernate Tools 3.2.0.b9
+// Generated 4/Abr/2008 15:49:07 by Hibernate Tools 3.2.0.b9
 import java.util.Date;
 ,15 → 14,19
      private Date updateDate;
      private Date saveDate;
      private String name;
+     private String contentType;
+     private int size;
      private String description;
      private byte[] image;
     public Image() {
     }
-    public Image(Date saveDate, String name, String description, byte[] image) {
+    public Image(Date saveDate, String name, String contentType, int size, String description, byte[] image) {
        this.saveDate = saveDate;
        this.name = name;
+       this.contentType = contentType;
+       this.size = size;
        this.description = description;
        this.image = image;
     }
 ,6 → 59,20
     public void setName(String name) {
         this.name = name;
     }
+    public String getContentType() {
+        return this.contentType;
+    }
+    public void setContentType(String contentType) {
+        this.contentType = contentType;
+    }
+    public int getSize() {
+        return this.size;
+    }
+    public void setSize(int size) {
+        this.size = size;
+    }
     public String getDescription() {
         return this.description;
     }

 /impl/gen/java/pt/estgp/estgweb/domain/dao/impl/TesteDao.java
 New file
 ,0 → 1,39
+package pt.estgp.estgweb.domain.dao.impl;
+// Generated 9/Abr/2008 17:13:21 by Hibernate Tools 3.2.0.b9
+import org.apache.log4j.Logger;
+/**
+ * Home object for domain model class Teste.
+ * @author Jorge Machado - Hibernate Tools
+ */
+import jomm.dao.IDomainObjectDao;
+import jomm.dao.impl.AbstractDao;
+import pt.estgp.estgweb.domain.Teste;
+public class TesteDao extends AbstractDao<Teste> {
+//public class TesteDao extends AbstractDao implements IDomainObjectDao {
+    private static final Logger log = Logger.getLogger(TesteDao.class);
+    protected static TesteDao myInstance = null;
+    protected TesteDao(){
+        super();
+    }
+    public static TesteDao getInstance() {
+        if (myInstance == null)
+            myInstance = new TesteDao();
+        return myInstance;
+    }
+    protected Class getReferenceClass() {
+        return Teste.class;
+    }
+}

 /impl/gen/java/pt/estgp/estgweb/domain/Teste.java
 New file
 ,0 → 1,69
+package pt.estgp.estgweb.domain;
+// Generated 9/Abr/2008 17:13:19 by Hibernate Tools 3.2.0.b9
+import java.util.Date;
+/**
+ * Teste generated by hbm2java
+ */
+public abstract class Teste extends pt.estgp.estgweb.domain.DomainObject implements java.io.Serializable {
+     private long id;
+     private Date updateDate;
+     private Date saveDate;
+     private String name;
+     private String morada;
+    public Teste() {
+    }
+    public Teste(Date saveDate, String name, String morada) {
+       this.saveDate = saveDate;
+       this.name = name;
+       this.morada = morada;
+    }
+    public long getId() {
+        return this.id;
+    }
+    public void setId(long id) {
+        this.id = id;
+    }
+    public Date getUpdateDate() {
+        return this.updateDate;
+    }
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+    public Date getSaveDate() {
+        return this.saveDate;
+    }
+    public void setSaveDate(Date saveDate) {
+        this.saveDate = saveDate;
+    }
+    public String getName() {
+        return this.name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getMorada() {
+        return this.morada;
+    }
+    public void setMorada(String morada) {
+        this.morada = morada;
+    }
+}

/impl/gen/java/pt/estgp/estgweb/domain/SessionObjectId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Mar/2008 12:41:21 by Hibernate Tools 3.2.0.b9
// Generated 4/Abr/2008 15:49:07 by Hibernate Tools 3.2.0.b9

 /impl/gen/java/pt/estgp/estgweb/domain/Announcement.java
 ,5 → 1,5
 package pt.estgp.estgweb.domain;
-// Generated 28/Mar/2008 12:41:21 by Hibernate Tools 3.2.0.b9
+// Generated 4/Abr/2008 15:49:07 by Hibernate Tools 3.2.0.b9
 import java.util.Date;
 ,6 → 16,7
      private Date startDate;
      private Date expireDate;
      private String title;
+     private String choosedOwnerRole;
      private String text;
      private String targetRoles;
      private String type;
 ,11 → 30,12
     public Announcement() {
     }
-    public Announcement(Date saveDate, Date startDate, Date expireDate, String title, String text, String targetRoles, String type, String url, boolean status, Integer counter, Image bigImage, Image smallImage, GenericUser owner) {
+    public Announcement(Date saveDate, Date startDate, Date expireDate, String title, String choosedOwnerRole, String text, String targetRoles, String type, String url, boolean status, Integer counter, Image bigImage, Image smallImage, GenericUser owner) {
        this.saveDate = saveDate;
        this.startDate = startDate;
        this.expireDate = expireDate;
        this.title = title;
+       this.choosedOwnerRole = choosedOwnerRole;
        this.text = text;
        this.targetRoles = targetRoles;
        this.type = type;
 ,6 → 89,13
     public void setTitle(String title) {
         this.title = title;
     }
+    public String getChoosedOwnerRole() {
+        return this.choosedOwnerRole;
+    }
+    public void setChoosedOwnerRole(String choosedOwnerRole) {
+        this.choosedOwnerRole = choosedOwnerRole;
+    }
     public String getText() {
         return this.text;
     }

/impl/gen/java/pt/estgp/estgweb/domain/UrlStatDay.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Mar/2008 12:41:21 by Hibernate Tools 3.2.0.b9
// Generated 4/Abr/2008 15:49:07 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/UrlStatYearId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Mar/2008 12:41:21 by Hibernate Tools 3.2.0.b9
// Generated 4/Abr/2008 15:49:07 by Hibernate Tools 3.2.0.b9

/impl/gen/java/pt/estgp/estgweb/domain/Group.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Mar/2008 12:41:21 by Hibernate Tools 3.2.0.b9
// Generated 4/Abr/2008 15:49:07 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/CourseUserAssociation.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Mar/2008 12:41:21 by Hibernate Tools 3.2.0.b9
// Generated 4/Abr/2008 15:49:07 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/UrlStat.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 28/Mar/2008 12:41:21 by Hibernate Tools 3.2.0.b9
// Generated 4/Abr/2008 15:49:07 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /impl/build.properties
 ,6 → 25,8
 tomcat.username=admin
 tomcat.password=admin
+service.url=${tomcat.url}${tomcat.context.path}
 #IF is ROOT use Nothing
 #example for ROOT:
 #        tomcat.context.path.install=/

 /impl/build.xml
 ,4 → 1,4
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <project name="estgweb" basedir="." default="help">
 ,6 → 276,9
                 <include name="**/*"/>
             </fileset>
         </copy>
+        <replace file="${build.dir.war}/js/ajax.js">
+            <replacefilter token="@server.base.url@" value="${service.url}"/>
+        </replace>
     </target>
     <target name="war" depends="build.war">

Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 35 → Rev 62