Author: kcardineaud Date: 2011-07-01 11:59:44 +0200 (Fri, 01 Jul 2011) New Revision: 151 Url: http://nuiton.org/repositories/revision/scmwebeditor/151 Log: Add upload function in Ajax, work but response doesn't apear in page Added: trunk/src/main/webapp/upload.jsp Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java trunk/src/main/resources/struts.xml trunk/src/main/webapp/ModificationViewer.jsp trunk/src/main/webapp/css/main.css Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-30 12:44:14 UTC (rev 150) +++ trunk/pom.xml 2011-07-01 09:59:44 UTC (rev 151) @@ -171,7 +171,7 @@ <!--Multilanguage maven-site --> <siteLocales>fr,en</siteLocales> <struts2Version>2.2.3</struts2Version> - <struts2jqueryVersion>3.0.2</struts2jqueryVersion> + <struts2jqueryVersion>3.1.0</struts2jqueryVersion> <strutsxworksVersion>2.2.3</strutsxworksVersion> <!-- extra files to include in release --> Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-06-30 12:44:14 UTC (rev 150) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-07-01 09:59:44 UTC (rev 151) @@ -216,6 +216,11 @@ //Suppression du repertoire temporaire delTempDirectory(svnSess); + + if(log.isInfoEnabled()) { + log.info("File upload successful"); + } + return Action.SUCCESS; Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-06-30 12:44:14 UTC (rev 150) +++ trunk/src/main/resources/struts.xml 2011-07-01 09:59:44 UTC (rev 151) @@ -23,11 +23,17 @@ </action> <action name="doUpload" class="org.nuiton.scmwebeditor.actions.UploadAction" method="execute"> - <result>/uploadSuccess.jsp</result> - <result name="login" >/uploadForm.jsp</result> - <result name="error" >/uploadForm.jsp</result> + <result>/uploadSuccess.jsp</result> + <result name="login" >/uploadForm.jsp</result> + <result name="error" >/uploadForm.jsp</result> </action> + <action name="uploadFile" class="org.nuiton.scmwebeditor.actions.UploadAction" method="execute"> + <result>/upload.jsp</result> + <result name="login" >/upload.jsp</result> + <result name="error" >/upload.jsp</result> + </action> + <action name="preview" class="org.nuiton.scmwebeditor.actions.PreviewAction" method="execute"> <result>/Preview.jsp</result> </action> Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2011-06-30 12:44:14 UTC (rev 150) +++ trunk/src/main/webapp/ModificationViewer.jsp 2011-07-01 09:59:44 UTC (rev 151) @@ -278,31 +278,29 @@ </div> - <!-- - <form method="POST" id="uploadForm" action="doUpload" enctype="multipart/form-data"> - - <label>Upload File : <input type=file name="upload" /></label> - <input type="submit"> - - - <s:file name="upload" label="File"/> - - - - <sj:submit - id="ajaxUploadButton" - targets="htmlcontentUpload" - button="true" - value="upload" - > - </sj:submit> + <div id="uploadFormId" > + <s:form method="POST" id="uploadForm" action="uploadFile" enctype="multipart/form-data"> + + + <label>Upload a picture : <input type="file" name="upload"/></label><br/> + <label>Path on svn : <input type="text" name="svnPath" /></label><br/> + <label>username : <input type="text" name="username" /></label><br/> + <label>password : <input type="password" name="pw" /></label><br/> + + <sj:submit + id="ajaxUploadButton" + targets="targetContentUpload" + button="true" + value="upload" + > + </sj:submit> - - </form> - --> + </s:form> + </div> + --> - <sj:div id="htmlcontentUpload"></sj:div> + <div id="targetContentUpload"></div> <div id="htmlcontentPreview"></div> Modified: trunk/src/main/webapp/css/main.css =================================================================== --- trunk/src/main/webapp/css/main.css 2011-06-30 12:44:14 UTC (rev 150) +++ trunk/src/main/webapp/css/main.css 2011-07-01 09:59:44 UTC (rev 151) @@ -15,8 +15,16 @@ text-align:center; } +#uploadFormId { + width:70%; + margin:auto; + display:block; + padding:1%; + text-align:left; +} + .CodeMirror-scroll { - height:500px; + height:500px; } #prevtitle { Added: trunk/src/main/webapp/upload.jsp =================================================================== --- trunk/src/main/webapp/upload.jsp (rev 0) +++ trunk/src/main/webapp/upload.jsp 2011-07-01 09:59:44 UTC (rev 151) @@ -0,0 +1,16 @@ +<p>Result : </p> + <%if (request.getAttribute("badLogin")!=null && request.getAttribute("badLogin").equals(true)) { %> + <p> + <font color="red"> + Bad username or password + </font> + </p> + <% } else if (request.getAttribute("error")!=null && request.getAttribute("error").equals(true)) { %> + <p> + <font color="red"> + Erreur SVN + </font> + </p> + <% } else {%> + <p>File upload successful</p> + <% } %> \ No newline at end of file