r127 - in trunk/vradi-web/src/main: java/org/chorem/vradi/interceptors resources webapp/WEB-INF/jsp webapp/WEB-INF/jsp/inc
Author: sletellier Date: 2011-07-21 17:36:20 +0200 (Thu, 21 Jul 2011) New Revision: 127 Url: http://chorem.org/repositories/revision/vradi/127 Log: - Fix tomcat compatibility --Cette ligne, et les suivantes ci-dessous, seront ignor?\195?\169es-- M vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java M vradi-web/src/main/resources/struts.xml M vradi-web/src/main/webapp/WEB-INF/jsp/attachmentList.jsp M vradi-web/src/main/webapp/WEB-INF/jsp/register.jsp M vradi-web/src/main/webapp/WEB-INF/jsp/resultGrid.jsp M vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp M vradi-web/src/main/webapp/WEB-INF/jsp/searchPanel.jsp M vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp M vradi-web/src/main/webapp/WEB-INF/jsp/thesaurusFilter.jsp M vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp M vradi-web/src/main/webapp/WEB-INF/jsp/options.jsp M vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp M vradi-web/src/main/webapp/WEB-INF/jsp/invitationResultConfirm.jsp M vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp M vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp M vradi-web/src/main/webapp/WEB-INF/jsp/login.jsp M vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp M vradi-web/src/main/webapp/WEB-INF/jsp/inc/header.jsp M vradi-web/src/main/webapp/WEB-INF/jsp/invitationResult.jsp M vradi-web/src/main/webapp/WEB-INF/jsp/forgotPassword.jsp Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java trunk/vradi-web/src/main/resources/struts.xml trunk/vradi-web/src/main/webapp/WEB-INF/jsp/attachmentList.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/inc/header.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResult.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResultConfirm.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/login.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/options.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/register.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/resultGrid.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/searchPanel.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/thesaurusFilter.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java 2011-07-21 15:35:40 UTC (rev 126) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java 2011-07-21 15:36:20 UTC (rev 127) @@ -64,11 +64,10 @@ session.put(LoginAction.REDIRECT_AFTER_LOGIN, redirect); log.debug(String.format("User not loggued redirect to '%s' and '%s'", loginRedirect, redirect)); - ServletActionContext.getResponse().sendRedirect(loginRedirect); +// ServletActionContext.getResponse().sendRedirect(loginRedirect); + return loginRedirect; } else { - result = invocation.invoke(); + return invocation.invoke(); } - - return result; } } Modified: trunk/vradi-web/src/main/resources/struts.xml =================================================================== --- trunk/vradi-web/src/main/resources/struts.xml 2011-07-21 15:35:40 UTC (rev 126) +++ trunk/vradi-web/src/main/resources/struts.xml 2011-07-21 15:36:20 UTC (rev 127) @@ -78,7 +78,7 @@ <package name="restrictedArea" extends="publicArea"> <interceptors> <interceptor name="login" class="org.chorem.vradi.interceptors.LoginInterceptor"> - <param name="loginRedirect">/login.action</param> + <param name="loginRedirect">login</param> </interceptor> <interceptor-stack name="restrictedAreaStack"> <interceptor-ref name="login"/> @@ -86,6 +86,11 @@ </interceptor-stack> </interceptors> <default-interceptor-ref name="restrictedAreaStack"/> + + <!-- To use struts url with namespace --> + <global-results> + <result name="login" type="redirect">login.action</result> + </global-results> </package> <package name="login" extends="loginArea"> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/attachmentList.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/attachmentList.jsp 2011-07-21 15:35:40 UTC (rev 126) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/attachmentList.jsp 2011-07-21 15:36:20 UTC (rev 127) @@ -28,11 +28,10 @@ ActionContext.getContext().put("localAttachmentId", attachmentId); %> - <li><%=VradiWebHelper.formatDate(a.getDate())%> <a href="/ajax/raw/<%=attachmentId%>/Attachment.content.action"><%=a.getName()%></a> + <li><%=VradiWebHelper.formatDate(a.getDate())%> <s:a action="raw/%{localAttachmentId}/Attachment.content" namespace="/ajax"><%=a.getName()%></s:a> - <%--<s:a action="/ajax/raw/%{localAttachmentId}/Attachment.content" key="vradi.attachment.update"></s:a>--%> - <%--<s:a action="" key="vradi.attachment.history"></s:a>--%> - <sj:a href="/ajax/delete/%{localAttachmentId}.action" + <s:url id="deleteUrl" action="delete/%{localAttachmentId}" namespace="/ajax"/> + <sj:a href="%{deleteUrl}" targets="actionResult" button="true" indicator="indicator-deleteAttachment" Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/forgotPassword.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/forgotPassword.jsp 2011-07-21 15:35:40 UTC (rev 126) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/forgotPassword.jsp 2011-07-21 15:36:20 UTC (rev 127) @@ -11,13 +11,14 @@ <div id="content"> <div id="formFrame fond"> <h1><s:text name="vradi.forgotpwd.title" /></h1> - <s:form action="forgotPassword"> + <s:form action="forgotPassword" + namespace="/"> <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> + <s:a id="loginLink" action="login_input" namespace="/"><s:text name="vradi.login.title" /></s:a> </div> </div> </body> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-07-21 15:35:40 UTC (rev 126) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-07-21 15:36:20 UTC (rev 127) @@ -19,7 +19,6 @@ FormNote formNote = action.getFormNote(); ActionContext.getContext().put("localNoteId", formNote.getWikittyId()); -ActionContext.getContext().put("localFieldSeekingPartner", FormNote.FQ_FIELD_FORMNOTE_SEEKINGPARTNER); ActionContext.getContext().put("localFieldSummary", FormNote.FQ_FIELD_FORMNOTE_SUMMARY); ActionContext.getContext().put("localFieldContent", FormNote.FQ_FIELD_FORMNOTE_CONTENT); ActionContext.getContext().put("localNote", formNote); @@ -35,6 +34,15 @@ <title><s:text name="vradi.formNote.title" /></title> <s:head/> <sj:head jquerytheme="sunny"/> + <script type="text/javascript"> + function seekingPartnersChange(checkbox) { + var url="<s:url action='edit/%{localNoteId}' namespace='/ajax'/>"; + url = url + "?<%=FormNote.FQ_FIELD_FORMNOTE_SEEKINGPARTNER%>=" + checkbox.checked; + var xhr=new XMLHttpRequest(); + xhr.open('GET', url, true); + xhr.send(null); + } + </script> </head> <body> <h1><s:text name="vradi.formNote.title" /></h1> @@ -42,13 +50,21 @@ <img id="indicator-result" src="/img/indicator.gif" alt="Loading..." style="display:none"/> </div> <div> - <sj:a id="closeButton" href="/ajax/edit/%{localNoteId}.action?state=<%=FormNoteState.CLOSE.getValue()%>>" + <s:url id="closeButtonUrl" + action="edit/%{localNoteId}" + namespace="/ajax"> + <s:param name="state"> + <%=FormNoteState.CLOSE.getValue()%> + </s:param> + </s:url> + <sj:a id="closeButton" href="%{closeButtonUrl}" targets="result" indicator="indicator-result" button="true" buttonIcon="ui-icon-gear"> <s:text name="vradi.formNote.close"/> </sj:a> - <sj:a href="/ajax/delete/%{localNoteId}.action" + <s:url id="deleteUrl" action="delete/%{localNoteId}" namespace="/ajax"/> + <sj:a href="%{deleteUrl}" targets="result" indicator="indicator-result" button="true" buttonIcon="ui-icon-gear"><s:text name="vradi.delete"/></sj:a> </div> @@ -60,28 +76,31 @@ </div> <div> - <form id="partnersForm" action="/fragment/userInfo.action"> + <s:form id="partnersForm" action="userInfo" namespace="/fragment"> <s:select size="5" name="userId" list="partners" listKey="wikittyId" listValue="login"/> <s:set id="showText"> <s:text name="vradi.show"/> </s:set> <sj:submit id="partnersSubmit" value="%{showText}" - targets="partnersInfo" indicator="indicator-partnersInfo" - button="true" buttonIcon="ui-icon-gear"/> - </form> + targets="partnersInfo" + indicator="indicator-partnersInfo" + button="true" + buttonIcon="ui-icon-gear"/> + </s:form> <div id="partnersInfo"> <img id="indicator-partnersInfo" src="/img/indicator.gif" alt="Loading..." style="display:none"/> </div> - <s:a action="seekPartners/%{localNoteId}"><s:text name="vradi.formNote.seekPartners" /></s:a> + <s:a action="seekPartners/%{localNoteId}" + namespace="/"><s:text name="vradi.formNote.seekPartners" /></s:a> <s:set id="seekingPartnerText"> <s:text name="vradi.formNote.seekingPartner"/> </s:set> <s:checkbox label="%{seekingPartnerText}" name="formNote.seekingPartners" value="%{localSeekingPartner}" - onchange="var url='/ajax/edit/%{localNoteId}.action?%{localFieldSeekingPartner}='+this.checked; var xhr=new XMLHttpRequest(); xhr.open('GET', url, true);xhr.send(null);"/> + onchange="seekingPartnersChange(this);"/> </div> <s:set id="saveText"> @@ -101,13 +120,17 @@ collapsible="true" useSelectedTabCookie="true"> <sj:tab id="tabHtmlSummary" target="htmlSummary" label="%{summaryText}"/> <sj:tab id="tabHtmlSummaryEdit" target="htmlSummaryEdit" label="%{editText}"/> + + <s:url id="htmlSummaryUrl" action="rst" namespace="/ajax"/> + + <%-- We cant use s:param here because struts JQuery convert & to & --%> <sj:div id="htmlSummary" - href="/ajax/rst.action?id=%{localNoteId}&field=%{localFieldSummary}" + href="%{htmlSummaryUrl}?id=%{localNoteId}&field=%{localFieldSummary}" listenTopics="updateHtmlSummary"> <img id="indicator-htmlSummary" src="/img/indicator.gif" alt="Loading..." style="display:none"/> </sj:div> <div id="htmlSummaryEdit"> - <form id="htmlSummaryEditForm" action="/ajax/rst.action"> + <s:form id="htmlSummaryEditForm" action="rst" namespace="/ajax"> <s:hidden name="id" value="%{localNoteId}"/> <s:hidden name="field" value="%{localFieldSummary}"/> <s:textarea name="rst" value="%{localSummary}"/> @@ -117,7 +140,7 @@ onSuccessTopics="updateHtmlSummary" indicator="indicator-htmlSummary" button="true" buttonIcon="ui-icon-gear"/> - </form> + </s:form> </div> </sj:tabbedpanel> </div> @@ -127,16 +150,17 @@ collapsible="true" useSelectedTabCookie="true"> <sj:tab id="tabHtmlContent" target="htmlContent" label="%{summaryText}"/> <sj:tab id="tabHtmlContentEdit" target="htmlContentEdit" label="%{editText}"/> + + <s:url id="htmlContentUrl" action="rst" namespace="/ajax"/> + + <%-- We cant use s:param here because struts JQuery convert & to & --%> <sj:div id="htmlContent" - href="/ajax/rst.action?id=%{localNoteId}&field=%{localFieldContent}" + href="%{htmlContentUrl}?id=%{localNoteId}&field=%{localFieldContent}" listenTopics="updateHtmlContent"> <img id="indicator-htmlContent" src="/img/indicator.gif" alt="Loading..." style="display:none"/> </sj:div> - <%--<div id="htmlContent">--%> - <%--<img id="indicator-htmlContent" src="/img/indicator.gif" alt="Loading..." style="display:none"/>--%> - <%--</div>--%> <div id="htmlContentEdit" > - <form id="htmlContentEditForm" action="/ajax/rst.action"> + <s:form id="htmlContentEditForm" action="rst" namespace="/ajax"> <s:hidden name="id" value="%{localNoteId}"/> <s:hidden name="field" value="%{localFieldContent}"/> <s:textarea name="rst" value="%{localContent}"/> @@ -146,7 +170,7 @@ onSuccessTopics="updateHtmlContent" indicator="indicator-htmlContent" button="true" buttonIcon="ui-icon-gear"/> - </form> + </s:form> </div> </sj:tabbedpanel> </div> @@ -164,25 +188,25 @@ <sj:tab id="tabFiles" target="updateFilesPanel" label="%{filesText}"/> <sj:tab id="tabAddFiles" target="addFiles" label="%{addText}"/> + <s:url id="updateFileUrl" action="attachmentList/%{localNoteId}" namespace="/fragment"/> <sj:div id="updateFilesPanel" - href="/fragment/attachmentList/%{localNoteId}.action" + href="%{updateFileUrl}" indicator="indicator-files" listenTopics="updateFiles"> <img id="indicator-files" src="/img/indicator.gif" alt="Loading..." style="display:none"/> </sj:div> <div id="addFiles"> - <s:form id="addFilesForm" namespace="/fragment" action="attachmentAdd" method="POST" enctype="multipart/form-data"> - <%--<s:form id="addFilesForm" action="attachmentAdd" method="POST" enctype="multipart/form-data">--%> + <s:form id="addFilesForm" action="attachmentAdd" namespace="/fragment" method="POST" enctype="multipart/form-data"> <s:hidden name="targetId" value="%{localNoteId}"/> <s:textfield name="name" key="vradi.addfiles.name"/> <s:textarea name="description" key="vradi.addfiles.description"/> <s:file name="content" key="vradi.addfiles.content" required="true"/> <sj:submit id="addFilesSubmit" - value="%{saveText}" - targets="result" - indicator="indicator-result" - onSuccessTopics="updateFiles" - button="true" buttonIcon="ui-icon-gear"/> + value="%{saveText}" + targets="result" + indicator="indicator-result" + onSuccessTopics="updateFiles" + button="true" buttonIcon="ui-icon-gear"/> </s:form> </div> </sj:tabbedpanel> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp 2011-07-21 15:35:40 UTC (rev 126) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp 2011-07-21 15:36:20 UTC (rev 127) @@ -28,9 +28,9 @@ <% for (FormNote note : action.getFormNotes()) { ActionContext.getContext().put("localNoteId", note.getWikittyId()); %> - <li><s:a action="formNote/%{localNoteId}"><%=VradiWebHelper.formatDate(note.getCreationDate())%> <%=note.getSummary()%></s:a></li> + <li><s:a action="formNote/%{localNoteId}" namespace="/"><%=VradiWebHelper.formatDate(note.getCreationDate())%> <%=note.getSummary()%></s:a></li> <% } %> - <li><s:a action="formNote/new?formId=%{formId}"><s:text name="vradi.new.formNote"/></s:a></li> + <li><s:a action="formNote/new?formId=%{formId}" namespace="/"><s:text name="vradi.new.formNote"/></s:a></li> </ul> </body> </html> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/header.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/header.jsp 2011-07-21 15:35:40 UTC (rev 126) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/header.jsp 2011-07-21 15:36:20 UTC (rev 127) @@ -30,26 +30,26 @@ <s:if test="logged"> <div id="linkPanel"> <s:if test="isNotOptionPage"> - <s:a id="options" - action="options"> + <s:a action="options" + namespace="/"> <s:text name="vradi.options"/> </s:a> </s:if> <s:if test="isNotUserPreferencePage"> - <s:a id="options" - href="/userPreference/%{userId}.action"> + <s:a action="userPreference/%{userId}" + namespace="/"> <s:text name="vradi.userPreference"/> </s:a> </s:if> <s:if test="isNotSearchViewPage"> - <s:a id="searchLink" - action="searchView"> + <s:a action="searchView" + namespace="/"> <s:text name="vradi.search.link"/> </s:a> </s:if> <s:a id="logout" - action="logout"> - + action="logout" + namespace="/"> <s:text name="vradi.logout.submit" /> </s:a> </div> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResult.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResult.jsp 2011-07-21 15:35:40 UTC (rev 126) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResult.jsp 2011-07-21 15:36:20 UTC (rev 127) @@ -18,7 +18,7 @@ <p><%=action.getContent()%></p> </div> -<s:form action="sendInvitationResult" theme="simple"> +<s:form action="sendInvitationResult" namespace="/" theme="simple"> <s:hidden name="noteId" value="%{localNoteId}"/> <s:hidden name="senderId" value="%{localSenderId}"/> <s:hidden name="invitationResult" value="%{invitationResult}"/> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResultConfirm.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResultConfirm.jsp 2011-07-21 15:35:40 UTC (rev 126) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/invitationResultConfirm.jsp 2011-07-21 15:36:20 UTC (rev 127) @@ -19,7 +19,7 @@ <p><%=action.getContent()%></p> </div> -<s:form action="sendInvitationResultConfirm" theme="simple"> +<s:form action="sendInvitationResultConfirm" namespace="/" theme="simple"> <s:hidden name="noteId" value="%{localNoteId}"/> <s:hidden name="senderId" value="%{localSenderId}"/> <s:hidden name="invitationResult" value="%{invitationResult}"/> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/login.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/login.jsp 2011-07-21 15:35:40 UTC (rev 126) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/login.jsp 2011-07-21 15:36:20 UTC (rev 127) @@ -13,15 +13,15 @@ <h1><s:text name="vradi.login.title" /></h1> <br/> <s:actionerror /> - <s:form action="login" theme="simple"> + <s:form action="login" namespace="/" theme="simple"> <s:text name="vradi.login.email"/><br/> <s:textfield name="email" labelposition="top" labelSeparator=" :" /><br/> <s:text name="vradi.login.password"/><br/> <s:password name="password" labelposition="top" labelSeparator=" :" /><br/> <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> + <s:a action="register_input" namespace="/" id="registerLink"><s:text name="vradi.register.title" /></s:a><br/> + <s:a action="forgotPassword_input" namespace="/" id="forgotPwd"><s:text name="vradi.forgotpwd.title" /></s:a> </div> </div> </body> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/options.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/options.jsp 2011-07-21 15:35:40 UTC (rev 126) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/options.jsp 2011-07-21 15:36:20 UTC (rev 127) @@ -42,7 +42,8 @@ <body> <div> <div id="thesaurusPanel" class="left"> - <sj:div id="thesaurusDiv" href="/fragment/thesaurusFilter.action" indicator="indicator-thesaurus"> + <s:url id="thesaurusFilterUrl" action="thesaurusFilter" namespace="fragment"/> + <sj:div id="thesaurusDiv" href="%{thesaurusFilterUrl}" indicator="indicator-thesaurus"> <img id="indicator-thesaurus" src="/img/indicator.gif" alt="Loading..." style="display:none"/> </sj:div> </div> @@ -50,6 +51,7 @@ <div id="contentPanel" class="contentPanel"> <s:form action="options" + namespace="/" theme="simple" method="post" enctype="multipart/form-data"> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/register.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/register.jsp 2011-07-21 15:35:40 UTC (rev 126) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/register.jsp 2011-07-21 15:36:20 UTC (rev 127) @@ -11,7 +11,7 @@ <div id="content"> <div id="formFrame" class="fond"> <h1><s:text name="vradi.register.title" /></h1> - <s:form action="register"> + <s:form action="register" namespace="/"> <s:actionerror /> <p> <s:textfield key="vradi.login.email" name="email" labelposition="top" labelSeparator=" :" /> @@ -20,7 +20,6 @@ <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> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/resultGrid.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/resultGrid.jsp 2011-07-21 15:35:40 UTC (rev 126) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/resultGrid.jsp 2011-07-21 15:36:20 UTC (rev 127) @@ -9,8 +9,10 @@ * Format a Column as Link */ function formatLink(cellvalue, options, row) { - return "<a href='/formNoteList/" + cellvalue + ".action'><%=_("vradi.form.editAction")%></a>"; + var url = "<s:url action='formNoteList/" + cellvalue + "' namespace='/'/>"; + return "<a href='" + url + "'><%=_("vradi.form.editAction")%></a>"; } + </script> <s:set id="creationDateText"> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp 2011-07-21 15:35:40 UTC (rev 126) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp 2011-07-21 15:36:20 UTC (rev 127) @@ -11,9 +11,9 @@ ActionContext.getContext().put("lastQueries", lastQueries); %> -<form id="queryForm" action="/fragment/searchPanel.action"> +<s:form id="queryForm" action="searchPanel" namespace="/fragment"> - <s:url id="savedQueries" namespace="/ajax" action="savedQueries"/> + <s:url id="savedQueries" action="savedQueries" namespace="/ajax"/> <sj:select id="lastQueriesSelect" href="%{savedQueries}" @@ -30,4 +30,4 @@ onSuccessTopics="updateGrid" targets="searchPanel" button="true"/> -</form> \ No newline at end of file +</s:form> \ No newline at end of file Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp 2011-07-21 15:35:40 UTC (rev 126) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp 2011-07-21 15:36:20 UTC (rev 127) @@ -18,7 +18,8 @@ $.subscribe('rowselect', function(event, data) { var id = event.originalEvent.id; var wikittyId = id.substring(10, id.length); - window.open("/formView/" + wikittyId + ".action"); + var url = "<s:url action='formView/" + wikittyId + "' namespace='/'/>"; + window.open(url); }); <%-- Thesaurus --%> @@ -46,8 +47,9 @@ <body> <div> <div id="thesaurusPanel" class="left"> - <form id="thesaurusForm" - action="/fragment/thesaurusFilter.action"> + <s:form id="thesaurusForm" + action="thesaurusFilter" + namespace="/fragment"> <s:textfield id="thesaurusNameRequestField" cssClass="left" @@ -63,30 +65,36 @@ targets="thesaurusDiv" button="true"/> </div> - </form> - <sj:div id="thesaurusDiv" href="/fragment/thesaurusFilter.action" indicator="indicator-thesaurus"> + </s:form> + <s:url id="thesaurusUrl" + action="thesaurusFilter" + namespace="/fragment"/> + <sj:div id="thesaurusDiv" href="%{thesaurusUrl}" indicator="indicator-thesaurus"> <img id="indicator-thesaurus" src="/img/indicator.gif" alt="Loading..." style="display:none"/> </sj:div> </div> <div id="contentPanel" class="contentPanel"> + <s:url id="savedQueryUrl" action="savedQuery" namespace="/fragment"/> <sj:div id="savedQueriesPanel" - href="/fragment/savedQuery.action" + href="%{savedQueryUrl}" listenTopics="updateQueries" indicator="indicator-savedQuery"> <img id="indicator-savedQuery" src="/img/indicator.gif" alt="Loading..." style="display:none"/> </sj:div> + <s:url id="searchPanelUrl" action="searchPanel" namespace="/fragment"/> <sj:div id="searchPanel" - href="/fragment/searchPanel.action" + href="%{searchPanelUrl}" listenTopics="updateForm" onSuccessTopics="updateGrid" indicator="indicator-searchPanel"> <img id="indicator-searchPanel" src="/img/indicator.gif" alt="Loading..." style="display:none"/> </sj:div> + <s:url id="searchUrl" action="search" namespace="/fragment"/> <sj:div id="resultPanel" - href="/fragment/search.action" + href="%{searchUrl}" indicator="indicator-grid"> <img id="indicator-grid" src="/img/indicator.gif" alt="Loading..." style="display:none"/> </sj:div> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/searchPanel.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/searchPanel.jsp 2011-07-21 15:35:40 UTC (rev 126) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/searchPanel.jsp 2011-07-21 15:36:20 UTC (rev 127) @@ -2,7 +2,7 @@ <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="sj" uri="/struts-jquery-tags" %> -<s:form id="searchForm" action="search"> +<s:form id="searchForm" action="search" namespace="/"> <div id="empty"> </div> @@ -22,7 +22,7 @@ </div> <div id="searchActionPanel"> - <s:url id="saveQueryUrl" value="/fragment/saveQuery.action"/> + <s:url id="saveQueryUrl" value="fragment/saveQuery.action"/> <s:set id="saveQueryText"> <s:text name="vradi.search.saveQuery"/> @@ -34,7 +34,7 @@ onSuccessTopics="updateQueries,updateGrid" button="true"/> - <s:url id="switchQueryUrl" value="/fragment/switchQueryActivation.action"/> + <s:url id="switchQueryUrl" action="switchQueryActivation" namespace="/fragment"/> <s:set id="queryActiveText"> <s:if test="queryActive"> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp 2011-07-21 15:35:40 UTC (rev 126) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/seekPartners.jsp 2011-07-21 15:36:20 UTC (rev 127) @@ -30,7 +30,7 @@ <body> <h1><s:text name="vradi.seekingPartners.title" /></h1> - <s:form id="seekingPartnersForm" action="sendInvitation" method="POST"> + <s:form id="seekingPartnersForm" action="sendInvitation" namespace="/" method="POST"> <s:hidden name="noteId" value="%{localNoteId}"/> <s:checkbox name="formReceiver" key="vradi.seekingPartners.formReceiver"/> <s:checkbox name="seeker" key="vradi.seekingPartners.seeker"/> @@ -40,14 +40,14 @@ <s:set id="showText"> <s:text name="vradi.show"/> </s:set> - <sj:submit - id="partnersShowSubmit" - href="/fragment/userInfo.action" - targets="partnersShowResult" - value="%{showText}" - indicator="indicator-partnersShowResult" - button="true" - /> + + <s:url id="partnersShowUrl" action="userInfo" namespace="/fragment"/> + <sj:submit id="partnersShowSubmit" + href="%{partnersShowUrl}" + targets="partnersShowResult" + value="%{showText}" + indicator="indicator-partnersShowResult" + button="true"/> <div id="partnersShowResult"> <img id="indicator-partnersShowResult" src="/img/indicator.gif" alt="wait..." style="display:none"/> </div> @@ -55,7 +55,7 @@ <s:textfield name="inviteEmail" key="vradi.seekingPartners.inviteEmail"/> <s:textarea name="message" - value="%{localNoteSummary}" key="vradi.userPreference.info"/> + value="%{localNoteSummary}" key="vradi.userPreference.info"/> <s:set id="sendText"> <s:text name="vradi.send"/> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp 2011-07-21 15:35:40 UTC (rev 126) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp 2011-07-21 15:36:20 UTC (rev 127) @@ -39,7 +39,7 @@ <div> <s:text name="vradi.showInvitation.otherPartners"/> - <form id="partnersForm" action="/fragment/userInfo.action"> + <form id="partnersForm" action="fragment/userInfo.action" namespace="/"> <s:select size="5" name="userId" list="partners" listKey="wikittyId" listValue="login"/> <s:set id="showText"> <s:text name="vradi.show"/> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/thesaurusFilter.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/thesaurusFilter.jsp 2011-07-21 15:35:40 UTC (rev 126) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/thesaurusFilter.jsp 2011-07-21 15:36:20 UTC (rev 127) @@ -3,7 +3,7 @@ <%@taglib prefix="s" uri="/struts-tags"%> <%@ taglib prefix="sjt" uri="/struts-jquery-tree-tags" %> -<s:url id="thesaurusDataUrl" namespace="/ajax" action="thesaurus"> +<s:url id="thesaurusDataUrl" action="thesaurus" namespace="/ajax"> <s:param name="thesaurusNameRequest"> <s:property value="thesaurusNameRequest"/> </s:param> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp 2011-07-21 15:35:40 UTC (rev 126) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp 2011-07-21 15:36:20 UTC (rev 127) @@ -45,14 +45,16 @@ * Format a Column as Link */ function formatLink(cellvalue, options, row) { - return "<a href='/formNoteList/" + cellvalue + ".action'><%=_("vradi.form.editAction")%></a>"; + var url = "<s:url action='formNoteList/" + cellvalue + "' namespace='/'/>"; + return "<a href='" + url + "'><%=_("vradi.form.editAction")%></a>"; } <%-- Table --%> $.subscribe('rowselect', function(event, data) { var id = event.originalEvent.id; var wikittyId = id.substring(10, id.length); - window.open("/formView/" + wikittyId + ".action"); + var url = "<s:url action='formView/" + wikittyId + "' namespace='/'/>"; + window.open(url); }); </script> @@ -66,7 +68,7 @@ | Information +--> <div> - <s:form id="infoForm" action="/ajax/edit/%{localUserId}.action" method="POST"> + <s:form id="infoForm" action="edit/%{localUserId}" namespace="/ajax" method="POST"> <sj:textarea name="%{localVradiUserFieldInfo}" value="%{localUserInfo}" key="vradi.userPreference.info"/> @@ -99,9 +101,9 @@ <div> <h2><s:text name="vradi.userPreference.nosend" /></h2> <%--<ws:form wikitty="<%=WikittyUtil.getWikitty(action.getProxy().getWikittyService(), null, action.getUser())%>"--%> - <%--proxy="<%=action.getProxy()%>" action="/ajax/edit/%{localUserId}.action">--%> + <%--proxy="<%=action.getProxy()%>" action="ajax/edit/%{localUserId}.action">--%> <%--</ws:form>--%> - <s:form id="noSendForm" action="/ajax/edit/%{localUserId}.action" method="POST"> + <s:form id="noSendForm" action="edit/%{localUserId}" namespace="/ajax" method="POST"> <ws:selectAssociation proxy="<%=action.getProxy()%>" name="userId" @@ -112,7 +114,8 @@ <sj:submit id="noSendFormShowSubmit" - href="/fragment/userInfo.action" + action="userInfo" + namespace="/fragment" targets="noSendResult" value="%{showText}" indicator="indicator-noSendFormSubmit" @@ -120,7 +123,6 @@ /> <sj:submit id="noSendFormDeleteSubmit" - href="%{simpleecho}" targets="noSendResult" value="%{deleteText}" indicator="indicator-noSendFormSubmit" @@ -139,7 +141,7 @@ +--> <div> <h2><s:text name="vradi.userPreference.noreceived" /></h2> - <s:form id="noReceivedForm" action="/ajax/edit/%{localUserId}.action" method="POST"> + <s:form id="noReceivedForm" action="edit/%{localUserId}" namespace="/ajax" method="POST"> <ws:selectAssociation proxy="<%=action.getProxy()%>" name="userId" @@ -150,7 +152,8 @@ <sj:submit id="noReceivedFormShowSubmit" - href="/fragment/userInfo.action" + action="userInfo" + namespace="/fragment" targets="noReceivedResult" value="%{showText}" indicator="indicator-noReceivedSubmit" @@ -158,7 +161,6 @@ /> <sj:submit id="noReceivedFormDeleteSubmit" - href="%{simpleecho}" targets="noReceivedResult" value="%{deleteText}" indicator="indicator-noReceivedSubmit" @@ -177,7 +179,7 @@ +--> <div> <h2><s:text name="vradi.userPreference.partners" /></h2> - <s:form id="partnersForm" action="/fragment/partners/%{localUserId}.action" method="POST"> + <s:form id="partnersForm" action="partners/%{localUserId}" namespace="/fragment" method="POST"> <ws:select name="userId" size="5" @@ -187,7 +189,8 @@ <%--<s:select size="5" name="userId" list="%{localPartners}" listKey="wikittyId" listValue="login"/>--%> <sj:submit id="partnersFormShowSubmit" - href="/fragment/userInfo.action" + action="userInfo" + namespace="/fragment" targets="partnersFormResult" value="%{showText}" indicator="indicator-partnersForm"
participants (1)
-
sletellier＠users.chorem.org