Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 219 → Rev 221

/impl/conf/language/MessageResourcesIntranet.properties
19,6 → 19,7
intranet.separator.profile=Perfil
intranet.separator.welcome.home=< Voltar ao Portal de Abertura
intranet.separator.ionline=Navegar no IOnline
intranet.separator.utils=Utilitários
 
 
intranet.my.blog.posts=Os Meus Posts
/impl/conf/language/MessageResourcesProfile.properties
18,6 → 18,7
 
profile.academic.degree.notset=Não definido
profile.academic.degree=Grau Académico
 
profile.academic.degree.Bac=Bacharel
profile.academic.degree.Lic=Licenciado
profile.academic.degree.Mas=Mestre
/impl/conf/language/MessageResourcesCourseUnits.properties
94,6 → 94,7
 
 
 
courseunits.units.warning=Caro {0}, caso alguma das unidades curriculares lhe esteja indevidamente atribuida por favor dirija-se ao Centro Informático para que a situação seja corrijida.
 
 
 
/impl/conf/WEB-INF/struts/tiles-intranet.xml
34,5 → 34,11
<put name="separator" value="5" type="string"/>
<put name="body" value="/user/ftpclient/ftpclient.jsp"/>
</definition>
 
<definition name="page.layoutIntranetUtils.proxy" extends="base.separators">
<put name="separator" value="6" type="string"/>
<put name="left" value="/user/utils/menu.jsp"/>
<put name="body" value="/WebProxy"/>
</definition>
</tiles-definitions>
/impl/conf/WEB-INF/struts/struts-default.xml
102,6 → 102,8
<forward name="layout4.ftp" path="page.layout4.proxy.ftp"/>
<forward name="layoutCourses.ftp" path="page.layoutCourses.proxy.ftp"/>
<forward name="layoutIOnline.ftp" path="page.layoutIOnline.proxy.ftp"/>
 
<forward name="layoutIntranetUtils" path="page.layoutIntranetUtils.proxy"/>
</action>
 
<!--Portal Forward-->
/impl/conf/app.properties
7,6 → 7,7
site.url=@site.url@
 
 
email.local.suffix=estgp.pt
email.server=mail.estgp.pt
email.user=
email.password=
/impl/src/java/pt/estgp/estgweb/Globals.java
47,7 → 47,9
 
public static final String STUDENT_ROLE = ConfigProperties.getProperty("user.student");
public static final String TEACHER_ROLE = ConfigProperties.getProperty("user.teacher");
public static final String EMAIL_LOCAL_SUFFIX = ConfigProperties.getProperty("email.local.suffix");
 
 
public static final String COURSE_COORDINATOR_ROLE = ConfigProperties.getProperty("user.courseCoordinator");
public static final String COURSE_DIRECTOR_ROLE = ConfigProperties.getProperty("user.courseDirector");
 
/impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportTeachersService.java
89,6 → 89,12
{
t.setName(d.getNomeFuncionarioInt());
t.setEmail(d.getEmail());
if(d.getEmail() != null && d.getEmail().endsWith(Globals.EMAIL_LOCAL_SUFFIX))
{
int atIndex = d.getEmail().indexOf("@");
if(atIndex > 0)
t.setUsername(d.getEmail().substring(0,atIndex));
}
t.setSigesCode(d.getCodigoFuncionario().intValue());
t.setAddress(d.getMorada());
t.setZip("" + d.getCodigoPostal().intValue());
/impl/src/java/pt/estgp/estgweb/domain/views/UserView.java
248,6 → 248,10
{
user.setPassword(BytesUtils.getDigestMD5Hex(password));
}
if(user instanceof Teacher)
{
((Teacher)user).setAcademicDegree(academicDegree);
}
}
 
public Class getReferenceClass()
/impl/src/web/layout/separators.jsp
25,6 → 25,7
String sep3 = "";
String sep4 = "";
String sep5 = "";
String sep6 = "";
 
String link0 = "href=\"" + request.getContextPath() + "/Welcome.do\"";
String link1 = "href=\"" + request.getContextPath() + "/user/startHome.do\"";
32,6 → 33,7
String link3 = "href=\"" + request.getContextPath() + "/user/startProfile.do\"";
String link4 = "href=\"" + request.getContextPath() + "/user/startServiceZone.do\"";
String link5 = "href=\"" + request.getContextPath() + "/proxy/layoutIOnline/ionline/\"";
String link6 = "href=\"" + request.getContextPath() + "/proxy/layoutIntranetUtils/estgp/intranet/index.html\"";
 
if(sep == 0)
{
63,6 → 65,11
link5 = "";
sep5 ="class=\"selected\"";
}
else if(sep == 6)
{
link6 = "";
sep6 ="class=\"selected\"";
}
 
 
 
74,5 → 81,6
<li <%=sep3%>><a <%=link3%>><span><bean:message key="intranet.separator.profile"/></span></a></li>
<li <%=sep4%>><a <%=link4%>><span><bean:message key="intranet.separator.service.zone"/></span></a></li>
<li <%=sep5%>><a <%=link5%>><span><bean:message key="intranet.separator.ionline"/></span></a></li>
<li <%=sep6%>><a <%=link6%>><span><bean:message key="intranet.separator.utils"/></span></a></li>
</ul>
</div>
/impl/src/web/user/utils/menu.jsp
New file
0,0 → 1,31
<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %>
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<div class="linkMenuBlock">
<div class="linkMenuBlockTitle"><bean:message key="intranet.separator.utils"/></div>
<div class="linkLeftMenu">
<div class="listClean">
<ul>
<li>
<a href="/proxy/layoutIntranetUtils/estgp/intranet/index.html">Estrutura Organizativa</a>
</li>
<li>
<a href="/proxy/layoutIntranetUtils/estgp/intranet/index.html">Secretaria</a>
</li>
<li>
<a href="/proxy/layoutIntranetUtils/estgp/intranet/index.html">Ensino</a>
</li>
<li>
<a href="/proxy/layoutIntranetUtils/estgp/intranet/index.html">Horários</a>
</li>
<li>
<a href="/proxy/layoutIntranetUtils/estgp/intranet/index.html">Declaração de Bolonha</a>
</li>
</ul>
</div>
</div>
</div>
/impl/src/web/user/utils/utils.jsp
New file
0,0 → 1,9
<%--
Created by IntelliJ IDEA.
User: Jorge
Date: 9/Jul/2008
Time: 0:48:29
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
Utils
/impl/src/web/user/home/student.jsp
26,6 → 26,9
</logic:notEmpty>
</logic:present>
</ul>
<p>
<bean:message key="courseunits.units.warning" arg0="${UserSession.user.name}"/>
</p>
</div>
</td>
</baco:isModuleOn>
/impl/src/web/user/home/topnavCourseUnitStudent.jsp
9,6 → 9,6
topNav.addNavPlace(null, "course",CourseUnitView.getCourseName());
topNav.addNavPlace("/user/startLoadCourseUnitFromHome.do?courseUnitView.id=" + CourseUnitView.getId(), "courseunit",CourseUnitView.getName());
topNav.addNavPlace("/user/startLoadCourseUnitStudentsFromHome.do?courseUnitView.id=" + CourseUnitView.getId() ,"courseunit.students");
topNav.addNavPlace(null, "courseunit.teachers");
topNav.addNavPlace(null, "student");
%>
<jsp:include page="/layout/topnav.jsp"/>
/impl/src/web/user/home/teacher.jsp
26,6 → 26,9
</logic:notEmpty>
</logic:present>
</ul>
<p>
<bean:message key="courseunits.units.warning" arg0="${UserSession.user.name}"/>
</p>
</div>
</td>
</baco:isModuleOn>