From 05f69c5a27ce27a568333dadf321451a34b69d0f Mon Sep 17 00:00:00 2001
From: Fernando Pietchaki Domingues <fpd09@inf.ufpr.br>
Date: Tue, 26 Feb 2013 14:19:23 -0300
Subject: [PATCH] =?UTF-8?q?modifica=C3=A7=C3=B5es=20de=20perfumaria.=20(fo?=
=?UTF-8?q?oter=20e=20listas)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 11 +++++++++++
src/main/webapp/WEB-INF/views/footer.jspx | 2 +-
src/main/webapp/WEB-INF/views/projetoes/list.jspx | 14 +++++++-------
.../webapp/WEB-INF/views/projetoes/mylist.jspx | 7 ++++---
4 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index f2202d3..89fc388 100644
--- a/pom.xml
+++ b/pom.xml
@@ -326,6 +326,17 @@
</dependencies>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <server>local_tomcat</server>
+ <url>http://hostname:port/manager/html</url>
+ <username>user</username>
+ <password>password</password>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
diff --git a/src/main/webapp/WEB-INF/views/footer.jspx b/src/main/webapp/WEB-INF/views/footer.jspx
index 9bc1bd3..bb9998e 100644
--- a/src/main/webapp/WEB-INF/views/footer.jspx
+++ b/src/main/webapp/WEB-INF/views/footer.jspx
@@ -28,7 +28,7 @@
</span>
-->
- <util:theme/>
+<!-- <util:theme/> -->
<!--
<spring:url value="/resources/images/springsource-logo.png" var="logo"/>
diff --git a/src/main/webapp/WEB-INF/views/projetoes/list.jspx b/src/main/webapp/WEB-INF/views/projetoes/list.jspx
index de7877c..cfd3da3 100644
--- a/src/main/webapp/WEB-INF/views/projetoes/list.jspx
+++ b/src/main/webapp/WEB-INF/views/projetoes/list.jspx
@@ -4,13 +4,13 @@
<jsp:output omit-xml-declaration="yes"/>
<sec:authorize ifAnyGranted="Administrador">
<page:list id="pl_br_ufpr_c3sl_participatorio_Projeto" items="${projetoes}" z="xI7fvnW1b0tKUMMJrSKIiv3ycH0=">
- <table:table data="${projetoes}" id="l_br_ufpr_c3sl_participatorio_Projeto" path="/projetoes" z="kamtALNOBI9qFO/YY+1GYa1OhVw=">
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_pai" property="pai" z="JnX374OPNV+3oLlfOcMYu3wG024="/>
+ <table:table data="${projetoes}" id="l_br_ufpr_c3sl_participatorio_Projeto" path="/projetoes" z="kamtALNOBI9qFO/YY+1GYa1OhVw=">
+ <!-- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_pai" property="pai" z="JnX374OPNV+3oLlfOcMYu3wG024="/> -->
<table:column id="c_br_ufpr_c3sl_participatorio_Projeto_nome" property="nome" z="djZOsc2/qBPTa0C3ffNAlDEgP0U="/>
<table:column id="c_br_ufpr_c3sl_participatorio_Projeto_acao" property="acao" z="2hGM9LKsHjh5/zpeavaa+slBUkA="/>
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_outroAcao" property="outroAcao" z="KDK14ptwJLWXh4xCooeqI+wBnJk="/>
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_ministerio" property="ministerio" z="qYUkNm475DOx0s81JEz3ff7BQho="/>
<table:column id="c_br_ufpr_c3sl_participatorio_Projeto_demanda" property="demanda" z="K99mnRN9vX7sE9XtHufPcJBkBdg="/>
+ <!-- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_outroAcao" property="outroAcao" z="KDK14ptwJLWXh4xCooeqI+wBnJk="/> -->
+ <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_ministerio" property="ministerio" z="qYUkNm475DOx0s81JEz3ff7BQho="/>
</table:table>
</page:list>
</sec:authorize>
@@ -18,12 +18,12 @@
<sec:authorize ifAnyGranted="Usuario">
<page:list id="pl_br_ufpr_c3sl_participatorio_Projeto" items="${projetoes}" z="xI7fvnW1b0tKUMMJrSKIiv3ycH0=">
<table:table update="false" delete="false" data="${projetoes}" id="l_br_ufpr_c3sl_participatorio_Projeto" path="/projetoes" z="kamtALNOBI9qFO/YY+1GYa1OhVw=">
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_pai" property="pai" z="JnX374OPNV+3oLlfOcMYu3wG024="/>
+ <!-- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_pai" property="pai" z="JnX374OPNV+3oLlfOcMYu3wG024="/> -->
<table:column id="c_br_ufpr_c3sl_participatorio_Projeto_nome" property="nome" z="djZOsc2/qBPTa0C3ffNAlDEgP0U="/>
<table:column id="c_br_ufpr_c3sl_participatorio_Projeto_acao" property="acao" z="2hGM9LKsHjh5/zpeavaa+slBUkA="/>
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_outroAcao" property="outroAcao" z="KDK14ptwJLWXh4xCooeqI+wBnJk="/>
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_ministerio" property="ministerio" z="qYUkNm475DOx0s81JEz3ff7BQho="/>
<table:column id="c_br_ufpr_c3sl_participatorio_Projeto_demanda" property="demanda" z="K99mnRN9vX7sE9XtHufPcJBkBdg="/>
+ <!-- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_outroAcao" property="outroAcao" z="KDK14ptwJLWXh4xCooeqI+wBnJk="/> -->
+ <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_ministerio" property="ministerio" z="qYUkNm475DOx0s81JEz3ff7BQho="/>
</table:table>
</page:list>
</sec:authorize>
diff --git a/src/main/webapp/WEB-INF/views/projetoes/mylist.jspx b/src/main/webapp/WEB-INF/views/projetoes/mylist.jspx
index b40f16e..917565f 100644
--- a/src/main/webapp/WEB-INF/views/projetoes/mylist.jspx
+++ b/src/main/webapp/WEB-INF/views/projetoes/mylist.jspx
@@ -4,12 +4,13 @@
<jsp:output omit-xml-declaration="yes"/>
<page:list id="pl_br_ufpr_c3sl_participatorio_Projeto" items="${projetoes}" z="xI7fvnW1b0tKUMMJrSKIiv3ycH0=">
<table:table data="${projetoes}" id="l_br_ufpr_c3sl_participatorio_Projeto" path="/projetoes" z="kamtALNOBI9qFO/YY+1GYa1OhVw=">
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_pai" property="pai" z="JnX374OPNV+3oLlfOcMYu3wG024="/>
+<!-- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_pai" property="pai" z="JnX374OPNV+3oLlfOcMYu3wG024="/> -->
<table:column id="c_br_ufpr_c3sl_participatorio_Projeto_nome" property="nome" z="djZOsc2/qBPTa0C3ffNAlDEgP0U="/>
<table:column id="c_br_ufpr_c3sl_participatorio_Projeto_acao" property="acao" z="2hGM9LKsHjh5/zpeavaa+slBUkA="/>
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_outroAcao" property="outroAcao" z="KDK14ptwJLWXh4xCooeqI+wBnJk="/>
- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_ministerio" property="ministerio" z="qYUkNm475DOx0s81JEz3ff7BQho="/>
<table:column id="c_br_ufpr_c3sl_participatorio_Projeto_demanda" property="demanda" z="K99mnRN9vX7sE9XtHufPcJBkBdg="/>
+<!-- <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_outroAcao" property="outroAcao" z="KDK14ptwJLWXh4xCooeqI+wBnJk="/> -->
+ <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_ministerio" property="ministerio" z="qYUkNm475DOx0s81JEz3ff7BQho="/>
+
</table:table>
</page:list>
</div>
--
GitLab