r40 - in trunk/vradi-web/src/main: java/org/chorem/vradi/actions resources webapp/WEB-INF webapp/WEB-INF/jsp webapp/jsp
Author: bpoussin Date: 2011-05-21 17:56:19 +0200 (Sat, 21 May 2011) New Revision: 40 Url: http://chorem.org/repositories/revision/vradi/40 Log: - deplacement des jsp dans WEB-INF pour eviter qu'on y arrive sans passer par le controleur - debut d'implantation des actions et jsp pour la creation de notes pour les formulaires (aka reponse AO) Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java trunk/vradi-web/src/main/webapp/WEB-INF/jsp/ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/forgotPassword.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/login.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/register.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp Removed: trunk/vradi-web/src/main/webapp/jsp/forgotPassword.jsp trunk/vradi-web/src/main/webapp/jsp/login.jsp trunk/vradi-web/src/main/webapp/jsp/register.jsp trunk/vradi-web/src/main/webapp/jsp/search.jsp Modified: trunk/vradi-web/src/main/resources/struts.xml Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java (rev 0) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java 2011-05-21 15:56:19 UTC (rev 40) @@ -0,0 +1,110 @@ +package org.chorem.vradi.actions; + +import com.opensymphony.xwork2.ActionContext; +import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.vradi.entities.Attachment; +import org.chorem.vradi.entities.FormNote; +import org.chorem.vradi.entities.FormNoteImpl; +import org.chorem.vradi.entities.VradiUser; +import org.nuiton.jrst.JRST; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.search.Search; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class FormNoteAction extends VradiBaseAction { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(FormNoteAction.class); + + static public FormNoteAction getAction() { + return (FormNoteAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); + } + + /** used form new formNote */ + protected String formId; + /** id of formNote to display or new to create new formNote */ + protected String formNoteId; + /** formNote corresponding with id if not equals to 'new' */ + protected FormNote formNote; + /** partners for this formNote */ + protected Set<VradiUser> partners; + /** summary of this formNote in HTML format */ + protected String summary; + /** content of this formNote in HTML format */ + protected String content; + /** les fichiers attache a cette note */ + protected PagedResult<Attachment> attachments; + + public String getFormId() { + return formId; + } + + public void setFormId(String formId) { + this.formId = formId; + } + + public String getFormNoteId() { + return formNoteId; + } + + public void setFormNoteId(String formNoteId) { + this.formNoteId = formNoteId; + } + + public FormNote getFormNote() { + return formNote; + } + + public Set<VradiUser> getPartners() { + return partners; + } + + public String getSummary() { + return summary; + } + + public String getContent() { + return content; + } + + public PagedResult<Attachment> getAttachments() { + return attachments; + } + + @Override + public String execute() throws Exception { + WikittyProxy proxy = getProxy(); + formNote = proxy.restore(FormNote.class, getFormNoteId()); + if (formNote == null) { + formNote = new FormNoteImpl(); + formNote.setForm(getFormId()); + formNote.addPartners(proxy.getUser().getWikittyId()); + } + + partners = proxy.restore(VradiUser.class, formNote.getPartners()); + + // TODO evolution JRST: permettre l'entre String/StringBuffer/Reader, et la sortie String/StringBuffer/Writer pour generate +// summary = JRST.generate(JRST.TYPE_HTML, formNote.getSummary()); +// content = JRST.generate(JRST.TYPE_HTML, formNote.getContent()); + summary = formNote.getSummary(); + content = formNote.getContent(); + + Criteria criteria = Search.query() + .eq(Attachment.FQ_FIELD_ATTACHMENT_FORMNOTE, getFormNoteId()) + .criteria().addSortDescending(Attachment.FQ_FIELD_ATTACHMENT_DATE); + attachments = proxy.findAllByCriteria(Attachment.class, criteria); + + return SUCCESS; + } +} Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java (rev 0) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java 2011-05-21 15:56:19 UTC (rev 40) @@ -0,0 +1,60 @@ +package org.chorem.vradi.actions; + +import com.opensymphony.xwork2.ActionContext; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.vradi.entities.FormNote; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.entities.WikittyUser; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.search.Search; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class FormNoteListAction extends VradiBaseAction { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(FormNoteListAction.class); + + static public FormNoteListAction getAction() { + return (FormNoteListAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); + } + + protected String formId; + protected PagedResult<FormNote> formNotes; + + public String getFormId() { + return formId; + } + + public void setFormId(String formId) { + this.formId = formId; + } + + public PagedResult<FormNote> getFormNotes() { + return formNotes; + } + + @Override + public String execute() throws Exception { + WikittyProxy proxy = getProxy(); + WikittyUser user = proxy.getUser(); + log.info("current user: " + user); + + Criteria criteria = Search.query() + .eq(FormNote.FQ_FIELD_FORMNOTE_FORM, getFormId()) + .eq(FormNote.FQ_FIELD_FORMNOTE_PARTNERS, user.getWikittyId()) + .criteria().addSortAscending(FormNote.FQ_FIELD_FORMNOTE_CREATIONDATE); + + formNotes = proxy.findAllByCriteria(FormNote.class, criteria); + return SUCCESS; + } + +} Modified: trunk/vradi-web/src/main/resources/struts.xml =================================================================== --- trunk/vradi-web/src/main/resources/struts.xml 2011-05-21 15:53:43 UTC (rev 39) +++ trunk/vradi-web/src/main/resources/struts.xml 2011-05-21 15:56:19 UTC (rev 40) @@ -55,15 +55,15 @@ <package name="login" extends="loginArea"> <action name="register_*" method="{1}" class="org.chorem.vradi.actions.RegisterAction"> - <result name="input">/jsp/register.jsp</result> + <result name="input">/WEB-INF/jsp/register.jsp</result> <result type="redirectAction">search</result> </action> <action name="forgotPassword_*" method="{1}" class="org.chorem.vradi.actions.ForgotPasswordAction"> - <result name="input">/jsp/forgotPassword.jsp</result> + <result name="input">/WEB-INF/jsp/forgotPassword.jsp</result> <result type="redirectAction">login_input</result> </action> <action name="login_*" method="{1}" class="org.chorem.vradi.actions.LoginAction"> - <result name="input">/jsp/login.jsp</result> + <result name="input">/WEB-INF/jsp/login.jsp</result> <result name="login" type="redirectAction">search</result> <result type="redirectAction">search</result> </action> @@ -74,9 +74,24 @@ <package name="misc" extends="restrictedArea"> <action name="search" class="org.chorem.vradi.actions.SearchAction"> - <result>/jsp/search.jsp</result> + <result>/WEB-INF/jsp/search.jsp</result> <result name="input" type="redirectAction">search</result> </action> + <!-- + | Affiche la liste des notes attachees a un formulaire + | Permet de creer une nouvelle note + +--> + <action name="formNoteList/*" class="org.chorem.vradi.actions.FormNoteListAction"> + <param name="formId">{1}</param> + <result>/WEB-INF/jsp/formNoteList.jsp</result> + </action> + <!-- + | Affiche la note demande, si l'id n'existe pas une nouvelle note est creee + +--> + <action name="formNote/*" class="org.chorem.vradi.actions.FormNoteAction"> + <param name="formNoteId">{1}</param> + <result>/WEB-INF/jsp/formNote.jsp</result> + </action> </package> - + </struts> Copied: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/forgotPassword.jsp (from rev 34, trunk/vradi-web/src/main/webapp/jsp/forgotPassword.jsp) =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/forgotPassword.jsp (rev 0) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/forgotPassword.jsp 2011-05-21 15:56:19 UTC (rev 40) @@ -0,0 +1,24 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <head> + <title><s:text name="vradi.forgotpwd.title" /></title> + <s:head /> + </head> + <body> + <div id="content"> + <div id="formFrame fond"> + <h1><s:text name="vradi.forgotpwd.title" /></h1> + <s:form action="forgotPassword"> + <p> + <s:textfield key="vradi.login.email" name="email" labelposition="top" labelSeparator=" :" /> + <s:submit key="vradi.forgotpwd.submit" name="submit" /> + </p> + </s:form> + <s:a action="login_input" id="loginLink"><s:text name="vradi.login.title" /></s:a> + </div> + </div> + </body> +</html> Added: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp (rev 0) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-05-21 15:56:19 UTC (rev 40) @@ -0,0 +1,65 @@ +<%-- + Document : formNote + Created on : 21 mai 2011, 11:53:26 + Author : poussin +--%> + +<%@page import="org.chorem.vradi.entities.Attachment"%> +<%@page import="org.chorem.vradi.entities.FormNote"%> +<%@page import="org.chorem.vradi.actions.FormNoteAction"%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags"%> + +<% +FormNoteAction action = FormNoteAction.getAction(); +FormNote note = action.getFormNote(); +%> + +<!DOCTYPE html> +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title><s:text name="vradi.formNote.title" /></title> + </head> + <body> + <h1><s:text name="vradi.formNote.title" /></h1> + + <div> + <s:a action="formNoteEdit/<%=note.getWikittyId()%>?state=close"><s:text name="vradi.formNote.close" /></s:a> + <s:a action="delete/<%=note.getWikittyId()%>"><s:text name="vradi.delete" /></s:a> + </div> + + <div> + <% for (String h : note.getHistory()) { %> + <div><%=h%></div> + <% } %> + </div> + + <div> + <s:select list="partners"/> + <s:a action="seekPartners/<%=note.getWikittyId()%>"><s:text name="vradi.formNote.seekPartners" /></s:a> + <s:checkbox label="seeking partners" fieldValue="note.seekingPartners"/> + </div> + + <div> + <%=action.getSummary()%> + <div><s:a action="editText?id=<%=note.getWikittyId()%>&field=<%=FormNote.FQ_FIELD_FORMNOTE_SUMMARY%>" label="vradi.text.edit"/></div> + </div> + + <div> + <%=action.getContent()%> + <div><s:a action="editText?id=<%=note.getWikittyId()%>&field=<%=FormNote.FQ_FIELD_FORMNOTE_CONTENT%>" label="vradi.text.edit"/></div> + </div> + + <div> + <ul> + <% for (Attachment a : action.getAttachments()) { %> + <li><%=a.getDate()%> <%=a.getName()%> + <s:a action="" label="vradi.attachment.update"></s:a> + <s:a action="" label="vradi.attachment.history"></s:a> + <s:a action="" label="vradi.attachment.delete"></s:a></li> + <% } %> + </ul> + </div> + </body> +</html> Added: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp (rev 0) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp 2011-05-21 15:56:19 UTC (rev 40) @@ -0,0 +1,32 @@ +<%-- + Document : formNoteList + Created on : 21 mai 2011, 11:39:21 + Author : poussin +--%> + +<%@page import="org.chorem.vradi.entities.FormNote"%> +<%@page import="org.chorem.vradi.actions.FormNoteListAction"%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags"%> + +<% +FormNoteListAction action = FormNoteListAction.getAction(); +%> + +<!DOCTYPE html> +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title><s:text name="vradi.formNoteList.title" /></title> + </head> + <body> + <h1><s:text name="vradi.formNoteList.title" /></h1> + + <ul> + <% for (FormNote note : action.getFormNotes()) { %> + <li><s:a action="formNote/<%=note.getWikittyId()%>"><%=note.getCreationDate()%> <%=note.getSummary()%></s:a></li> + <% } %> + <li><s:a action="formNote/new?formId=<%=action.getFormId()%>"><s:text name="vradi.new.formNote"/></s:a></li> + </ul> + </body> +</html> Copied: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/login.jsp (from rev 34, trunk/vradi-web/src/main/webapp/jsp/login.jsp) =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/login.jsp (rev 0) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/login.jsp 2011-05-21 15:56:19 UTC (rev 40) @@ -0,0 +1,27 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags"%> + +<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <head> + <title><s:text name="vradi.login.title" /></title> + <s:head /> + </head> + <body> + <div id="content"> + <div id="formFrame" class="fond"> + <h1><s:text name="vradi.login.title" /></h1> + <br/> + <br/> + <s:actionerror /> + <s:form action="login"> + <s:textfield key="vradi.login.email" name="email" labelposition="top" labelSeparator=" :" /> + <s:password key="vradi.login.password" name="password" labelposition="top" labelSeparator=" :" /> + <s:submit key="vradi.login.submit" name="submit" /> + </s:form> + <s:a action="register_input" id="registerLink"><s:text name="vradi.register.title" /></s:a><br /> + <s:a action="forgotPassword_input" id="forgotPwd"><s:text name="vradi.forgotpwd.title" /></s:a> + </div> + </div> + </body> +</html> Copied: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/register.jsp (from rev 34, trunk/vradi-web/src/main/webapp/jsp/register.jsp) =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/register.jsp (rev 0) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/register.jsp 2011-05-21 15:56:19 UTC (rev 40) @@ -0,0 +1,27 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <head> + <title><s:text name="vradi.register.title" /></title> + <s:head /> + </head> + <body> + <div id="content"> + <div id="formFrame" class="fond"> + <h1><s:text name="vradi.register.title" /></h1> + <s:form action="register"> + <s:actionerror /> + <p> + <s:textfield key="vradi.login.email" name="email" labelposition="top" labelSeparator=" :" /> + <s:password key="vradi.login.password" name="password" labelposition="top" labelSeparator=" :" /> + <s:password key="vradi.login.repeatPassword" name="repeatPassword" labelposition="top" labelSeparator=" :" /> + <s:submit key="vradi.register.submit" name="submit" /> + </p> + </s:form> + <s:a action="login_input" id="loginLink"><s:text name="vradi.login.title" /></s:a> + </div> + </div> + </body> +</html> Copied: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp (from rev 34, trunk/vradi-web/src/main/webapp/jsp/search.jsp) =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp (rev 0) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp 2011-05-21 15:56:19 UTC (rev 40) @@ -0,0 +1,21 @@ +<%@ page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags"%> +<%@taglib prefix="displaytag" uri="http://displaytag.sf.net"%> +<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <head> + <title><s:text name="vradi.search.title" /></title> + <s:head /> + </head> + <body> + <s:form id="searchForm" action="search" method="post"> + <s:textarea id="searchArea" name="query"/> + <s:submit key="vradi.search.submit" name="submit" /> + </s:form> + <displaytag:table name="forms" id="f" requestURI="search.action"> + <displaytag:column titleKey="vradi.form.title" property="creationDate"/> + <displaytag:column titleKey="vradi.form.title" property="objet"/> + <displaytag:column titleKey="vradi.form.title" property="sourceURL"/> + </displaytag:table> + </body> +</html> \ No newline at end of file Deleted: trunk/vradi-web/src/main/webapp/jsp/forgotPassword.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/jsp/forgotPassword.jsp 2011-05-21 15:53:43 UTC (rev 39) +++ trunk/vradi-web/src/main/webapp/jsp/forgotPassword.jsp 2011-05-21 15:56:19 UTC (rev 40) @@ -1,24 +0,0 @@ -<%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="s" uri="/struts-tags" %> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - xmlns:jsp="http://java.sun.com/JSP/Page"> - <head> - <title><s:text name="vradi.forgotpwd.title" /></title> - <s:head /> - </head> - <body> - <div id="content"> - <div id="formFrame fond"> - <h1><s:text name="vradi.forgotpwd.title" /></h1> - <s:form action="forgotPassword"> - <p> - <s:textfield key="vradi.login.email" name="email" labelposition="top" labelSeparator=" :" /> - <s:submit key="vradi.forgotpwd.submit" name="submit" /> - </p> - </s:form> - <s:a action="login_input" id="loginLink"><s:text name="vradi.login.title" /></s:a> - </div> - </div> - </body> -</html> Deleted: trunk/vradi-web/src/main/webapp/jsp/login.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/jsp/login.jsp 2011-05-21 15:53:43 UTC (rev 39) +++ trunk/vradi-web/src/main/webapp/jsp/login.jsp 2011-05-21 15:56:19 UTC (rev 40) @@ -1,27 +0,0 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@taglib prefix="s" uri="/struts-tags"%> - -<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - xmlns:jsp="http://java.sun.com/JSP/Page"> - <head> - <title><s:text name="vradi.login.title" /></title> - <s:head /> - </head> - <body> - <div id="content"> - <div id="formFrame" class="fond"> - <h1><s:text name="vradi.login.title" /></h1> - <br/> - <br/> - <s:actionerror /> - <s:form action="login"> - <s:textfield key="vradi.login.email" name="email" labelposition="top" labelSeparator=" :" /> - <s:password key="vradi.login.password" name="password" labelposition="top" labelSeparator=" :" /> - <s:submit key="vradi.login.submit" name="submit" /> - </s:form> - <s:a action="register_input" id="registerLink"><s:text name="vradi.register.title" /></s:a><br /> - <s:a action="forgotPassword_input" id="forgotPwd"><s:text name="vradi.forgotpwd.title" /></s:a> - </div> - </div> - </body> -</html> Deleted: trunk/vradi-web/src/main/webapp/jsp/register.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/jsp/register.jsp 2011-05-21 15:53:43 UTC (rev 39) +++ trunk/vradi-web/src/main/webapp/jsp/register.jsp 2011-05-21 15:56:19 UTC (rev 40) @@ -1,27 +0,0 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@taglib prefix="s" uri="/struts-tags" %> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - xmlns:jsp="http://java.sun.com/JSP/Page"> - <head> - <title><s:text name="vradi.register.title" /></title> - <s:head /> - </head> - <body> - <div id="content"> - <div id="formFrame" class="fond"> - <h1><s:text name="vradi.register.title" /></h1> - <s:form action="register"> - <s:actionerror /> - <p> - <s:textfield key="vradi.login.email" name="email" labelposition="top" labelSeparator=" :" /> - <s:password key="vradi.login.password" name="password" labelposition="top" labelSeparator=" :" /> - <s:password key="vradi.login.repeatPassword" name="repeatPassword" labelposition="top" labelSeparator=" :" /> - <s:submit key="vradi.register.submit" name="submit" /> - </p> - </s:form> - <s:a action="login_input" id="loginLink"><s:text name="vradi.login.title" /></s:a> - </div> - </div> - </body> -</html> Deleted: trunk/vradi-web/src/main/webapp/jsp/search.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/jsp/search.jsp 2011-05-21 15:53:43 UTC (rev 39) +++ trunk/vradi-web/src/main/webapp/jsp/search.jsp 2011-05-21 15:56:19 UTC (rev 40) @@ -1,21 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%> -<%@taglib prefix="s" uri="/struts-tags"%> -<%@taglib prefix="displaytag" uri="http://displaytag.sf.net"%> -<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - xmlns:jsp="http://java.sun.com/JSP/Page"> - <head> - <title><s:text name="vradi.search.title" /></title> - <s:head /> - </head> - <body> - <s:form id="searchForm" action="search" method="post"> - <s:textarea id="searchArea" name="query"/> - <s:submit key="vradi.search.submit" name="submit" /> - </s:form> - <displaytag:table name="forms" id="f" requestURI="search.action"> - <displaytag:column titleKey="vradi.form.title" property="creationDate"/> - <displaytag:column titleKey="vradi.form.title" property="objet"/> - <displaytag:column titleKey="vradi.form.title" property="sourceURL"/> - </displaytag:table> - </body> -</html> \ No newline at end of file
participants (1)
-
bpoussin@users.chorem.org