r51 - in trunk/vradi-web/src/main: resources/i18n webapp/WEB-INF/jsp
Author: sletellier Date: 2011-05-25 18:58:41 +0200 (Wed, 25 May 2011) New Revision: 51 Url: http://chorem.org/repositories/revision/vradi/51 Log: - Don't use ognl - Add link to edit forms notes Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties =================================================================== --- trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-05-25 13:54:55 UTC (rev 50) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-05-25 16:58:41 UTC (rev 51) @@ -26,3 +26,4 @@ vradi.search.title=Search vradi.form.object=Object vradi.form.creationDate=Creation date +vradi.search.formNoteEdit=Notes edition \ No newline at end of file Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties =================================================================== --- trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-05-25 13:54:55 UTC (rev 50) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-05-25 16:58:41 UTC (rev 51) @@ -25,5 +25,6 @@ vradi.register.pwdDontMatch=Les mots de passe sont différents vradi.register.submit=S'enregistrer vradi.register.title=S'enregistrer +vradi.search.formNoteEdit=Edition des notes vradi.search.submit=Rechercher vradi.search.title=Recherche Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp 2011-05-25 13:54:55 UTC (rev 50) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp 2011-05-25 16:58:41 UTC (rev 51) @@ -1,11 +1,12 @@ <%@page import="org.chorem.vradi.entities.Infogene"%> +<%@page import="org.chorem.vradi.decorators.EscapeScriptColomnDecorator" %> +<%@page import="org.chorem.vradi.entities.Form" %> +<%@page import="org.chorem.vradi.decorators.DateFormatColumnDecorator" %> <%@page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="displaytag" uri="http://displaytag.sf.net"%> -<script type="text/javascript" src="/js/jquery-1.6.1.min.js"></script> -<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - xmlns:jsp="http://java.sun.com/JSP/Page"> +<html> <head> <s:url var="css" value="/css/search.css" /> <link href="${css}" rel="stylesheet" type="text/css" /> @@ -26,13 +27,18 @@ property="<%=Infogene.FIELD_INFOGENE_CREATIONDATE%>" sortable="true" sortProperty="<%=Infogene.FQ_FIELD_INFOGENE_CREATIONDATE%>" - decorator="org.chorem.vradi.decorators.DateFormatColumnDecorator"/> + decorator="<%=DateFormatColumnDecorator.class.getName()%>"/> <displaytag:column titleKey="vradi.form.object" property="<%=Infogene.FIELD_INFOGENE_OBJET%>" sortable="true" sortProperty="<%=Infogene.FQ_FIELD_INFOGENE_OBJET%>" - decorator="org.chorem.vradi.decorators.EscapeScriptColomnDecorator"/> + decorator="<%=EscapeScriptColomnDecorator.class.getName()%>"/> + + <displaytag:column titleKey="common.action" class="action"> + <s:set name="formNoteListURl"><%="formNoteList/" + ((Form)f).getWikittyId()%></s:set> + <s:a action="%{formNoteListURl}"><s:text name="vradi.search.formNoteEdit"/></s:a> + </displaytag:column> </displaytag:table> </body> </html> \ No newline at end of file
participants (1)
-
sletellier＠users.chorem.org