Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 552 → Rev 559

/impl/conf/language/MessageResourcesCourseUnits.properties
90,7 → 90,8
courseunit.menu.put.announcement=Colocar Anúncio
courseunit.menu.assignements=Trabalhos
courseunit.menu.blog=Blog da Unidade
courseunit.menu.presences=Presenças
courseunit.menu.files=Ficheiros
courseunit.menu.presences=Assiduidade
courseunit.menu.contents=Conteúdos
courseunit.menu.grades=Avaliação
 
/impl/conf/WEB-INF/struts/struts-courseunits.xml
47,6 → 47,7
 
<!--<action path="/user/startLoadCourseUnitFromHome" forward="page.load.courseunit.from.home"/>-->
 
<action path="/user/startLoadCourseUnitRootFromHome" forward="/user/courseUnitControllerFromHome.do?dispatch=loadRoot&amp;from=Home"/>
<action path="/user/startLoadCourseUnitContentsFromHome" forward="/user/courseUnitControllerFromHome.do?dispatch=loadContents&amp;from=Home"/>
<action path="/user/startLoadCourseUnitGradesFromHome" forward="/user/courseUnitControllerFromHome.do?dispatch=loadGrades&amp;from=Home"/>
<action path="/user/startLoadCourseUnitPresencesFromHome" forward="/user/courseUnitControllerFromHome.do?dispatch=loadPresences&amp;from=Home"/>
/impl/conf/directories/student.xml
5,7 → 5,7
/impl/conf/directories/teacher.xml
5,7 → 5,7
/impl/src/java/pt/estgp/estgweb/Globals.java
80,6 → 80,7
 
public static final boolean USE_TOP_FLASH_NEWS = ConfigProperties.getBooleanProperty("announcements.use.top.flash.news");
 
public static final String INTRANET_ROOT = ""; //e' mesmo assim
public static final String INTRANET_CONTENTS = ConfigProperties.getProperty("intranet.contents.dir");
public static final String INTRANET_GRADES = ConfigProperties.getProperty("intranet.grades.dir");
public static final String INTRANET_PRESENCES = ConfigProperties.getProperty("intranet.presences.dir");
/impl/src/java/pt/estgp/estgweb/web/controllers/courseunits/CourseUnitsController.java
692,7 → 692,9
 
ActionForward forward = new ActionForward();
forward.setName("intranetCourseUnit");
forward.setPath("/courseunitproxy/" + layout + "/ionline" + "/" + path + "/?courseUnitView.id="+ cV.getId() + "&startPath=" + cV.getPathIntranet() + "&from=" + request.getParameter("from"));
if(path.length() > 0)
path = "/" + path;
forward.setPath("/courseunitproxy/" + layout + "/ionline" + path + "/?courseUnitView.id="+ cV.getId() + "&startPath=" + cV.getPathIntranet() + "&from=" + request.getParameter("from"));
forward.setRedirect(true);
return forward;
}
715,6 → 717,17
{
return loadCourseUnitIntranet(Globals.INTRANET_CONTENTS,"courseLayoutIOnlineContents",mapping,form,request,response);
}
 
public ActionForward loadRoot(
ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
throws Throwable, ServletException
{
return loadCourseUnitIntranet(Globals.INTRANET_ROOT,"courseLayoutIOnlineContents",mapping,form,request,response);
}
 
public ActionForward loadGrades(
ActionMapping mapping,
ActionForm form,
/impl/src/web/css/style.css
831,7 → 831,7
 
.portalLeftAnnouncements img {
height: 133px;
width: 177px;
width: 133px;
}
 
/*PASSA PARA AQUI TUDO O QUE SEJA DE BLOCOS E VAMOS LIMPAR TUDO */
/impl/src/web/layout/footer.jsp
5,6 → 5,7
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
<%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
 
<div id="footerStructure">
<table>
29,6 → 30,25
</table>
</div>
 
 
 
<!--TUDO.estgp.pt Trafego-->
<script type="text/javascript">
 
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-19734148-6']);
_gaq.push(['_trackPageview']);
 
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
 
</script>
 
 
<baco:isNotAuthenticated>
<!--ESTGP-->
<script type="text/javascript">
 
41,9 → 61,11
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
 
</script>
</baco:isNotAuthenticated>
 
 
<baco:isAuthenticated>
<!--BACO-->
<script type="text/javascript">
 
57,4 → 79,62
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
 
</script>
</script>
</baco:isAuthenticated>
 
<baco:isAuthenticated>
<baco:hasRole role="student">
<script type="text/javascript">
 
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-19734148-3']);
_gaq.push(['_trackPageview']);
 
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
 
</script>
</baco:hasRole>
</baco:isAuthenticated>
 
 
<baco:isAuthenticated>
<baco:hasRole role="teacher">
<script type="text/javascript">
 
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-19734148-4']);
_gaq.push(['_trackPageview']);
 
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
 
</script>
</baco:hasRole>
</baco:isAuthenticated>
 
<baco:isAuthenticated>
<baco:hasNotRole role="teacher">
<baco:hasNotRole role="student">
<script type="text/javascript">
 
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-19734148-5']);
_gaq.push(['_trackPageview']);
 
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
 
</script>
</baco:hasNotRole>
</baco:hasNotRole>
</baco:isAuthenticated>
/impl/src/web/layout/webmailRedirect.jsp
New file
0,0 → 1,32
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
<title>WebMail</title>
<meta http-equiv="refresh" content="0;url=http://mail.estgp.pt/exchange/">
<jsp:include page="/layout/scripts.jsp"/>
</head>
<body class="small" marginwidth="0" marginheight="0" bgcolor="#ffffff" topmargin="0" leftmargin="0" onload="horizontal();">
<table width="100%">
<tr>
<td align="center">
<div id="body">
<div id="header">
<jsp:include page="/layout/header.jsp"/>
</div>
<table id="pageStructure">
 
<tr>
<td>
Se não for redireccionado para o WebMail clique <a href="http://mail.estgp.pt/exchange/">aqui</a>
</td>
</tr>
</table>
<div id="footer">
<jsp:include page="/layout/footer.jsp"/>
</div>
</div>
</td>
</tr>
</table>
</body>
</html>
/impl/src/web/layout/navigationTop.jsp
43,11 → 43,11
</ul>
</div>
</li>
<li class="submenu"><a href="<%=request.getContextPath() + Globals.getStartPublicLink("departamentos") + "/departamentos/departamentos.html"%>"><bean:message key="departamentos"/> </a>
<li class="submenu"><a href="#"><bean:message key="departamentos"/> </a>
<div class="shadow ">
<ul class="menu">
<li><a href="<%=request.getContextPath() + Globals.getStartPublicLink("depTD") + "/departamentos/depTD.html"%>"><bean:message key="top.menu.area.td"/> </a></li>
<li><a href="<%=request.getContextPath() + Globals.getStartPublicLink("depCESH") + "/departamentos/depCESH.html"%>"><bean:message key="top.menu.area.cesh"/> </a></li>
<li><a href="<%=request.getContextPath()%>/dir/student/departamentos/depTD/public/departamentos/depTD.html"><bean:message key="top.menu.area.td"/> </a></li>
<li><a href="<%=request.getContextPath()%>/dir/student/departamentos/depTD/public/departamentos/depCESH.html"><bean:message key="top.menu.area.cesh"/> </a></li>
</ul>
</div>
</li>
/impl/src/web/layout/navigationLeftAdmin.jsp
10,20 → 10,20
<div class="listClean">
<ul>
 
<li>
<html:link action="/Welcome">
<bean:message key="Home"/>
</html:link>
</li>
<baco:isNotAuthenticated>
 
<baco:isNotAuthenticated>
<li>
<html:link action="/Welcome">
<bean:message key="Home"/>
</html:link>
</li>
<li>
<html:link action="/StartAuthentication">
<bean:message key="authenticate"/>
</html:link>
</li>
<li>
<a href="http://mail.estgp.pt/exchange/">
<a href="<%=request.getContextPath()%>/layout/webmailRedirect.jsp">
Webmail
</a>
</li>
/impl/src/web/public/announcements/loadAnnouncement.jsp
311,11 → 311,11
</td>
</tr>
<logic:notEmpty name="Announcement" property="url">
<tr>
<td colspan="2">
URL: <html:link page="${Announcement.url}"><script type="text/javascript">document.write((""+document.location).substr(0,(""+document.location).lastIndexOf("/")));</script>${Announcement.url}</html:link>
</td>
</tr>
<%--<tr>--%>
<%--<td colspan="2">--%>
<%--URL: <html:link page="${Announcement.url}"><script type="text/javascript">document.write((""+document.location).substr(0,(""+document.location).lastIndexOf("/")));</script>${Announcement.url}</html:link>--%>
<%--</td>--%>
<%--</tr>--%>
</logic:notEmpty>
<tr>
<td colspan="2" class="pFooter">
/impl/src/web/user/courseunits/menu.jsp
97,21 → 97,20
{
%>
<li>
<html:link action="/user/startLoadCourseUnitContentsFromHome?courseUnitView.id=${CourseUnitView.id}"><bean:message key="courseunit.menu.contents"/></html:link>
<img alt="Pastas" src="<%=request.getContextPath()%>/imgs/folder.gif"><html:link action="/user/startLoadCourseUnitRootFromHome?courseUnitView.id=${CourseUnitView.id}"><bean:message key="courseunit.menu.files"/></html:link>
</li>
<li>
<html:link action="/user/startLoadCourseUnitPresencesFromHome?courseUnitView.id=${CourseUnitView.id}"><bean:message key="courseunit.menu.presences"/></html:link>
&nbsp;&nbsp; <img alt="Pastas" src="<%=request.getContextPath()%>/imgs/folder.gif"> <html:link action="/user/startLoadCourseUnitContentsFromHome?courseUnitView.id=${CourseUnitView.id}"><bean:message key="courseunit.menu.contents"/></html:link>
</li>
<li>
<html:link action="/user/startLoadCourseUnitGradesFromHome?courseUnitView.id=${CourseUnitView.id}"><bean:message key="courseunit.menu.grades"/></html:link>
&nbsp;&nbsp; <img alt="Pastas" src="<%=request.getContextPath()%>/imgs/folder.gif"> <html:link action="/user/startLoadCourseUnitPresencesFromHome?courseUnitView.id=${CourseUnitView.id}"><bean:message key="courseunit.menu.presences"/></html:link>
</li>
<li>
&nbsp;&nbsp; <img alt="Pastas" src="<%=request.getContextPath()%>/imgs/folder.gif"> <html:link action="/user/startLoadCourseUnitGradesFromHome?courseUnitView.id=${CourseUnitView.id}"><bean:message key="courseunit.menu.grades"/></html:link>
</li>
<%
}
%>
 
 
 
 
</ul>
</div>
</div>
/impl/src/web/user/home/student.jsp
52,7 → 52,8
}
%>
<html:link action="/user/startLoadCourseUnitFromHome?id=${unit.id}">${unit.name} (<%=courseCode%> - ${unit.courseName} (${unit.courseCode}))</html:link>
<html:link action="/user/startLoadCourseUnitFromHome?id=${unit.id}">${unit.name} (<%=courseCode%> - <%//${unit.courseName} (${unit.courseCode})%>) </html:link>
<html:link action="/user/startLoadCourseUnitRootFromHome?courseUnitView.id=${unit.id}"><img border="0" alt="Pastas" src="<%=request.getContextPath()%>/imgs/folder.gif"></html:link>
</li>
</logic:iterate>
</ul>
87,7 → 88,8
}
 
%>
<html:link action="/user/startLoadCourseUnitFromHome?id=${unit.id}">${unit.name} (<%=courseCode%> - ${unit.courseName} (${unit.courseCode}))</html:link>
<html:link action="/user/startLoadCourseUnitFromHome?id=${unit.id}">${unit.name} (<%=courseCode%> - <%//${unit.courseName} (${unit.courseCode})%>) </html:link>
<html:link action="/user/startLoadCourseUnitRootFromHome?courseUnitView.id=${unit.id}"><img border="0" alt="Pastas" src="<%=request.getContextPath()%>/imgs/folder.gif"></html:link>
</li>
</logic:iterate>
</ul>