diff --git a/src/main/webapp/WEB-INF/views/projetoes/list.jspx b/src/main/webapp/WEB-INF/views/projetoes/list.jspx index cfd3da3684d3ada29dc866aed4185fdbc50c831b..493feb11ce441754b9f69a0621f82f23e72ebe22 100644 --- a/src/main/webapp/WEB-INF/views/projetoes/list.jspx +++ b/src/main/webapp/WEB-INF/views/projetoes/list.jspx @@ -1,30 +1,29 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:sec="http://www.springframework.org/security/tags" version="2.0"> +<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:sec="http://www.springframework.org/security/tags" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0"> <jsp:directive.page contentType="text/html;charset=UTF-8"/> <jsp:output omit-xml-declaration="yes"/> <sec:authorize ifAnyGranted="Administrador"> - <page:list id="pl_br_ufpr_c3sl_participatorio_Projeto" items="${projetoes}" z="xI7fvnW1b0tKUMMJrSKIiv3ycH0="> + <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_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_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> + <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_demanda" property="demanda" z="K99mnRN9vX7sE9XtHufPcJBkBdg="/> + <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_ministerio" property="ministerio" z="qYUkNm475DOx0s81JEz3ff7BQho="/> + <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_pai" property="pai" render="false" z="user-managed"/> + <table:column id="c_br_ufpr_c3sl_participatorio_Projeto_outroAcao" property="outroAcao" render="false" z="user-managed"/> + </table:table> + </page:list> </sec:authorize> - <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_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_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> + <page:list id="pl_br_ufpr_c3sl_participatorio_Projeto" items="${projetoes}" z="xI7fvnW1b0tKUMMJrSKIiv3ycH0="> + <table:table data="${projetoes}" delete="false" id="l_br_ufpr_c3sl_participatorio_Projeto" path="/projetoes" update="false" 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_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> </div> diff --git a/src/main/webapp/WEB-INF/views/usuarios/list.jspx b/src/main/webapp/WEB-INF/views/usuarios/list.jspx index b4775319030648671dac4b286a9f2fe7fccaf391..f79e40bd93dbac71ab65db53680314e0d3e2396d 100644 --- a/src/main/webapp/WEB-INF/views/usuarios/list.jspx +++ b/src/main/webapp/WEB-INF/views/usuarios/list.jspx @@ -6,7 +6,7 @@ <table:table data="${usuarios}" id="l_br_ufpr_c3sl_participatorio_Usuario" path="/usuarios" z="4KD+DpfpaUKw7v7AuJ9hyTeAcY0="> <table:column id="c_br_ufpr_c3sl_participatorio_Usuario_login" property="login" z="nli22dEVByvw7Mj3QuOVxVp5ops="/> <table:column id="c_br_ufpr_c3sl_participatorio_Usuario_permissao" property="permissao" z="GkUqCQcQVBsO9oXhUiFN/UXgZnU="/> - <table:column id="c_br_ufpr_c3sl_participatorio_Usuario_senha" property="senha" render="false" z="t3P47C4C+YwrYf41WblfdxhJIDk="/> + <table:column id="c_br_ufpr_c3sl_participatorio_Usuario_senha" property="senha" render="false" z="user-managed"/> </table:table> </page:list> </div> diff --git a/src/main/webapp/images/favicon.ico b/src/main/webapp/images/favicon.ico index c2f2b6ccdaa425cbd4acdff6e32860723ca35c87..526c2581c9502539ae8a0e0d9daa9781749539e2 100644 Binary files a/src/main/webapp/images/favicon.ico and b/src/main/webapp/images/favicon.ico differ diff --git a/src/main/webapp/images/favicon.ico.bkp b/src/main/webapp/images/favicon.ico.bkp new file mode 100644 index 0000000000000000000000000000000000000000..c2f2b6ccdaa425cbd4acdff6e32860723ca35c87 Binary files /dev/null and b/src/main/webapp/images/favicon.ico.bkp differ