WebSVN - bacoAlunos - Path Comparison

Ignore whitespace Rev 40 → Rev 47

/impl/conf/language/MessageResourcesAnnouncements.properties
11,11 → 11,13
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

 /impl/conf/language/MessageResources.properties
 ,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 → 213,8
 submit=Entrar
 confirm=Confirmar
 add=Adicionar
+yes=Sim
+no=Não
 #Cursos

 /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/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
 ,7 → 42,10
 user.role.16=pedagogicCouncil
 user.role.17=erasmusCouncil
 user.role.18=courseCoordinator
+user.role.19=sudentAssociation
+user.role.20=representativeCouncil
 #########################################################################
 #
 # Modules
 ,6 → 66,19
 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
 #

 /impl/src/java/jomm/dao/impl/AbstractDao.java
 ,7 → 397,8
      * 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 {
             return (Serializable) getCurrentSession().save(obj);
         }

 /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,8
     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;
 }

 /impl/src/java/pt/estgp/estgweb/domain/views/AnnouncementView.java
 ,6 → 20,7
     private long id;
     private String title;
     private String text;
+    private String choosedOwnerRole;
     private List<String> targetRoles;
     private Image bigImage;
     private Image smallImage;
 ,6 → 49,7
         this.counter =announcement.getCounter();
         this.startDate = announcement.getStartDate();
         this.expireDate = announcement.getExpireDate();
+        this.choosedOwnerRole = announcement.getChoosedOwnerRole();
     }
     public void persistViewInObject(Announcement announcement)
 ,9 → 65,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;
     }

 /impl/src/java/pt/estgp/estgweb/domain/dao/impl/AnnouncementDaoImpl.java
 ,6 → 2,7
 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 → 124,11
         for(Announcement a : as)
         {
-           // User us =new UserDaoImpl().loadByID(a.);
+            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()
     {
 ,7 → 76,13
         }
     }
+     /**
+     * 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
 ,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/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/DomainObject.java
 ,7 → 82,12
         return false;
     }
+    public String getChoosedOwnerRole()
+    {
+        return null;
+    }
     public Date getStartTime()
     {
         return MIN_DATE;

 /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
 ,6 → 22,9
 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;
 ,9 → 38,9
     private String targetPrioritiesStr;
     private Integer counter;
     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");
 ,15 → 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");
+            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");
+            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");
+            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/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,
 ,10 → 54,6
             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();
 ,10 → 116,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 → 160,7
         }
     }
+    //TODO verificar problema com com dispatch=edit
     public ActionForward edit(ActionMapping mapping,
                               ActionForm form ,
                               HttpServletRequest request,
 ,7 → 172,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/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/User.hbm.xml
File deleted
\ No newline at end of file

 /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/Announcement.hbm.xml
18,6 → 18,7
<!--<property name="bigImageId" column="bigImage" type="long"/>
<property name="smallImageId" column="smallImage" type="long"/>-->
<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" />

/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/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="username"/>

 /impl/src/web/admin/announcements/submitAnnouncement.jsp
 ,122 → 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: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>
+        <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
 ,9 → 1,9
-<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
 ,10 → 112,12
     padding-right:10px;
 }
-.block P
+.block P,.navLeftMenu h2
 {
-    background-color:#ededed;
+     background-color:#ededed;
      padding-left:10px;
+     margin:0;
 }
 .block UL
 ,6 → 177,17
 {
 color:#4d4d4d;
 }
+.navleftMenu
+{
+    width:180px;
+    padding-left:10px;
+}
+#portalMenu li.selected  a
+{
+    color:#8EC73F;
+}
 /**********************************************************************************/
 /****************************** Standard Page Template ***************************/
 ,7 → 268,7
 }
 .pageSection
-{
+{
 }
 .sectionTitle h2
 ,13 → 314,13
 .flashCenterNews
 {
-    border-top-style: dotted;
+    border-top-style: dotted;
     border-top-color:#DEDEDD;
 }
 .textNewsTop
 {
-    text-align :left;
+    text-align :left;
 }
 .textNewsCenter,.textNewsBottom
 ,7 → 338,7
   font-weight:bold;
 }
-.titleNewsCenter,.descriptionNewsCenter,.descriptionNewsBottom,.linkLeftMenu a
+.flashCenterNews a,.descriptionNewsBottom a,.linkLeftMenu a,.flashTopNews a
 {
     text-decoration:none;
 }
 ,27 → 380,28
     MARGIN: 0;
     WIDTH: 155px;
 }
-#portalMenu li.selected
-{
-    background-color: #999999;
-}
 /*********************************************************************************/
 /****************** 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
 {
 ,9 → 422,9
     PADDING-LEFT: 0;
     PADDING-BOTTOM: 0;
     MARGIN: 0;
-    PADDING-TOP: 0
+    PADDING-TOP: 0;
 }
-*****************************************************************************************/
+/*****************************************************************************************/
 /************************************** Content Structure ********************************/
 ,7 → 450,7
     border-right: #8EC73F solid 2px;
     border-top: #8EC73F solid 2px;
     border-bottom: #8EC73F solid 2px;
-}
+}
 /*****************************************************************************************/
 ,7 → 459,7
 #license UL
 {
-    COLOR: #4D4D4D;
+    COLOR: #4D4D4D;
     PADDING-RIGHT: 0;
     PADDING-LEFT: 0;
     FONT-SIZE: 12px;
 ,7 → 491,7
 /******************************** Background Color ************************************/
 /*Gray background*/
-#backOne
+#backOne
 {
     background-color:#4D4D4D;
 }
 ,7 → 715,7
 .menuTop
 {
 }
 .menu a:hover{
 ,7 → 744,7
   /*border: 0px;*/
   opacity:0.9;
   background-color: #4D4D4D;
-  width:250px;
+  width:250px;
 }
 ul.menu li a{
 ,7 → 753,7
  /* border-bottom: 0px;*/
   /*color: #4D4D4D;*/
  /* background-color: #FFFFFF;  */
-  color: #4d4d4d;
+  color: #4d4d4d;
   background-color: #CCCCCC;
   padding: 5px 10px 5px 5px;
 }
 ,4 → 808,4
 /***********************************************************************************************/
-</STYLE>

/impl/src/web/layout/layout4.jsp
13,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")
{

 /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" %>
 ,6 → 14,9
     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);
 %>
 ,12 → 36,18
                     <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">
+                                <%if (topAnnouncements <= Globals.NUMBER_ANNOUNCEMENT_TYPE_TOP_FLASH_NEWS_INDEX) {
+                                %>
                                 <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>
+                                <%
+                                  }
+                                  topAnnouncements++;
+                                %>
                             </logic:equal>
                         </logic:iterate>
                     </logic:present>
 ,6 → 64,9
         <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">
+                    <%if(centerAnnouncements<=Globals.NUMBER_ANNOUNCEMENT_TYPE_BOTTOM_FLASH_NEWS_INDEX)
+                          {
+                    %>
                     <td class="imageNewsCenter">
                         <img src="<%=request.getContextPath()%>/imgs/destaque_2_1.jpg"/>
                     </td>
 ,6 → 78,12
                             <html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load" >${item.text}</html:link>
                         </div>
                     </td>
+                    <%
+                          }
+                          else{
+                          }
+                          centerAnnouncements++;
+                     %>
                 </logic:equal>
             </logic:iterate>
         </div>
 ,17 → 94,31
             <div class="textNewsBottom">
                 <logic:iterate  id="item" name="Announcements" type="pt.estgp.estgweb.domain.views.AnnouncementView">
                     <logic:equal value="news" name="item" property="type">
+                        <%if(bottomAnnouncements<=Globals.NUMBER_ANNOUNCEMENT_TYPE_NEW_INDEX)
+                          {
+                        %>
                         <td class="imageNewsBottom">
                             <img src="<%=request.getContextPath()%>/imgs/destaque_3_3.gif"/>
                         </td>
+                        <%
+                          }
+                          else{
+                          }
+                          bottomAnnouncements++;
+                        %>
                     </logic:equal>
                 </logic:iterate>
             </div>
         </tr>
         <tr>
+            <%bottomAnnouncements=0;%>
             <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">
+                        <%
+                          if(bottomAnnouncements<=4)
+                          {
+                        %>
                         <td width="50px">
                             <div class="titleNewsBottom">
                                 <html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.title}</html:link>
 ,6 → 127,10
                                 <html:link  action="/loadAnnouncement?id=${item.id}&dispatch=load" >${item.text}</html:link>
                             </div>
                         </td>
+                        <%
+                          }
+                          bottomAnnouncements++;
+                        %>
                     </logic:equal>
                 </logic:iterate>
             </div>

 /impl/src/web/public/portals/alunos/student.jsp
 ,26 → 4,28
 <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld"  prefix="bean" %>
 <div class="portal">
     <div class="portalContent">
-        <table class="columnTable">
+        <table class="columnTable" width="100%">
             <tbody>
                 <tr>
-                    <td class="column" width="50%">
+                    <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" width="50%">
-                        <jsp:include page="informacaoAcademicaLinks.jsp"/>
-                        <jsp:include page="../blocoPortal.jsp"/>
+                    <td class="column">
                         <jsp:include page="mobilidadeLinks.jsp"/>
                         <jsp:include page="../blocoPortal.jsp"/>
                         <jsp:include page="accaoSocialLinks.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>

 /impl/src/web/public/portals/alunos/informacaoAcademicaLinks.jsp
 ,11 → 6,11
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.informacao.academica");
     String startLink = Globals.getStartLinkPortalMenu("informacaoAcademicaAlunosPortalMenu");
-    topNav.addNavPlace(startLink + "/calendarioEscolar.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.informacao.academica.calendario.escolar");
-    topNav.addNavPlace(startLink + "/licenciaturas.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.informacao.academica.licenciaturas");
-    topNav.addNavPlace(startLink + "/mestrados.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.informacao.academica.mestrados");
-    topNav.addNavPlace(startLink + "/posGraduacoes.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.informacao.academica.pos.graduacoes");
-    topNav.addNavPlace(startLink + "/cets.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.informacao.academica.cets");
-    topNav.addNavPlace(startLink + "/maiores23.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.informacao.academica.maiores.23");
-    topNav.addNavPlace(startLink + "/outrasFormacoes.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.informacao.academica.outras.formacoes");
+    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/mobilidadeLinks.jsp
 ,9 → 6,9
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.mobilidade");
     String startLink = Globals.getStartLinkPortalMenu("mobilidadeAlunosPortalMenu");
-    topNav.addNavPlace(startLink + "/alunosEstrangeirosEstg.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.mobilidade.alunos.estrangeiros");
-    topNav.addNavPlace(startLink + "/alunosEstgEstrangeiro.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.mobilidade.alunos.estg.estrangeiro");
-    topNav.addNavPlace(startLink + "/protocolosInternacionais.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.mobilidade.protocolos.internacionais");
-    topNav.addNavPlace(startLink + "/candidaturas.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.mobilidade.candidaturas");
-    topNav.addNavPlace(startLink + "/programaErasmus.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.mobilidade.programa.erasmus");
+    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/institutoPolitecnicoLinks.jsp
 ,8 → 6,8
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.instituto.politecnico");
     String startLink = Globals.getStartLinkPortalMenu("institutoPolitecnicoAlunosPortalMenu");
-    topNav.addNavPlace(startLink + "/servicosCentrais.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.instituto.politecnico.servicos.centrais");
-    topNav.addNavPlace(startLink + "/lojaAluno.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.instituto.politecnico.loja.alunos");
-    topNav.addNavPlace(startLink + "/merchandising.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.instituto.politecnico.merchandising");
-    topNav.addNavPlace(startLink + "/culturaLazer.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.instituto.politecnico.cultura.lazer");
+    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/contactosLinks.jsp
 ,11 → 6,11
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.contactos");
     String startLink = Globals.getStartLinkPortalMenu("contactosAlunosPortalMenu");
-    topNav.addNavPlace(startLink + "/contactosGeraisEstg.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.contactos.gerais.estg");
-    topNav.addNavPlace(startLink + "/areasCientificas.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.contactos.areas.cientificas");
-    topNav.addNavPlace(startLink + "/secretaria.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.contactos.secretaria");
-    topNav.addNavPlace(startLink + "/centroInformatico.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.contactos.centro.informatico");
-    topNav.addNavPlace(startLink + "/gabineteComunicacao.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.contactos.gabinete.comunicacao");
-    topNav.addNavPlace(startLink + "/reprografia.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.contactos.reprografia");
-    topNav.addNavPlace(startLink + "/docentesContactos.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.contactos.docentes");
+    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");
 %>

 /impl/src/web/public/portals/alunos/servicosLinks.jsp
 ,14 → 6,14
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.servicos.online");
     String startLink = Globals.getStartLinkPortalMenu("servicosAlunosPortalMenu");
-    topNav.addNavPlace(startLink + "/webmail.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.servicos.online.webmail");
-    topNav.addNavPlace(startLink + "/eduroam.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.servicos.online.eduroam");
-    topNav.addNavPlace(startLink + "/secretaria.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.servicos.online.secretaria");
-    topNav.addNavPlace(startLink + "/biblioteca.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.servicos.online.biblioteca.online");
-    topNav.addNavPlace(startLink + "/nZero.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.servicos.online.n.zero");
-    topNav.addNavPlace(startLink + "/academicosOnline.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.servicos.online.academicos.online");
-    topNav.addNavPlace(startLink + "/gabineteComunicacao.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.servicos.online.gabinete.comunicacao");
-    topNav.addNavPlace(startLink + "/regie.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.servicos.online.regie");
-    topNav.addNavPlace(startLink + "/centroInformatico.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.servicos.online.centro.informatico");
-    topNav.addNavPlace(startLink + "/reprografia.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.servicos.online.reprografia");
+    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/accaoSocialLinks.jsp
 ,11 → 6,11
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.accao.social");
     String startLink = Globals.getStartLinkPortalMenu("accaoSocialAlunosPortalMenu");
-    topNav.addNavPlace(startLink + "/bolsaEstudo.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.accao.social.bolsa.estudo");
-    topNav.addNavPlace(startLink + "/alimentacao.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.accao.social.alimentacao");
-    topNav.addNavPlace(startLink + "/alojamento.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.accao.social.alojamento");
-    topNav.addNavPlace(startLink + "/apoioMedico.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.accao.social.apoio.medico");
-    topNav.addNavPlace(startLink + "/desportoCultura.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.accao.social.desporto.cultura");
-    topNav.addNavPlace(startLink + "/gaap.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.accao.social.gapp");
-    topNav.addNavPlace(startLink + "/informacoes.html"+Globals.PORTAL_ROLE_VIEW_STUDENT, "portal.accao.social.informacoes");
+    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");
 %>

 /impl/src/web/public/portals/menuPortal.jsp
 ,6 → 10,7
     if(topNav.getTitle() != null)
     {
 %>
+<div class="navLeftMenu">
 <h2><%=MessageResources.getMessage(request, topNav.getTitle())%></h2>
 <%
     }
 ,4 → 56,5
             %>
         </ul>
     </div>
-</div>
+</div>
+</div>

 /impl/src/web/public/portals/Docentes/informacaoAcademicaLinks.jsp
 ,9 → 6,9
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.informacao.academica");
     String startLink = Globals.getStartLinkPortalMenu("informacaoAcademicaDocentesPortalMenu");
-    topNav.addNavPlace(startLink + "/calendarioEscolar.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.informacao.academica.calendario.escolar");
-    topNav.addNavPlace(startLink + "/licenciaturas.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.informacao.academica.licenciaturas");
-    topNav.addNavPlace(startLink + "/mestrados.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.informacao.academica.mestrados");
-    topNav.addNavPlace(startLink + "/posGraduacoes.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.informacao.academica.pos.graduacoes");
-    topNav.addNavPlace(startLink + "/cets.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.informacao.academica.cets");
+    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/mobilidadeLinks.jsp
 ,9 → 6,9
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.mobilidade");
     String startLink = Globals.getStartLinkPortalMenu("mobilidadeDocentesPortalMenu");
-    topNav.addNavPlace(startLink + "/docentesEstrangeirosEstg.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.mobilidade.docentes.estrangeiros");
-    topNav.addNavPlace(startLink + "/docentesEstgEstrangeiro.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.mobilidade.docentes.estg.estrangeiro");
-    topNav.addNavPlace(startLink + "/protocolosInternacionais.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.mobilidade.protocolos.internacionais");
-    topNav.addNavPlace(startLink + "/candidaturas.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.mobilidade.candidaturas");
-    topNav.addNavPlace(startLink + "/programaErasmus.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.mobilidade.programa.erasmus");
+    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/institutoPolitecnicoLinks.jsp
 ,8 → 6,8
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.instituto.politecnico");
     String startLink = Globals.getStartLinkPortalMenu("institutoPolitecnicoDocentesPortalMenu");
-    topNav.addNavPlace(startLink + "/servicosCentrais.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.instituto.politecnico.servicos.centrais");
-    topNav.addNavPlace(startLink + "/lojaAluno.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.instituto.politecnico.loja.alunos");
-    topNav.addNavPlace(startLink + "/merchandising.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.instituto.politecnico.merchandising");
-    topNav.addNavPlace(startLink + "/culturaLazer.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.instituto.politecnico.cultura.lazer");
+    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/contactosLinks.jsp
 ,10 → 6,10
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.contactos");
     String startLink = Globals.getStartLinkPortalMenu("contactosDocentesPortalMenu");
-    topNav.addNavPlace(startLink + "/contactosGeraisEstg.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.contactos.gerais.estg");
-    topNav.addNavPlace(startLink + "/areasCientificas.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.contactos.areas.cientificas");
-    topNav.addNavPlace(startLink + "/secretaria.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.contactos.secretaria");
-    topNav.addNavPlace(startLink + "/centroInformatico.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.contactos.centro.informatico");
-    topNav.addNavPlace(startLink + "/reprografia.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.contactos.reprografia");
-    topNav.addNavPlace(startLink + "/docentesContactos.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.contactos.docentes");
+    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
 ,14 → 6,14
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.servicos.online");
     String startLink = Globals.getStartLinkPortalMenu("servicosDocentesPortalMenu");
-    topNav.addNavPlace(startLink + "/webmail.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.servicos.online.webmail");
-    topNav.addNavPlace(startLink + "/eduroam.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.servicos.online.eduroam");
-    topNav.addNavPlace(startLink + "/secretaria.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.servicos.online.secretaria");
-    topNav.addNavPlace(startLink + "/inEstg.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.servicos.online.in.estg");
-    topNav.addNavPlace(startLink + "/biblioteca.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.servicos.online.biblioteca.online");
-    topNav.addNavPlace(startLink + "/nZero.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.servicos.online.n.zero");
-    topNav.addNavPlace(startLink + "/academicosOnline.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.servicos.online.academicos.online");
-    topNav.addNavPlace(startLink + "/portalAssiduidades.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.servicos.online.portal.assiduidade");
-    topNav.addNavPlace(startLink + "/sisgomOcorrencias.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.servicos.online.sisgom.ocorrencias");
-    topNav.addNavPlace(startLink + "/siadap.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.servicos.online.siadap");
+    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/accaoSocialLinks.jsp
 ,9 → 6,9
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.accao.social");
     String startLink = Globals.getStartLinkPortalMenu("accaoSocialDocentesPortalMenu");
-    topNav.addNavPlace(startLink + "/cantinas.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.accao.social.cantinas");
-    topNav.addNavPlace(startLink + "/residencias.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.accao.social.residencias");
-    topNav.addNavPlace(startLink + "/ementas.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.accao.social.ementas");
-    topNav.addNavPlace(startLink + "/desportoCultura.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.accao.social.desporto.cultura");
-    topNav.addNavPlace(startLink + "/apoioPsicopedagogico.html"+Globals.PORTAL_ROLE_VIEW_TEACHER, "portal.accao.social.apoio.psicopedagogico");
+    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
 ,25 → 4,27
 <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld"  prefix="bean" %>
 <div class="portal">
     <div class="portalContent">
-        <table class="columnTable">
+        <table class="columnTable" width="100%">
             <tbody>
                 <tr>
-                    <td class="column" width="50%">
-                        <jsp:include page="servicosLinks.jsp"/>
+                    <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"/>
-                        <jsp:include page="informacaoAcademicaLinks.jsp"/>
-                        <jsp:include page="../blocoPortal.jsp"/>
                     </td>
-                    <td class="column" width="50%">
+                    <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"/>
-                        <jsp:include page="institutoPolitecnicoLinks.jsp"/>
+                    </td>
+                    <td class="column">
+                        <jsp:include page="servicosLinks.jsp"/>
                         <jsp:include page="../blocoPortal.jsp"/>
                     </td>
                 </tr>

 /impl/src/web/public/portals/antigosAlunos/oldStudent.jsp
 ,22 → 4,24
 <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld"  prefix="bean" %>
 <div class="portal">
     <div class="portalContent">
-        <table class="columnTable">
+        <table class="columnTable" width="100%">
             <tbody>
                 <tr>
-                    <td class="column" width="50%">
+                    <td class="column">
                         <jsp:include page="estgLinks.jsp"/>
                         <jsp:include page="../blocoPortal.jsp"/>
                         <jsp:include page="servicosLinks.jsp"/>
                         <jsp:include page="../blocoPortal.jsp"/>
-                        <jsp:include page="actividadesLinks.jsp"/>
-                        <jsp:include page="../blocoPortal.jsp"/>
                     </td>
-                    <td class="column" width="50%">
+                    <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>

 /impl/src/web/public/portals/antigosAlunos/institutoPolitecnicoLinks.jsp
 ,8 → 6,8
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.instituto.politecnico");
     String startLink = Globals.getStartLinkPortalMenu("institutoPolitecnicoAntigosAlunosPortalMenu");
-    topNav.addNavPlace(startLink + "/servicosCentrais.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.instituto.politecnico.servicos.centrais");
-    topNav.addNavPlace(startLink + "/lojaAluno.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.instituto.politecnico.loja.alunos");
-    topNav.addNavPlace(startLink + "/merchandising.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.instituto.politecnico.merchandising");
-    topNav.addNavPlace(startLink + "/culturaLazer.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.instituto.politecnico.cultura.lazer");
+    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/contactosLinks.jsp
 ,9 → 6,9
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.contactos");
     String startLink = Globals.getStartLinkPortalMenu("contactosAntigosAlunosPortalMenu");
-    topNav.addNavPlace(startLink + "/contactosGeraisEstg.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.contactos.gerais.estg");
-    topNav.addNavPlace(startLink + "/conselhoDirectivo.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.contactos.conselho.directivo");
-    topNav.addNavPlace(startLink + "/secretaria.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.contactos.secretaria");
-    topNav.addNavPlace(startLink + "/docentesContactos.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.contactos.docentes");
-    topNav.addNavPlace(startLink + "/aaaipp.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.contactos.aaaipp");
+    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
 ,9 → 6,9
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.servicos.online");
     String startLink = Globals.getStartLinkPortalMenu("servicoAntigosAlunosPortalMenu");
-    topNav.addNavPlace(startLink + "/webmail.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.servicos.online.webmail");
-    topNav.addNavPlace(startLink + "/eduroam.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.servicos.online.eduroam");
-    topNav.addNavPlace(startLink + "/secretaria.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.servicos.online.secretaria");
-    topNav.addNavPlace(startLink + "/biblioteca.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.servicos.online.biblioteca.online");
-    topNav.addNavPlace(startLink + "/nZero.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.servicos.online.n.zero");
+    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/estgLinks.jsp
 ,13 → 6,13
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.estg");
     String startLink = Globals.getStartLinkPortalMenu("estgAntigosAlunosPortalMenu");
-    topNav.addNavPlace(startLink + "/mensagemPresidente.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.estg.mensagem.presidente");
-    topNav.addNavPlace(startLink + "/comoChegarEstg.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.estg.como.chegar.estg");
+    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 + "/nossoPassado.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.estg.nosso.passado");
-    topNav.addNavPlace(startLink + "/presente.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.estg.presente");
-    topNav.addNavPlace(startLink + "/areasCientificas.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.estg.areas.cientificas");
+    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 + "/edificio.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.estg.edificio");
+    topNav.addNavPlace(startLink + "/estgEdificio.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.estg.edificio");
 %>

 /impl/src/web/public/portals/antigosAlunos/formacaoPosGraduadaLinks.jsp
 ,8 → 6,8
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.formacao.pos.graduada");
     String startLink = Globals.getStartLinkPortalMenu("formacaoPosGraduadaAntigosAlunosPortalMenu");
-    topNav.addNavPlace(startLink + "/mestrados.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.informacao.academica.mestrados");
-    topNav.addNavPlace(startLink + "/posGraduacoes.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.informacao.academica.pos.graduacoes");
-    topNav.addNavPlace(startLink + "/cets.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.informacao.academica.cets");
-    topNav.addNavPlace(startLink + "/outrasFormacoes.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.informacao.academica.outras.formacoes");
+    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/actividadesLinks.jsp
 ,8 → 6,8
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.actividades");
     String startLink = Globals.getStartLinkPortalMenu("actividadesAntigosAlunosPortalMenu");
-    topNav.addNavPlace(startLink + "/semanaEngenharia.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.actividades.semana.engenharia");
-    topNav.addNavPlace(startLink + "/jornadasCienciasEmpresariais.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.actividades.jornadas.ciencias.empresariais");
-    topNav.addNavPlace(startLink + "/seminarioDesign.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.actividades.Seminario.design");
-    topNav.addNavPlace(startLink + "/outrasActividades.html"+Globals.PORTAL_ROLE_VIEW_OLD_STUDENT, "portal.actividades.outras.actividades");
+    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/futurosAlunos/informacaoAcademicaLinks.jsp
 ,11 → 6,11
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.informacao.academica");
     String startLink = Globals.getStartLinkPortalMenu("informacaoAcademicaFuturosAlunosPortalMenu");
-    topNav.addNavPlace(startLink + "/calendarioEscolar.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.informacao.academica.calendario.escolar");
-    topNav.addNavPlace(startLink + "/licenciaturas.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.informacao.academica.licenciaturas");
-    topNav.addNavPlace(startLink + "/mestrados.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.informacao.academica.mestrados");
-    topNav.addNavPlace(startLink + "/posGraduacoes.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.informacao.academica.pos.graduacoes");
-    topNav.addNavPlace(startLink + "/cets.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.informacao.academica.cets");
-    topNav.addNavPlace(startLink + "/maiores23.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.informacao.academica.maiores.23");
-    topNav.addNavPlace(startLink + "/outrasFormacoes.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.informacao.academica.outras.formacoes");
+    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/mobilidadeLinks.jsp
 ,9 → 6,9
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.mobilidade");
     String startLink = Globals.getStartLinkPortalMenu("mobilidadeFuturosAlunosPortalMenu");
-    topNav.addNavPlace(startLink + "/alunosEstrangeirosEstg.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.mobilidade.alunos.estrangeiros");
-    topNav.addNavPlace(startLink + "/alunosEstgEstrangeiro.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.mobilidade.alunos.estg.estrangeiro");
-    topNav.addNavPlace(startLink + "/protocolosInternacionais.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.mobilidade.protocolos.internacionais");
-    topNav.addNavPlace(startLink + "/candidaturas.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.mobilidade.candidaturas");
-    topNav.addNavPlace(startLink + "/programaErasmus.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.mobilidade.programa.erasmus");
+    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/institutoPolitecnicoLinks.jsp
 ,8 → 6,8
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.instituto.politecnico");
     String startLink = Globals.getStartLinkPortalMenu("institutoPolitecnicoFuturosAlunosPortalMenu");
-    topNav.addNavPlace(startLink + "/servicosCentrais.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.instituto.politecnico.servicos.centrais");
-    topNav.addNavPlace(startLink + "/lojaAluno.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.instituto.politecnico.loja.alunos");
-    topNav.addNavPlace(startLink + "/merchandising.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.instituto.politecnico.merchandising");
-    topNav.addNavPlace(startLink + "/culturaLazer.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.instituto.politecnico.cultura.lazer");
+    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/servicosLinks.jsp
 ,14 → 6,14
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.servicos.online");
     String startLink = Globals.getStartLinkPortalMenu("servicosFuturosAlunosPortalMenu");
-    topNav.addNavPlace(startLink + "/webmail.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.servicos.online.webmail");
-    topNav.addNavPlace(startLink + "/eduroam.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.servicos.online.eduroam");
-    topNav.addNavPlace(startLink + "/secretaria.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.servicos.online.secretaria");
-    topNav.addNavPlace(startLink + "/biblioteca.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.servicos.online.biblioteca.online");
-    topNav.addNavPlace(startLink + "/nZero.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.servicos.online.n.zero");
-    topNav.addNavPlace(startLink + "/academicosOnline.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.servicos.online.academicos.online");
-    topNav.addNavPlace(startLink + "/gabineteComunicacao.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.servicos.online.gabinete.comunicacao");
-    topNav.addNavPlace(startLink + "/regie.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.servicos.online.regie");
-    topNav.addNavPlace(startLink + "/centroInformatico.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.servicos.online.centro.informatico");
-    topNav.addNavPlace(startLink + "/reprografia.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.servicos.online.reprografia");
+    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
 ,11 → 6,11
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.contactos");
     String startLink = Globals.getStartLinkPortalMenu("contactosFuturosAlunosPortalMenu");
-    topNav.addNavPlace(startLink + "/contactosGeraisEstg.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.contactos.gerais.estg");
-    topNav.addNavPlace(startLink + "/areasCientificas.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.contactos.areas.cientificas");
-    topNav.addNavPlace(startLink + "/secretaria.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.contactos.secretaria");
-    topNav.addNavPlace(startLink + "/centroInformatico.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.contactos.centro.informatico");
-    topNav.addNavPlace(startLink + "/gabineteComunicacao.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.contactos.gabinete.comunicacao");
-    topNav.addNavPlace(startLink + "/reprografia.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.contactos.reprografia");
-    topNav.addNavPlace(startLink + "/docentesContactos.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.contactos.docentes");
+    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/accaoSocialLinks.jsp
 ,11 → 6,11
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.accao.social");
     String startLink = Globals.getStartLinkPortalMenu("accaoSocialFuturosAlunosPortalMenu");
-    topNav.addNavPlace(startLink + "/bolsaEstudo.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.accao.social.bolsa.estudo");
-    topNav.addNavPlace(startLink + "/alimentacao.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.accao.social.alimentacao");
-    topNav.addNavPlace(startLink + "/alojamento.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.accao.social.alojamento");
-    topNav.addNavPlace(startLink + "/apoioMedico.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.accao.social.apoio.medico");
-    topNav.addNavPlace(startLink + "/desportoCultura.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.accao.social.desporto.cultura");
-    topNav.addNavPlace(startLink + "/gaap.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.accao.social.gapp");
-    topNav.addNavPlace(startLink + "/informacoes.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.accao.social.informacoes");
+    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
 ,13 → 6,13
     TopNav topNav = NavPlaceServer.getInstance().createPortalMenuPlacesKey(request);
     topNav.setTitle("portal.estg");
     String startLink = Globals.getStartLinkPortalMenu("estgFuturosAlunosPortalMenu");
-    topNav.addNavPlace(startLink + "/mensagemPresidente.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.estg.mensagem.presidente");
-    topNav.addNavPlace(startLink + "/comoChegarEstg.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.estg.como.chegar.estg");
+    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 + "/nossoPassado.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.estg.nosso.passado");
-    topNav.addNavPlace(startLink + "/presente.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.estg.presente");
-    topNav.addNavPlace(startLink + "/areasCientificas.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.estg.areas.cientificas");
+    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 + "/edificio.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.estg.edificio");
+    topNav.addNavPlace(startLink + "/estgEdificio.html"+Globals.PORTAL_ROLE_VIEW_FUTURE_STUDENT, "portal.estg.edificio");
 %>

 /impl/src/web/public/portals/futurosAlunos/futureStudent.jsp
 ,28 → 4,32
 <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld"  prefix="bean" %>
 <div class="portal">
     <div class="portalContent">
-        <table class="columnTable">
+        <table class="columnTable" width="100%">
             <tbody>
                 <tr>
-                    <td class="column" width="50%">
+                    <td class="column">
                         <jsp:include page="estgLinks.jsp"/>
                         <jsp:include page="../blocoPortal.jsp"/>
-                        <jsp:include page="servicosLinks.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" width="50%">
-                        <jsp:include page="informacaoAcademicaLinks.jsp"/>
+                    <td class="column">
+                        <jsp:include page="servicosLinks.jsp"/>
                         <jsp:include page="../blocoPortal.jsp"/>
                         <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>
                 </tr>
             </tbody>

 /impl/src/web/public/announcements/announcementsPortalLeft.jsp
 ,9 → 1,7
 <%--
-  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" %>
 ,7 → 17,7
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%
     IServiceManager sm = ServiceManager.getInstance();
-    String[] names = new String[]{};
+    String[] names = new String[]{};
     Object[] args = new Object[]{request.getParameter("role"), Globals.ANNOUNCEMENT_TYPE_BOTTOM_FLASH_NEWS};
     List<AnnouncementView> announcementViews = (List<AnnouncementView>) sm.execute(RequestUtils.getRequester(request), "LoadRoleTypeMaxAnnouncements", args, names);
     request.setAttribute("Announcements", announcementViews);
 ,29 → 25,30
 <div class="portalLeftAnnouncements">
     <table>
-        <tr>
-            <logic:present name="Announcements">
-                <logic:iterate id="item" name="Announcements" type="pt.estgp.estgweb.domain.views.AnnouncementView">
+        <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">
-                           <img src="<%=request.getContextPath()%>/imgs/destaque_2_1.jpg"/>
+                        <div class="portalAnnouncementTop">
+                            <div class="imageAnnouncementTop">
+                                <img src="<%=request.getContextPath()%>/imgs/destaque_2_1.jpg"/>
+                            </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.text}</html:link></div>
+                                </logic:empty>
+                                <logic:notEmpty name="item" property="url">
+                                    <div class="portalAnnouncementTitle"><html:link href="${item.url}">${item.title}</html:link></div>
+                                    <div class="portalAnnouncementText"><html:link href="${item.url}">${item.text}</html:link></div>
+                                </logic:notEmpty>
+                            </div>
                         </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.text}</html:link></div>
-                            </logic:empty>
-                            <logic:notEmpty name="item" property="url">
-                                 <div class="portalAnnouncementTitle"><html:link href="${item.url}">${item.title}</html:link></div>
-                                 <div class="portalAnnouncementText"><html:link href="${item.url}">${item.text}</html:link></div>
-                            </logic:notEmpty>
-                        </div>
-                    </div>
                     </td>
-                </logic:iterate>
-            </logic:present>
-        </tr>
+                </tr>
+            </logic:iterate>
+        </logic:present>
     </table>
 </div>

 /impl/src/web/public/announcements/announcementsPortalRight.jsp
 ,13 → 13,7
 <%@ 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" %>
 ,30 → 28,32
 <div class="portalRightAnnouncements">
     <table>
-        <tr>
-            <logic:present name="Announcements">
-                <logic:iterate id="item" name="Announcements" type="pt.estgp.estgweb.domain.views.AnnouncementView">
+        <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">
-                                        <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.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.text}</html:link></div>
                                 </logic:empty>
                                 <logic:notEmpty name="item" property="url">
-                                        <div class="portalAnnouncementTitle"><html:link href="${item.url}">${item.title}</html:link></div>
-                                        <div class="portalAnnouncementText"><html:link href="${item.url}">${item.text}</html:link></div>
+                                    <div class="portalAnnouncementTitle"><html:link href="${item.url}">${item.title}</html:link></div>
+                                    <div class="portalAnnouncementText"><html:link href="${item.url}">${item.text}</html:link></div>
                                 </logic:notEmpty>
                             </div>
                         </div>
                     </td>
-                </logic:iterate>
-            </logic:present>
-        </tr>
+                </tr>
+            </logic:iterate>
+        </logic:present>
     </table>
 </div>

/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 3/Abr/2008 12:06:01 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 3/Abr/2008 12:06:01 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 3/Abr/2008 12:06:01 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 3/Abr/2008 12:06:01 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/GenericUser.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 3/Abr/2008 12:06:01 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/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 3/Abr/2008 12:06:01 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 3/Abr/2008 12:06:01 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 3/Abr/2008 12:06:01 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 3/Abr/2008 12:06:01 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/Image.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 3/Abr/2008 12:06:01 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/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 3/Abr/2008 12:06:01 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 3/Abr/2008 12:06:01 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/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 3/Abr/2008 12:06:01 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/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 3/Abr/2008 12:06:01 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 3/Abr/2008 12:06:01 by Hibernate Tools 3.2.0.b9

/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 3/Abr/2008 12:06:01 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 3/Abr/2008 12:06:01 by Hibernate Tools 3.2.0.b9


import java.util.Date;

Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 40 → Rev 47