Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 368 → Rev 369

/impl/conf/language/MessageResources.properties
263,6 → 263,7
portal.estg.edificio=O edifício
 
 
menu.teste=Teste 2
menu.alunos=Alunos
menu.staff=Staff
menu.docentes=Docentes
/impl/conf/WEB-INF/struts/struts-default.xml
1,8 → 1,8
<?xml version="1.0" encoding="UTF-8"?>
 
<!DOCTYPE struts-config PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"
"http://struts.apache.org/dtds/struts-config_1_3.dtd">
<!--<!DOCTYPE struts-config PUBLIC-->
<!--"-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"-->
<!--"http://struts.apache.org/dtds/struts-config_1_3.dtd">-->
 
<struts-config>
 
/impl/conf/app.properties
85,10 → 85,10
ionline.pass=baco
ionline.user=Baco_web
 
server.estgp=http://localhost:8180
#server.estgp=http://localhost:8180
#estgp.encoding=ISO-8859-1
server.estgp.start.path=/static
#server.estgp=http://www.estgp.pt/testes/nova_web
server.estgp.start.path=
server.estgp=http://www.estgp.pt/testes/nova_web
estgp.encoding=UTF-8
estgp.proxy.host=
estgp.proxy.port=
369,22 → 369,9
top.image.url.2=/imgs/topStudents.jpg
 
 
#########################################################################
#
# Directories Configuration
#
# Active directories
#
 
baco.dir.1=student
baco.dir.2=futureStudent
baco.dir.3=oldStudent
baco.dir.4=teacher
 
 
 
 
 
 
 
 
/impl/conf/directories/directory.xsd
7,6 → 7,7
</xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element name="groupsDeclaration" type="groupDeclarationT" minOccurs="0"/>
<xs:element name="node" type="nodeT" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="rights" type="rightsT" minOccurs="0"/>
</xs:sequence>
/impl/conf/directories/student.xml
1,85 → 1,21
<?xml version="1.0" encoding="UTF-8"?>
<directory label="Alunos" layout="layout0" layoutRoot="layoutPortal" targetRole="student" id="student" menuKey="menu.alunos" style="style1.xsl" xmlns="http://www.estgp.pt/baco/directory/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.estgp.pt/baco/directory/ directory.xsd">
<node label="Areas" id="home">
<node label="Area A" id="area_a">
<node label="Sub Area A.1" id="area_a.1">
<groupsDeclaration>
<group>1</group>
<group>2</group>
</groupsDeclaration>
<node label="Sub Area A.1.1" id="area_a.1.1" group="1">
<leaf label="Pagina A1.1.1" id="pagina_a1.1.1" absolute="true" url="http://www.sapo.pt"/>
<leaf label="Pagina A1.1.2" id="pagina_a1.1.2" xml="true" absolute="true" url="http://dited.bn.pt/1/metadata/generated/oai_dc.xml"/>
</node>
<node label="Sub Area A.1.2" id="area_a.1.2" group="1">
<leaf label="Pagina A1.2.1" id="pagina_a1.2.1" absolute="true" url="http://www.sapo.pt"/>
<leaf label="Pagina A1.2.2" id="pagina_a1.2.2" xml="true" absolute="true" url="http://dited.bn.pt/1/metadata/generated/oai_dc.xml"/>
<leaf label="Pagina A1.2.3" id="pagina_a1.2.3" xml="true" absolute="false" layout="false" url="/public/escola.xml" proxy="estgp" style="false"/>
</node>
<node label="Sub Area A.1.3" id="area_a.1.3" group="1">
<leaf label="Pagina A1.3.1" id="pagina_a1.3.1" absolute="true" url="http://www.sapo.pt"/>
<leaf label="Pagina A1.3.2" id="pagina_a1.3.2" xml="true" absolute="true" url="http://dited.bn.pt/1/metadata/generated/oai_dc.xml"/>
<leaf label="Pagina A1.3.3" id="pagina_a1.3.3" xml="true" absolute="false" layout="false" url="/public/escola.xml" proxy="estgp" style="false"/>
</node>
<node label="Sub Area A.1.4" id="area_a.1.4" group="2">
<leaf label="Pagina A1.4.1" id="pagina_a1.4.1" absolute="true" url="http://www.sapo.pt"/>
<leaf label="Pagina A1.4.2" id="pagina_a1.4.2" xml="true" absolute="true" url="http://dited.bn.pt/1/metadata/generated/oai_dc.xml"/>
<leaf label="Pagina A1.4.3" id="pagina_a1.4.3" xml="true" absolute="false" layout="false" url="/public/escola.xml" proxy="estgp" style="false"/>
</node>
<node label="Sub Area A.1.5" id="area_a.1.5" group="2">
<leaf label="Pagina A1.5.1" id="pagina_a1.5.1" absolute="true" url="http://www.sapo.pt"/>
<leaf label="Pagina A1.5.2" id="pagina_a1.5.2" xml="true" absolute="true" url="http://dited.bn.pt/1/metadata/generated/oai_dc.xml"/>
<leaf label="Pagina A1.5.3" id="pagina_a1.5.3" xml="true" absolute="false" layout="false" url="/public/escola.xml" proxy="estgp" style="false"/>
</node>
</node>
<node label="Sub Area A.2" id="area_a.2">
<leaf label="Pagina A2.1" id="pagina_a2.1" absolute="true" url="http://www.estgp.pt"/>
<leaf label="Pagina A2.2" id="pagina_a2.2" absolute="false" proxy="estgp" url="/public/pagina.html"/>
<leaf label="Pagina A2.3" id="pagina_a2.3" absolute="true" url="http://www.estgp.pt"/>
<leaf label="Pagina A2.4" id="pagina_a2.4" absolute="false" proxy="estgp" url="/public/pagina.html"/>
<leaf label="Pagina A2.5" id="pagina_a2.5" absolute="true" url="http://www.estgp.pt"/>
<leaf label="Pagina A2.6" id="pagina_a2.6" absolute="false" proxy="estgp" url="/public/pagina.html"/>
<leaf label="Pagina A2.7" id="pagina_a2.7" absolute="true" url="http://www.estgp.pt"/>
<leaf label="Pagina A2.8" id="pagina_a2.8" absolute="false" proxy="estgp" url="/public/pagina.html"/>
<leaf label="Pagina A2.9" id="pagina_a2.9" absolute="true" url="http://www.estgp.pt"/>
<leaf label="Pagina A2.10" id="pagina_a2.10" absolute="false" proxy="estgp" url="/public/pagina.html"/>
<leaf label="Pagina A2.11" id="pagina_a2.11" absolute="true" url="http://www.estgp.pt"/>
<leaf label="Pagina A2.12" id="pagina_a2.12" absolute="false" proxy="estgp" url="/public/pagina.html"/>
<leaf label="Pagina A2.13" id="pagina_a2.13" absolute="true" url="http://www.estgp.pt"/>
<leaf label="Pagina A2.14" id="pagina_a2.14" absolute="false" proxy="estgp" url="/public/pagina.html"/>
<leaf label="Pagina A2.15" id="pagina_a2.15" absolute="true" url="http://www.estgp.pt"/>
<leaf label="Pagina A2.16" id="pagina_a2.16" absolute="false" proxy="estgp" url="/public/pagina.html"/>
</node>
</node>
<node label="Area dos Estudantes" id="area_e">
<node label="Sub Area Estudantes de ID" id="area_e.id">
<leaf label="Pagina FISR" id="pagina_fsir" absolute="false" proxy="estgp" url="/private/fsir.html">
<rights>
<role type="permit">studentsFSIR</role>
</rights>
</leaf>
<node label="Aluno" id="aluno.exemplo.id.45555">
<leaf label="Pagina HTML normal de teste" id="pagina_teste.html" xml="false" absolute="false" proxy="casaTestes" layout="true" style="true" url="/teste.html"/>
<leaf label="Pagina HTML normal de teste no Topo" id="pagina_testeTop.html" xml="false" absolute="false" proxy="casaTestes" layout="false" style="false" url="/teste.html"/>
<leaf label="Ficha XML incluida" id="ficha_trabalhoIncluido" xml="true" absolute="false" proxy="casaTestes" layout="true" style="true" url="/templates/xml/oai_dc.xml">
</leaf>
<leaf label="Ficha XML Directa" id="ficha_trabalhoDirecto" xml="true" absolute="false" proxy="casaTestes" layout="false" style="false" url="/templates/xml/oai_dc.xml">
</leaf>
<node label="Aluno Area Publica 1" id="aluno.exemplo.id.45555.public">
<leaf label="Pagina publica 1" id="aluno.pag.publica.1" absolute="false" proxy="estgp" url="/private/alunoPublic1.html"/>
</node>
</node>
<rights>
<role type="permit">studentsID</role>
</rights>
</node>
<rights>
<role type="permit">student</role>
</rights>
</node>
<groupsDeclaration>
<group>1</group>
<group>2</group>
</groupsDeclaration>
<node label="Serviços on-line" id="servicosOnLine" group="1">
<leaf absolute="false" url="/public/portal/servicosWebmail.html" proxy="estgp" id="servWebmail" label="Webmail"></leaf>
<leaf absolute="false" url="/public/portal/servicosEduroam.html" proxy="estgp" id="servEduroam" label="Eduroam"></leaf>
<leaf absolute="false" url="/public/portal/servicosSecretaria.html" proxy="estgp" id="servSecretaria" label="Secretaria"></leaf>
<leaf absolute="false" url="/public/portal/servicosBiblioteca.html" proxy="estgp" id="servvBibliotecaOnline" label="Biblioteca online"></leaf>
<leaf absolute="false" url="/public/portal/servicosAcademicosOnline.html" proxy="estgp" id="servAcademicosOnline" label="Académicos online"></leaf>
<leaf absolute="false" url="/public/portal/servicosGabineteComunicacao.html" proxy="estgp" id="servGabinetedeComunicacao" label="Gabinete de Comunicação"></leaf>
<leaf absolute="false" url="/public/portal/servicosRegie.html" proxy="estgp" id="servRegie" label="Régie"></leaf>
<leaf absolute="false" url="/public/portal/servicosCentroInformatico.html" proxy="estgp" id="servCentroInformatico" label="Centro informático"></leaf>
<leaf absolute="false" url="/public/portal/servicosReprografia.html" proxy="estgp" id="servReprografia" label="Reprografia"></leaf>
</node>
<rights>
<role type="permit">student</role>
</rights>
</directory>
<node label="Contactos" id="contactos" group="2">
<leaf absolute="false" url="/public/portal/contactosContactosGeraisEstg.html" proxy="estgp" id="contGerais" label="Contactos gerais estg"></leaf>
</node>
</directory>
/impl/conf/directories/style1.xsl
1,5 → 1,5
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" xmlns:saxon="http://saxon.sf.net/" extension-element-prefixes="saxon" xmlns:d="http://www.estgp.pt/baco/directory/" xmlns:foo="foo" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
<xsl:stylesheet xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:cmPort="http://www.cm-portalegre.pt/projectos/" version="1.0" xmlns:saxon="http://saxon.sf.net/" extension-element-prefixes="saxon" xmlns:d="http://www.estgp.pt/baco/directory/" xmlns:foo="foo" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
<xsl:import href="utils.xsl"/>
<xsl:output method="html" encoding="UTF-8" omit-xml-declaration="yes" />
19,7 → 19,37
</div>
</xsl:template>
<xsl:template match="cmPort:dadosProjecto">
<table>
<tr>
<th colspan="2">Dados de Projecto</th>
</tr>
<tr>
<th>Nome</th>
<td><xsl:value-of select="./cmPort:nome/text()"/></td>
</tr>
<tr>
<th>Data</th>
<td><xsl:value-of select="./cmPort:data/text()"/></td>
</tr>
<tr>
<th>Local</th>
<td><xsl:value-of select="./cmPort:local/text()"/></td>
</tr>
<tr>
<th>Equipa Técnica</th>
<td><xsl:value-of select="./cmPort:equipaTecnica/text()"/></td>
</tr>
<xsl:if test="./cmPort:parecer/text()">
<tr>
<th>Parecer</th>
<td><xsl:value-of select="./cmPort:parecer/text()"/></td>
</tr>
</xsl:if>
</table>
</xsl:template>
<xsl:template match="/" mode="single">
<html>
<head>
465,6 → 495,37
</xsl:if>
</xsl:template>
<xsl:template match="d:directory" mode="latNav">
<xsl:if test="./d:leaf or ./d:node">
<div class="linkMenuBlock">
<div class="linkMenuBlockTitle"><xsl:apply-templates select="." mode="label"/></div>
<div class="linkLeftMenu">
<div class="listClean">
<ul id="portalMenu">
<xsl:for-each select="./d:node">
<xsl:choose>
<xsl:when test="@id = $ACTUAL">
<li class="navPlace selected">
<xsl:apply-templates select="." mode="label"/>
</li>
</xsl:when>
<xsl:otherwise>
<li class="navPlace">
<xsl:apply-templates select="." mode="link"/>
</li>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
<xsl:for-each select="./d:leaf">
<li class="navPlace">...<xsl:apply-templates select="." mode="link"/></li>
</xsl:for-each>
</ul>
</div>
</div>
</div>
</xsl:if>
</xsl:template>
<!--
===========================================================
| Apresentar Todo o Directorio em árvore - NAO ESTA EM USO DE MOMENTO
/impl/src/java/pt/estgp/estgweb/web/DirWebProxy.java
121,7 → 121,7
response.setContentLength(con.getContentLength());
writeDirectStream(response,stream);
}
else if(xml != null && xml.equals("false"))
else if(xml == null || xml.equals("false"))
{
InputStream stream = openStream(finalURL,proxy);
String content = readContent2String(stream,encoding);
/impl/src/java/pt/estgp/estgweb/web/controllers/blogs/BlogsController.java
174,7 → 174,11
if (!errors.isEmpty())
{
saveErrors(request, errors);
BlogView bV = loadBlogView(blogForm.getBlogView().getId(), mapping, request, response);
BlogView bV;
if(blogForm.getBlogView().getId() > 0)
bV = loadBlogView(blogForm.getBlogView().getId(), mapping, request, response);
else
bV = blogForm.getBlogView();
request.setAttribute("BlogView", bV);
return mapping.findForward("submit");
}
/impl/src/doc/estgweb.eap
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/impl/src/web/layout/navigationLeftMenu.jsp
41,7 → 41,7
request.setAttribute("dir",directory);
%>
<li>
<a href="<%=request.getContextPath()%>/dir/${dir.id}?role=${dir.role}&menu=${dir.key}"><bean:message key="menu.alunos"/></a>
<a href="<%=request.getContextPath()%>/dir/${dir.id}?role=${dir.role}&menu=${dir.key}"><bean:message key="${dir.key}"/></a>
</li>
<%
}