Author: mfortun Date: 2011-06-06 17:28:53 +0200 (Mon, 06 Jun 2011) New Revision: 934 Url: http://nuiton.org/repositories/revision/wikitty/934 Log: * add jquery to pom * change view page: change post method to ajax query with jquery * add action to support ajax change and corresponding action jsp Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRestoreWikitty.java trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp Modified: trunk/wikitty-publication/pom.xml trunk/wikitty-publication/src/main/resources/struts.xml trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-06-06 15:22:40 UTC (rev 933) +++ trunk/wikitty-publication/pom.xml 2011-06-06 15:28:53 UTC (rev 934) @@ -7,7 +7,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <!-- ************************************************************* --> @@ -83,6 +83,11 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-plugin</artifactId> + <scope>runtime</scope> + </dependency> <dependency> <groupId>commons-fileupload</groupId> Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRestoreWikitty.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRestoreWikitty.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRestoreWikitty.java 2011-06-06 15:28:53 UTC (rev 934) @@ -0,0 +1,45 @@ +package org.nuiton.wikitty.publication.action; + +import org.nuiton.wikitty.entities.Wikitty; + +import com.opensymphony.xwork2.ActionContext; + +public class PublicationActionRestoreWikitty extends PublicationBaseAction { + + /** + * + */ + private static final long serialVersionUID = 279959059921233642L; + protected String id; + protected Wikitty wikitty; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Wikitty getWikitty() { + return wikitty; + } + + public void setWikitty(Wikitty wikitty) { + this.wikitty = wikitty; + } + + static public PublicationActionRestoreWikitty getAction() { + return (PublicationActionRestoreWikitty) ActionContext.getContext() + .get(CONTEXT_ACTION_KEY); + } + + @Override + public String execute() throws Exception { + + wikitty = getWikittyPublicationProxy().restore(id); + + return SUCCESS; + } + +} Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRestoreWikitty.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-06-06 15:22:40 UTC (rev 933) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-06-06 15:28:53 UTC (rev 934) @@ -107,4 +107,11 @@ </result> </action> </package> + + <package name="fragment" namespace="/fragment" extends="restrictedArea"> + <action name="wikittyInfo" class="org.nuiton.wikitty.publication.action.PublicationActionRestoreWikitty"> + <result>/WEB-INF/jsp/wikittyInfo.jsp</result> + </action> + </package> + </struts> Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-06-06 15:22:40 UTC (rev 933) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-06-06 15:28:53 UTC (rev 934) @@ -40,6 +40,9 @@ <%@page import="org.nuiton.wikitty.entities.Wikitty"%> <%@taglib prefix="s" uri="/struts-tags"%> +<%@taglib prefix="sj" uri="/struts-jquery-tags"%> +<sj:head jquerytheme="default"/> + <h1>Wikitty View</h1> <% @@ -49,17 +52,6 @@ PublicationActionView action = PublicationActionView .getAction(); - /* - WikittyPublicationContext context = (WikittyPublicationContext) request - .getAttribute(ActionEval.CONTEXT_VAR); - PagedResult<Wikitty> pagedResult = (PagedResult<Wikitty>) request - .getAttribute("pagedResult"); - Wikitty wikitty = (Wikitty) request - .getAttribute(ActionEval.WIKITTY_VAR); - - ActionEdit actionEdit = context.getAction(ActionEdit.class); - */ - Wikitty wikit = action.getWikittyResult(); if (wikit != null) { @@ -69,6 +61,16 @@ <% } %> +<div> + +<div id="partnersInfo"> + <img src="/img/indicator.gif" + alt="Loading..." style="display: none" /> +</div> + +</div> + + <form action="view.action" method="post"> <div> <textarea title="Search" name="searchRequest"><%=action.getSearchRequest()%></textarea> @@ -76,11 +78,13 @@ <s:textfield label="First" key="first" name="first" /> <s:textfield label="End" key="end" name="end" /> <input type="submit" name="search" value="Search" /> - <pre> + + <pre> WikittyFound: <%=action.getPagedResult().getNumFound()%></pre> + + <br/> -</pre> - <table> + <table border="1"> <tr> <td></td> <td>Wikitty Id</td> @@ -91,28 +95,48 @@ <% + int i=0; for (Wikitty w : action.getPagedResult().getAll()) { %> <tr> - <td><s:set var="wid"><%=w.getId()%></s:set> <s:set var="localContext"><%=action.getContextArgs()%></s:set> - <s:url var="urledit" action="%{#localContext}/edit/elt_id:%{#wid}" /> - <a href="${urledit}">Edit</a> <s:url var="urlraw" - action="%{#localContext}/raw/elt_id:%{#wid}" /> <a href="${urlraw}">Raw</a> - <s:url var="urleval" action="%{#localContext}/eval/elt_id:%{#wid}" /> - <a href="${urleval}">Eval</a></td> - <td><input type="submit" name="id" value="<%=w.getId()%>" title="chaussette" /> + <td><s:set var="wid"><%=w.getId()%></s:set> <s:set + var="localContext"><%=action.getContextArgs()%></s:set> <s:url + var="urledit" action="%{#localContext}/edit/elt_id:%{#wid}" /> <a + href="${urledit}">Edit</a> <s:url var="urlraw" + action="%{#localContext}/raw/elt_id:%{#wid}" /> <a + href="${urlraw}">Raw</a> <s:url var="urleval" + action="%{#localContext}/eval/elt_id:%{#wid}" /> <a + href="${urleval}">Eval</a> + <a id="ajaxlink_<%=i%>" href="javascript:void(0)">View</a> + <script type='text/javascript'> + jQuery(document).ready(function () { + var options_ajaxlink_<%=i%> = {}; + options_ajaxlink_<%=i%>.jqueryaction = "anchor"; + options_ajaxlink_<%=i%>.id = "ajaxlink_<%=i%>"; + options_ajaxlink_<%=i%>.targets = "partnersInfo"; + options_ajaxlink_<%=i%>.href = "/wikitty-publication/fragment/wikittyInfo.action"; + options_ajaxlink_<%=i%>.hrefparameter = "id=<%=w.getId()%>"; + jQuery.struts2_jquery.bind(jQuery('#ajaxlink_<%=i%>'),options_ajaxlink_<%=i%>); + }); + </script> + </td> - + <td><%=w.getId()%></td> <td><%=w.getVersion()%></td> <td><%=w.getExtensionNames()%></td> </tr> <% + i++; } %> - - - + + + </table> - <input type="submit" name="previous" value="previous" /> - <input type="submit" name="next" value="next" /> + <input type="submit" name="previous" value="previous" /> <input + type="submit" name="next" value="next" /> </form> + + + + \ No newline at end of file Added: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp (rev 0) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp 2011-06-06 15:28:53 UTC (rev 934) @@ -0,0 +1,22 @@ +<%@page import="org.apache.commons.lang.StringEscapeUtils"%> +<%@page import="org.nuiton.wikitty.entities.Wikitty"%> +<%@page + import="org.nuiton.wikitty.publication.action.PublicationActionRestoreWikitty"%> +<%@taglib prefix="s" uri="/struts-tags"%> + +<% + PublicationActionRestoreWikitty action = PublicationActionRestoreWikitty + .getAction(); + Wikitty wiki = action.getWikitty(); + if (wiki != null) { +%> +<pre><%=StringEscapeUtils.escapeHtml(String.valueOf(wiki))%></pre> +<% + } + action.getId(); +%> + + + + + Property changes on: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain