Author: kcardineaud Date: 2011-07-12 14:40:41 +0200 (Tue, 12 Jul 2011) New Revision: 171 Url: http://nuiton.org/repositories/revision/scmwebeditor/171 Log: Move jsp and javascript file in proper directory and delete capital letter for jsp files names Added: trunk/src/main/webapp/WEB-INF/content/ trunk/src/main/webapp/WEB-INF/content/accueil.jsp trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp trunk/src/main/webapp/WEB-INF/content/badUseRedirect.jsp trunk/src/main/webapp/WEB-INF/content/error.jsp trunk/src/main/webapp/WEB-INF/content/index.jsp trunk/src/main/webapp/WEB-INF/content/loginSearch.jsp trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp trunk/src/main/webapp/WEB-INF/content/outConnection.jsp trunk/src/main/webapp/WEB-INF/content/preview.jsp trunk/src/main/webapp/WEB-INF/content/privateSvnRedirect.jsp trunk/src/main/webapp/WEB-INF/content/recall.jsp trunk/src/main/webapp/WEB-INF/content/redirect.jsp trunk/src/main/webapp/WEB-INF/content/reset.jsp trunk/src/main/webapp/WEB-INF/content/save.jsp trunk/src/main/webapp/WEB-INF/content/search.jsp trunk/src/main/webapp/WEB-INF/content/upload.jsp trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp trunk/src/main/webapp/WEB-INF/content/uploadSuccess.jsp trunk/src/main/webapp/js/ trunk/src/main/webapp/js/cancelRedirect.js trunk/src/main/webapp/js/gereSession.js trunk/src/main/webapp/js/pictureUpload.js trunk/src/main/webapp/js/selectLanguage.js Removed: trunk/src/main/webapp/BadFileRedirect.jsp trunk/src/main/webapp/BadUseRedirect.jsp trunk/src/main/webapp/Error.jsp trunk/src/main/webapp/GereSession.js trunk/src/main/webapp/LoginSearch.jsp trunk/src/main/webapp/ModificationViewer.jsp trunk/src/main/webapp/OutConnection.jsp trunk/src/main/webapp/Preview.jsp trunk/src/main/webapp/PrivateSvnRedirect.jsp trunk/src/main/webapp/Recall.jsp trunk/src/main/webapp/Redirect.jsp trunk/src/main/webapp/Save.jsp trunk/src/main/webapp/Search.jsp trunk/src/main/webapp/accueil.jsp trunk/src/main/webapp/cancelRedirect.js trunk/src/main/webapp/index.jsp trunk/src/main/webapp/pictureUpload.js trunk/src/main/webapp/reset.jsp trunk/src/main/webapp/selectLanguage.js trunk/src/main/webapp/upload.jsp trunk/src/main/webapp/uploadForm.jsp trunk/src/main/webapp/uploadSuccess.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java trunk/src/main/resources/struts.xml trunk/src/main/webapp/WEB-INF/web.xml Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-07-12 12:40:41 UTC (rev 171) @@ -88,6 +88,9 @@ public String execute() { + if(upload==null) { + return "redirect"; + } badLogin=false; error=false; @@ -161,7 +164,7 @@ } catch (IOException e) { error=true; log.error("Can't copy the file to the checkout directory",e); - return "error"; + return ERROR; } @@ -218,7 +221,7 @@ error=true; //Suppression du repertoire temporaire delTempDirectory(svnSess); - return Action.ERROR; + return ERROR; } @@ -229,7 +232,7 @@ log.info("File upload successful"); } - return Action.SUCCESS; + return SUCCESS; } Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/resources/struts.xml 2011-07-12 12:40:41 UTC (rev 171) @@ -9,51 +9,52 @@ </result-types> <action name="checkout" class="org.nuiton.scmwebeditor.actions.ScmWebEditorMainAction" method="execute"> - <result name="noParameter" >/OutConnection.jsp</result> - <result name="login" >/PrivateSvnRedirect.jsp</result> - <result name="errorPath" >/BadFileRedirect.jsp</result> - <result name="editPage" >/ModificationViewer.jsp</result> + <result name="noParameter" >/WEB-INF/content/outConnection.jsp</result> + <result name="login" >/WEB-INF/content/privateSvnRedirect.jsp</result> + <result name="errorPath" >/WEB-INF/content/badFileRedirect.jsp</result> + <result name="editPage" >/WEB-INF/content/modificationViewer.jsp</result> </action> <action name="commit" class="org.nuiton.scmwebeditor.actions.ScmWebEditorCommitAction" method="execute"> - <result name="success" >/Redirect.jsp</result> - <result name="login" >/ModificationViewer.jsp</result> - <result name="error">/BadFileRedirect.jsp</result> - <result name="errorPath">/BadFileRedirect.jsp</result> + <result name="success" >/WEB-INF/content/redirect.jsp</result> + <result name="login" >/WEB-INF/content/modificationViewer.jsp</result> + <result name="error">/WEB-INF/content/badFileRedirect.jsp</result> + <result name="errorPath">/WEB-INF/content/badFileRedirect.jsp</result> </action> <action name="save" class="org.nuiton.scmwebeditor.actions.SaveAction" method="save"> - <result>/Save.jsp</result> + <result>/WEB-INF/content/save.jsp</result> </action> <action name="reset" class="org.nuiton.scmwebeditor.actions.ResetAction" > - <result>/reset.jsp</result> + <result>/WEB-INF/content/reset.jsp</result> </action> <action name="doUpload" class="org.nuiton.scmwebeditor.actions.UploadAction" > - <result>/uploadSuccess.jsp</result> - <result name="login" >/uploadForm.jsp</result> - <result name="error" >/uploadForm.jsp</result> + <result>/WEB-INF/content/uploadSuccess.jsp</result> + <result name="redirect" >/WEB-INF/content/uploadForm.jsp</result> + <result name="login" >/WEB-INF/content/uploadForm.jsp</result> + <result name="error" >/WEB-INF/content/uploadForm.jsp</result> </action> <action name="uploadFile" class="org.nuiton.scmwebeditor.actions.UploadAction" > - <result>/upload.jsp</result> - <result name="login" >/upload.jsp</result> - <result name="error" >/upload.jsp</result> + <result>/WEB-INF/content/upload.jsp</result> + <result name="login" >/WEB-INF/content/upload.jsp</result> + <result name="error" >/WEB-INF/content/upload.jsp</result> </action> <action name="preview" class="org.nuiton.scmwebeditor.actions.PreviewAction" > - <result>/Preview.jsp</result> + <result>/WEB-INF/content/preview.jsp</result> </action> <action name="search" class="org.nuiton.scmwebeditor.actions.SearchAction" method="search"> <param name="address"/> - <result name="root" >Search.jsp</result> + <result name="root" >/WEB-INF/content/search.jsp</result> <result name="success" type="json"> <param name="root">nodes</param> </result> - <result name="authError" >/LoginSearch.jsp</result> + <result name="authError" >/WEB-INF/content/loginSearch.jsp</result> </action> </package> Deleted: trunk/src/main/webapp/BadFileRedirect.jsp =================================================================== --- trunk/src/main/webapp/BadFileRedirect.jsp 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/BadFileRedirect.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -1,23 +0,0 @@ -<%-- Document : BadFileRedirect Created on : 6 oct. 2009, 15:33:56 -Author : glorieux --%> <%@page contentType="text/html" -pageEncoding="UTF-8"%> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> - -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<title>Error...</title> -<link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> -<link rel="stylesheet" type="text/css" href="css/main.css"> -<meta http-equiv="Refresh" content="3; url=<%=request.getAttribute("projectUrl")%>"> -</head> -<body> -<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> -<p>Bad SCM path or file name! Please correct it.</p> -<p>You should be transferred automatically to the form page. If not -please <a href="<%=request.getAttribute("projectUrl")%>">click -this link</a>.</p> -<p>©2004-2009 CodeLutin</p> -</body> -</html> Deleted: trunk/src/main/webapp/BadUseRedirect.jsp =================================================================== --- trunk/src/main/webapp/BadUseRedirect.jsp 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/BadUseRedirect.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -1,24 +0,0 @@ -<%-- Document : BadFileRedirect Created on : 6 oct. 2009, 15:33:56 -Author : glorieux --%> <%@page contentType="text/html" -pageEncoding="UTF-8"%> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> - -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<title>Error...</title> -<link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> -<link rel="stylesheet" type="text/css" href="css/main.css"> -<meta http-equiv="Refresh" content="3; url= -<%=request.getAttribute("scmEditorUrl")%>"> -</head> -<body> -<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> -<p>Bad Use of ScmWebEditor! Please try again.</p> -<p>You should be transferred automatically to the previous page. If not -please <a href="<%=request.getAttribute("scmEditorUrl")%>">click -this link</a>.</p> -<p>©2004-2009 CodeLutin</p> -</body> -</html> Deleted: trunk/src/main/webapp/Error.jsp =================================================================== --- trunk/src/main/webapp/Error.jsp 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/Error.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -1,22 +0,0 @@ -<%-- Document : Error Created on : 15 sept. 2009, 12:22:29 Author : -glorieux --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> - -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<title>Error</title> -<link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> -<link rel="stylesheet" type="text/css" href="css/main.css"> -<meta http-equiv="Refresh" content="2; - url=" -<%=request.getAttribute("Redirect_url")%>"> -<%--%=request.getAttribute("scmEditorUrl")%>?adresse=<%=request.getAttribute("Svnpath_url")%>&file_name=<%=request.getAttribute("Filename_url")%>&project_url=<%=request.getAttribute("Redirection_url")%>&lang=<%=request.getAttribute("Lang")%>&format=<%=request.getAttribute("Format")%>"--%> -</head> -<body> -<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> -<p>Bad Login or Password. Please Wait.</p> -<p>©2004-2009 CodeLutin</p> -</body> -</html> Deleted: trunk/src/main/webapp/GereSession.js =================================================================== --- trunk/src/main/webapp/GereSession.js 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/GereSession.js 2011-07-12 12:40:41 UTC (rev 171) @@ -1,41 +0,0 @@ -/** - * @author geoffroy lorieux - */ - -function rappelSession(minutes) -{ - var msg='Your session expire on '+minutes+' minute'; - if(minutes>1) - { - msg+='s'; - } - msg+='.\nDo you want to reload this page ?(You will not lose your data)'; - - if(confirm(msg)) - { - location.reload(); - } -} - -/** - * affiche une alerte sur l'expiration de la session et redirige vers une autre page - */ -function expirationSession() -{ - alert("Your session has expire. Please relogin"); - window.history.back(-1); -} - -/** - * affiche des avertissements sur le délai d'expiration de la session : - * - un premier au bout de (expiration-rappel) minutes (par ex. : 20-3 = 17 minutes) - * - un second au bout de (expiration) minutes (par ex. : 20 minutes) - */ -function geresession(expiration, rappel) -{ - // affichage du rappel - var chronoRappel=setTimeout('rappelSession('+rappel+')', (expiration-rappel)*60*1000); - - // une fois le rappel affiché, on avertit uniquement de l'expiration - var chronoExpiration=setTimeout('expirationSession()', (expiration)*60*1000); -} Deleted: trunk/src/main/webapp/LoginSearch.jsp =================================================================== --- trunk/src/main/webapp/LoginSearch.jsp 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/LoginSearch.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -1,28 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> - <%@ taglib prefix="s" uri="/struts-tags"%> - <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> - <sj:head jquerytheme="default"/> - -<div id="search"> - <p>You must be login to see this repository.</p> - <p> - <label>Username : <input type="text" name="username"></input></label><br/> - <label>Password : <input type ="password" name="pw"></input></label><br/> - - <s:url id="ajaxSearchLogin" value="search.action" /> - - <sj:submit - id="ajaxSearchButtonLogin" - formIds="configForm" - targets="htmlcontentSearch" - href="%{ajaxSearchLogin}" - indicator="indicator" - button="true" - buttonIcon="ui-icon-refresh" - value="Login" - > - </sj:submit> - </p> -</div> \ No newline at end of file Deleted: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/ModificationViewer.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -1,247 +0,0 @@ - <%-- Document : ModificationViewer Created on : 10 sept. 2009, 13:43:11 Author : glorieux --%> - <%@page import="org.apache.commons.lang.StringEscapeUtils"%> - <%@page contentType="text/html" pageEncoding="UTF-8"%> - <%@ taglib prefix="s" uri="/struts-tags"%> - <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> - <sj:head jquerytheme="default"/> - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> -<html> -<head> - <title>SCMWebEditor</title> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <script src="selectLanguage.js"></script> - - - <!-- Code mirror --> - <!-- First the CodeMirror stuff --> - <script src="codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.js" type="text/javascript"></script> - <link rel="stylesheet" href="codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.css"> - - <script src="codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.js"></script> - <link rel="stylesheet" href="codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.css"> - - <script src="codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.js"></script> - <link rel="stylesheet" href="codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.css"> - - <link rel="stylesheet" href="codemirror-ui/lib/CodeMirror-2.1/theme/default.css"> - - <script src="codemirror-ui/lib/CodeMirror-2.1/mode/htmlmixed/htmlmixed.js"></script> - <script src="codemirror-ui/lib/CodeMirror-2.1/mode/javascript/javascript.js"></script> - <script src="codemirror-ui/lib/CodeMirror-2.1/mode/css/css.js"></script> - <script src="codemirror-ui/lib/CodeMirror-2.1/mode/xml/xml.js"></script> - - - <!-- Then the CodeMirrorUI stuff --> - <script src="codemirror-ui/js/codemirror-ui.js" type="text/javascript"></script> - <link rel="stylesheet" href="codemirror-ui/css/codemirror-ui.css" type="text/css" media="screen" /> - - - - <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> - <link rel="stylesheet" type="text/css" href="css/main.css"> - - - -</head> -<body onload="geresession(<%=request.getAttribute("InvalidateMaxTime")%>, 5);"> - <a title="ScmWebEditor Project Website" target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="ScmWebEditor logo"/></a> - - <center> - <h2>Welcome on SCMWebEditor</h2> - <% - String typeEditor="null"; - if (request.getAttribute("format")!=null && request.getAttribute("format").equals("rst")){ - %> - <h4>For any Problem with RestruturedText visit <a href="http://docutils.sourceforge.net/rst.html">RST documentation website</a>.</h4> - <% } %> - </center> - - - <form method="post" action=commit.action id="editForm"> - - - - <% - String valueTextarea; - if(request.getAttribute("lastText")!=null) { - valueTextarea = (String) request.getAttribute("lastText"); - } else { - valueTextarea = (String) request.getAttribute("OrigText"); - } - - - %> - - <p>File in editor : <a href="<%=request.getAttribute("address")%>" ><%=request.getAttribute("address")%></a> </p> - <textarea id="newTextId" rows="50" cols="80" name="newText"><%=valueTextarea%></textarea> - - - - <script type="text/javascript"> - var textarea = document.getElementById('newTextId'); - var uiOptions = { path : 'codemirror-ui/js/', searchMode : 'inline' } - var codeMirrorOptions = { mode: "null" } - var editor = new CodeMirrorUI(textarea,uiOptions,codeMirrorOptions); - </script> - - - <label>Language : - <select id="language" name="langageSelection" onchange="changeModeBy(editor,this)"> - <option value="null">Text</option> - <option value="rst">ReStructuredText</option> - <option value="javascript">Javascript</option> - <option value="text/html">HTML</option> - <option value="xml">XML</option> - <option value="text/x-java">JAVA</option> - </select> - </label> - - - - <script type='text/javascript'> - selectLanguage('<%=((String) request.getAttribute("minetype"))%>','<%=request.getAttribute("format")%>' ); - changeModeBy(editor, document.getElementById('language')); - </script> - - - <script type="text/javascript"> - function loadChange(){ - document.getElementById('newTextId').value = editor.mirror.getValue(); - } - </script> - - - - <script src="GereSession.js" type="text/javascript"></script> - <script src="cancelRedirect.js" type="text/javascript"></script> - <script src="pictureUpload.js" type="text/javascript"></script> - <noscript><h4>Javascript is not activated. You can't only use Save and Quit or Reset button.</h4></noscript> - <noscript><h4>For a better use of SCMWebEditor please activate JavaScript.</h4></noscript> - - <div id="form"> - - <div id="htmlcontentCommit"></div> - - <label>Commit Message: <input type="text" name="commitMessage" title="Let a commit message with this file."/></label> - - <%if (request.getAttribute("IsLogin").equals(false) == true){ - %> - <%if (request.getAttribute("badLogin")!=null && request.getAttribute("badLogin").equals(true)) { %> - <p> - <font color="red"> - Bad username or password - </font> - </p> - <% } %> - <p> - - <label ACCESSKEY=U>User name: <input TYPE=text NAME=username SIZE=12 title="Commit Username."/></label> - <label ACCESSKEY=P>Password: <input TYPE=password NAME=pw SIZE=12 title="Commit Password."/></label> </p><% - } else { - %><p>You are log as: <%=request.getAttribute("Login")%></p> - <input type="hidden" NAME=username /> - <input type="hidden" NAME=pw /><% - }%> - <input type="hidden" name="address" value="<%=request.getAttribute("address")%>"/> - <input type="hidden" name="origText" value="<%=request.getAttribute("OrigText")%>"/> - <% if(request.getAttribute("lastText")!=null) { %> - <input type="hidden" name="lastText" value="<%=request.getAttribute("lastText")%>" /> - <% } %> - <input type="hidden" name="scmEditorUrl" value="<%=request.getAttribute("scmEditorUrl")%>"/> - - <s:url id="ajaxCommit" value="save.action" /> - - <sj:submit onclick="loadChange()" - id="ajaxSaveButton" - formIds="editForm" - targets="htmlcontentCommit" - href="%{ajaxCommit}" - indicator="indicator" - button="true" - buttonIcon="ui-icon-refresh" - value="Save and Continue Editing" - title="Commit modifications and continue editing the file" - > - </sj:submit> - - <input title="Save this file and go back to previous page." type="submit" value="Save and Quit" name="Save"/> - - <%if (request.getAttribute("format")!=null && request.getAttribute("format")!=null && request.getAttribute("format").equals("rst") == true){ - %> - <s:url id="ajaxPreview" value="preview.action" /> - - <sj:submit onclick="loadChange()" - id="ajaxPreviewButton" - formIds="editForm" - targets="htmlcontentPreview" - href="%{ajaxPreview}" - button="true" - buttonIcon="ui-icon-refresh" - value="Preview" - > - </sj:submit> - - <%}%> - - <sj:submit - title="Go back to the last revision of the file" - id="resetButton" - targets="resetResult" - value="Reset" - button="true" - href="reset.action" - /> - <div id="resetResult"></div> - - <!-- <input title="Reset text as current repository HEAD revision." type="reset" value="Reset" name="Reset" /> --> - <input type="hidden" value="<%=request.getAttribute("ProjectUrl")%>" name="ProjectUrl"> - <input title="Exit ScmWebEditor without saving." type="button" value="Exit" name="Cancel" onclick="javascript:cancelRedirect(this.form.ProjectUrl);"/> - - - <br/> - - </div> - </form> - <center> - <button title="Upload a file on the repository" onClick="javascript:upload_popup('uploadForm.jsp','upload');" >Upload</button> - </center> - - <div> - - - </div> - - - <!-- - <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> - - </s:form> - </div> - --> - - <div id="targetContentUpload"></div> - - - <div id="htmlcontentPreview"></div> - - - <p align="right">©2004-2009 CodeLutin</p> -</body> -</html> Deleted: trunk/src/main/webapp/OutConnection.jsp =================================================================== --- trunk/src/main/webapp/OutConnection.jsp 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/OutConnection.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -1,67 +0,0 @@ -<%-- Document : OutConnection Created on : 6 oct. 2009, 12:07:27 Author: glorieux --%> -<%@page contentType="text/html" pageEncoding="UTF-8"%> - <%@ taglib prefix="s" uri="/struts-tags"%> - <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> - <%@ taglib prefix="sjt" uri="/struts-jquery-tree-tags" %> - <sj:head jquerytheme="default"/> - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> - -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> -<link rel="stylesheet" type="text/css" href="css/main.css"> -<title>SCM Web Editor</title> -</head> -<body> -<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> -<center> -<h2>Welcome on SCMWebEditor</h2> -<noscript><h4>Javascript is not activated. Please activate it for a fully use of ScmWebEditor.</h4></noscript> -<h4> -Please complete this form for application using. -</h4> -</center> - -<form id="configForm" method="get" action="checkout.action"> -<center> - <p><label>SCM path: <input TYPE=text name="address" SIZE=100></label> - - <s:url id="ajaxSearch" value="search.action" /> - - <sj:submit - id="ajaxSearchButton" - formIds="configForm" - targets="htmlcontentSearch" - href="%{ajaxSearch}" - indicator="indicator" - button="true" - buttonIcon="ui-icon-refresh" - value="Search" - > - </sj:submit> - - <input type="submit" name="Save" /> - </p> -</center> -<div id="htmlcontentSearch" ></div> -</form> - -<!-- - <div id="searchTree"> - - <s:url id="searchTreeUrl" action="search?address=http://localhost/scmsvn"/> - - <sjt:tree id="svnTree" - jstreetheme="classic" - href="%{searchTreeUrl}" - onClickTopics="treeClicked"/> - - </div> - --> - -<p align="right">©2004-2009 CodeLutin</p> -</body> -</html> Deleted: trunk/src/main/webapp/Preview.jsp =================================================================== --- trunk/src/main/webapp/Preview.jsp 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/Preview.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -1,10 +0,0 @@ - <%@ taglib prefix="s" uri="/struts-tags"%> - <%@page contentType="text/html" pageEncoding="UTF-8"%> - <%--Title and div for rst preview--%> - <h3 id="prevtitle" >Preview :</h3> - - <div id="prev" title="Preview"> - <div id="preview" > - <s:property value="XMLResponse" escapeHtml="false"/> - </div> - </div> Deleted: trunk/src/main/webapp/PrivateSvnRedirect.jsp =================================================================== --- trunk/src/main/webapp/PrivateSvnRedirect.jsp 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/PrivateSvnRedirect.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -1,29 +0,0 @@ -<%-- Document : PrivateSvnRedirect Created on : 30 sept. 2009, 14:05:43 -Author : glorieux --%> <%@page contentType="text/html" -pageEncoding="UTF-8"%> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> - -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<title>Private Scm</title> -<link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> -<link rel="stylesheet" type="text/css" href="css/main.css"> -</head> -<body> -<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> -<form method="post" action="checkout.action" > -<input type="hidden" name="address" value="<%=request.getAttribute("address")%>"/> -<input type="hidden" name="projectUrl" value="<%=request.getAttribute("projectUrl")%>"/> -<script src="cancelRedirect.js"></script> -<p>You try to access a Private SCM. Please login</p> -<p><label ACCESSKEY=U>User name: <input TYPE=text - NAME=username SIZE=12></label> <label ACCESSKEY=P>Password: <input - TYPE=password NAME=pw SIZE=12></label></p> -<input type="submit" value="Submit" name="Save" /> <input type="button" - value="Exit" name="Cancel" - onclick="cancelRedirect(this.form.projectUrl);" /></form> -<p>©2004-2009 CodeLutin</p> -</body> -</html> \ No newline at end of file Deleted: trunk/src/main/webapp/Recall.jsp =================================================================== --- trunk/src/main/webapp/Recall.jsp 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/Recall.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -1,13 +0,0 @@ -<%-- Document : Recall Created on : 30 sept. 2009, 17:05:40 Author : -glorieux --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> - -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<title>Redirect...</title> -<meta http-equiv="Refresh" content="0; url= -<%=request.getAttribute("Redirect_url")%>"> -</head> -</html> Deleted: trunk/src/main/webapp/Redirect.jsp =================================================================== --- trunk/src/main/webapp/Redirect.jsp 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/Redirect.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -1,23 +0,0 @@ -<%-- Document : Redirect Created on : 10 sept. 2009, 13:43:11 Author : -glorieux --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> - -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<title>Redirection...</title> -<link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> -<link rel="stylesheet" type="text/css" href="css/main.css"> -<meta http-equiv="Refresh" content="2; url= -<%=request.getAttribute("Redirection_url")%>"> -</head> -<body> -<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> -<p>Thank you using RSTEditor</p> -<p>You should be transferred automatically to the new page. If not -please <a href="<%=request.getAttribute("Redirection_url")%>">click -this link</a>.</p> -<p>©2004-2009 CodeLutin</p> -</body> -</html> Deleted: trunk/src/main/webapp/Save.jsp =================================================================== --- trunk/src/main/webapp/Save.jsp 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/Save.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -1,17 +0,0 @@ - <%@ taglib prefix="s" uri="/struts-tags"%> - <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> - - - - <s:if test="result=='authError'" > - <h4> <font color="red"> Bad username or password, can't save modification</font> </h4> - </s:if> - <s:elseif test="result=='error'" > - <h4> Can't save modification </h4> - </s:elseif> - <s:elseif test="result=='uselessSave'" > - <h4> It's useless to save the file, file is not modify</h4> - </s:elseif> - <s:else> - <h4>Last change save <s:property value="formatDate" /> </h4> - </s:else> \ No newline at end of file Deleted: trunk/src/main/webapp/Search.jsp =================================================================== --- trunk/src/main/webapp/Search.jsp 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/Search.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -1,49 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@page import="org.nuiton.scmwebeditor.actions.SearchAction"%> -<%@page import="java.util.LinkedList" %> -<%@page import="java.util.Iterator" %> - - - <%@ taglib prefix="s" uri="/struts-tags"%> - <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> - <%@ taglib prefix="sjt" uri="/struts-jquery-tree-tags" %> - - <sj:head debug="true" jquerytheme="default"/> - -<script> -$.subscribe('treeClicked', function(event, data) { - var item = event.originalEvent.data.rslt.obj; - - if(item.text().indexOf("/") == -1) { - document.location.href=("checkout.action?address="+item.attr("id")); - } - -}); - -</script> - - <div id="searchTree"> - <s:set name="address"> - <s:property value="address"/> - </s:set> - <s:set name="username"> - <s:property value="username"/> - </s:set> - <s:set name="pw"> - <s:property value="pw"/> - </s:set> - - - <s:url id="searchTreeUrl" action="search?address=%{address}&username=%{username}&pw=%{pw}" /> - <sjt:tree id="svnTree" - htmlTitles="true" - jstreetheme="classic" - href="%{searchTreeUrl}" - onClickTopics="treeClicked" - /> - - </div> - - <s:label name="error"></s:label> - Added: trunk/src/main/webapp/WEB-INF/content/accueil.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/accueil.jsp (rev 0) +++ trunk/src/main/webapp/WEB-INF/content/accueil.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,3 @@ +<%@ page contentType="text/html; charset=UTF-8" %> + + <p>Parametres detectés</p> Added: trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp (rev 0) +++ trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,23 @@ +<%-- Document : BadFileRedirect Created on : 6 oct. 2009, 15:33:56 +Author : glorieux --%> <%@page contentType="text/html" +pageEncoding="UTF-8"%> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> + +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>Error...</title> +<link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> +<link rel="stylesheet" type="text/css" href="css/main.css"> +<meta http-equiv="Refresh" content="3; url=<%=request.getAttribute("projectUrl")%>"> +</head> +<body> +<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> +<p>Bad SCM path or file name! Please correct it.</p> +<p>You should be transferred automatically to the form page. If not +please <a href="<%=request.getAttribute("projectUrl")%>">click +this link</a>.</p> +<p>©2004-2009 CodeLutin</p> +</body> +</html> Added: trunk/src/main/webapp/WEB-INF/content/badUseRedirect.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/badUseRedirect.jsp (rev 0) +++ trunk/src/main/webapp/WEB-INF/content/badUseRedirect.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,24 @@ +<%-- Document : BadFileRedirect Created on : 6 oct. 2009, 15:33:56 +Author : glorieux --%> <%@page contentType="text/html" +pageEncoding="UTF-8"%> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> + +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>Error...</title> +<link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> +<link rel="stylesheet" type="text/css" href="css/main.css"> +<meta http-equiv="Refresh" content="3; url= +<%=request.getAttribute("scmEditorUrl")%>"> +</head> +<body> +<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> +<p>Bad Use of ScmWebEditor! Please try again.</p> +<p>You should be transferred automatically to the previous page. If not +please <a href="<%=request.getAttribute("scmEditorUrl")%>">click +this link</a>.</p> +<p>©2004-2009 CodeLutin</p> +</body> +</html> Added: trunk/src/main/webapp/WEB-INF/content/error.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/error.jsp (rev 0) +++ trunk/src/main/webapp/WEB-INF/content/error.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,22 @@ +<%-- Document : Error Created on : 15 sept. 2009, 12:22:29 Author : +glorieux --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> + +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>Error</title> +<link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> +<link rel="stylesheet" type="text/css" href="css/main.css"> +<meta http-equiv="Refresh" content="2; + url=" +<%=request.getAttribute("Redirect_url")%>"> +<%--%=request.getAttribute("scmEditorUrl")%>?adresse=<%=request.getAttribute("Svnpath_url")%>&file_name=<%=request.getAttribute("Filename_url")%>&project_url=<%=request.getAttribute("Redirection_url")%>&lang=<%=request.getAttribute("Lang")%>&format=<%=request.getAttribute("Format")%>"--%> +</head> +<body> +<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> +<p>Bad Login or Password. Please Wait.</p> +<p>©2004-2009 CodeLutin</p> +</body> +</html> Added: trunk/src/main/webapp/WEB-INF/content/index.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/index.jsp (rev 0) +++ trunk/src/main/webapp/WEB-INF/content/index.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,3 @@ +<% +response.sendRedirect("checkout.action"); +%> \ No newline at end of file Added: trunk/src/main/webapp/WEB-INF/content/loginSearch.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/loginSearch.jsp (rev 0) +++ trunk/src/main/webapp/WEB-INF/content/loginSearch.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,28 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> + <%@ taglib prefix="s" uri="/struts-tags"%> + <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> + <sj:head jquerytheme="default"/> + +<div id="search"> + <p>You must be login to see this repository.</p> + <p> + <label>Username : <input type="text" name="username"></input></label><br/> + <label>Password : <input type ="password" name="pw"></input></label><br/> + + <s:url id="ajaxSearchLogin" value="search.action" /> + + <sj:submit + id="ajaxSearchButtonLogin" + formIds="configForm" + targets="htmlcontentSearch" + href="%{ajaxSearchLogin}" + indicator="indicator" + button="true" + buttonIcon="ui-icon-refresh" + value="Login" + > + </sj:submit> + </p> +</div> \ No newline at end of file Added: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp (rev 0) +++ trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,247 @@ + <%-- Document : ModificationViewer Created on : 10 sept. 2009, 13:43:11 Author : glorieux --%> + <%@page import="org.apache.commons.lang.StringEscapeUtils"%> + <%@page contentType="text/html" pageEncoding="UTF-8"%> + <%@ taglib prefix="s" uri="/struts-tags"%> + <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> + <sj:head jquerytheme="default"/> + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> + <title>SCMWebEditor</title> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <script type="text/javascript" src="js/selectLanguage.js"></script> + + + <!-- Code mirror --> + <!-- First the CodeMirror stuff --> + <script src="codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.js" type="text/javascript"></script> + <link rel="stylesheet" href="codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.css"> + + <script src="codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.js"></script> + <link rel="stylesheet" href="codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.css"> + + <script src="codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.js"></script> + <link rel="stylesheet" href="codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.css"> + + <link rel="stylesheet" href="codemirror-ui/lib/CodeMirror-2.1/theme/default.css"> + + <script src="codemirror-ui/lib/CodeMirror-2.1/mode/htmlmixed/htmlmixed.js"></script> + <script src="codemirror-ui/lib/CodeMirror-2.1/mode/javascript/javascript.js"></script> + <script src="codemirror-ui/lib/CodeMirror-2.1/mode/css/css.js"></script> + <script src="codemirror-ui/lib/CodeMirror-2.1/mode/xml/xml.js"></script> + + + <!-- Then the CodeMirrorUI stuff --> + <script src="codemirror-ui/js/codemirror-ui.js" type="text/javascript"></script> + <link rel="stylesheet" href="codemirror-ui/css/codemirror-ui.css" type="text/css" media="screen" /> + + + + <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> + <link rel="stylesheet" type="text/css" href="css/main.css"> + + + +</head> +<body onload="geresession(<%=request.getAttribute("InvalidateMaxTime")%>, 5);"> + <a title="ScmWebEditor Project Website" target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="ScmWebEditor logo"/></a> + + <center> + <h2>Welcome on SCMWebEditor</h2> + <% + String typeEditor="null"; + if (request.getAttribute("format")!=null && request.getAttribute("format").equals("rst")){ + %> + <h4>For any Problem with RestruturedText visit <a href="http://docutils.sourceforge.net/rst.html">RST documentation website</a>.</h4> + <% } %> + </center> + + + <form method="post" action=commit.action id="editForm"> + + + + <% + String valueTextarea; + if(request.getAttribute("lastText")!=null) { + valueTextarea = (String) request.getAttribute("lastText"); + } else { + valueTextarea = (String) request.getAttribute("OrigText"); + } + + + %> + + <p>File in editor : <a href="<%=request.getAttribute("address")%>" ><%=request.getAttribute("address")%></a> </p> + <textarea id="newTextId" rows="50" cols="80" name="newText"><%=valueTextarea%></textarea> + + + + <script type="text/javascript"> + var textarea = document.getElementById('newTextId'); + var uiOptions = { path : 'codemirror-ui/js/', searchMode : 'inline' } + var codeMirrorOptions = { mode: "null" } + var editor = new CodeMirrorUI(textarea,uiOptions,codeMirrorOptions); + </script> + + + <label>Language : + <select id="language" name="langageSelection" onchange="changeModeBy(editor,this)"> + <option value="null">Text</option> + <option value="rst">ReStructuredText</option> + <option value="javascript">Javascript</option> + <option value="text/html">HTML</option> + <option value="xml">XML</option> + <option value="text/x-java">JAVA</option> + </select> + </label> + + + + <script type='text/javascript'> + selectLanguage('<%=((String) request.getAttribute("minetype"))%>','<%=request.getAttribute("format")%>' ); + changeModeBy(editor, document.getElementById('language')); + </script> + + + <script type="text/javascript"> + function loadChange(){ + document.getElementById('newTextId').value = editor.mirror.getValue(); + } + </script> + + + + <script src="js/gereSession.js" type="text/javascript"></script> + <script src="js/cancelRedirect.js" type="text/javascript"></script> + <script src="js/pictureUpload.js" type="text/javascript"></script> + <noscript><h4>Javascript is not activated. You can't only use Save and Quit or Reset button.</h4></noscript> + <noscript><h4>For a better use of SCMWebEditor please activate JavaScript.</h4></noscript> + + <div id="form"> + + <div id="htmlcontentCommit"></div> + + <label>Commit Message: <input type="text" name="commitMessage" title="Let a commit message with this file."/></label> + + <%if (request.getAttribute("IsLogin").equals(false) == true){ + %> + <%if (request.getAttribute("badLogin")!=null && request.getAttribute("badLogin").equals(true)) { %> + <p> + <font color="red"> + Bad username or password + </font> + </p> + <% } %> + <p> + + <label ACCESSKEY=U>User name: <input TYPE=text NAME=username SIZE=12 title="Commit Username."/></label> + <label ACCESSKEY=P>Password: <input TYPE=password NAME=pw SIZE=12 title="Commit Password."/></label> </p><% + } else { + %><p>You are log as: <%=request.getAttribute("Login")%></p> + <input type="hidden" NAME=username /> + <input type="hidden" NAME=pw /><% + }%> + <input type="hidden" name="address" value="<%=request.getAttribute("address")%>"/> + <input type="hidden" name="origText" value="<%=request.getAttribute("OrigText")%>"/> + <% if(request.getAttribute("lastText")!=null) { %> + <input type="hidden" name="lastText" value="<%=request.getAttribute("lastText")%>" /> + <% } %> + <input type="hidden" name="scmEditorUrl" value="<%=request.getAttribute("scmEditorUrl")%>"/> + + <s:url id="ajaxCommit" value="save.action" /> + + <sj:submit onclick="loadChange()" + id="ajaxSaveButton" + formIds="editForm" + targets="htmlcontentCommit" + href="%{ajaxCommit}" + indicator="indicator" + button="true" + buttonIcon="ui-icon-refresh" + value="Save and Continue Editing" + title="Commit modifications and continue editing the file" + > + </sj:submit> + + <input title="Save this file and go back to previous page." type="submit" value="Save and Quit" name="Save"/> + + <%if (request.getAttribute("format")!=null && request.getAttribute("format")!=null && request.getAttribute("format").equals("rst") == true){ + %> + <s:url id="ajaxPreview" value="preview.action" /> + + <sj:submit onclick="loadChange()" + id="ajaxPreviewButton" + formIds="editForm" + targets="htmlcontentPreview" + href="%{ajaxPreview}" + button="true" + buttonIcon="ui-icon-refresh" + value="Preview" + > + </sj:submit> + + <%}%> + + <sj:submit + title="Go back to the last revision of the file" + id="resetButton" + targets="resetResult" + value="Reset" + button="true" + href="reset.action" + /> + <div id="resetResult"></div> + + <!-- <input title="Reset text as current repository HEAD revision." type="reset" value="Reset" name="Reset" /> --> + <input type="hidden" value="<%=request.getAttribute("ProjectUrl")%>" name="ProjectUrl"> + <input title="Exit ScmWebEditor without saving." type="button" value="Exit" name="Cancel" onclick="javascript:cancelRedirect(this.form.ProjectUrl);"/> + + + <br/> + + </div> + </form> + <center> + <button title="Upload a file on the repository" onClick="javascript:upload_popup('doUpload.action','upload');" >Upload</button> + </center> + + <div> + + + </div> + + + <!-- + <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> + + </s:form> + </div> + --> + + <div id="targetContentUpload"></div> + + + <div id="htmlcontentPreview"></div> + + + <p align="right">©2004-2009 CodeLutin</p> +</body> +</html> Added: trunk/src/main/webapp/WEB-INF/content/outConnection.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/outConnection.jsp (rev 0) +++ trunk/src/main/webapp/WEB-INF/content/outConnection.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,67 @@ +<%-- Document : OutConnection Created on : 6 oct. 2009, 12:07:27 Author: glorieux --%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> + <%@ taglib prefix="s" uri="/struts-tags"%> + <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> + <%@ taglib prefix="sjt" uri="/struts-jquery-tree-tags" %> + <sj:head jquerytheme="default"/> + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> + +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> +<link rel="stylesheet" type="text/css" href="css/main.css"> +<title>SCM Web Editor</title> +</head> +<body> +<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> +<center> +<h2>Welcome on SCMWebEditor</h2> +<noscript><h4>Javascript is not activated. Please activate it for a fully use of ScmWebEditor.</h4></noscript> +<h4> +Please complete this form for application using. +</h4> +</center> + +<form id="configForm" method="get" action="checkout.action"> +<center> + <p><label>SCM path: <input TYPE=text name="address" SIZE=100></label> + + <s:url id="ajaxSearch" value="search.action" /> + + <sj:submit + id="ajaxSearchButton" + formIds="configForm" + targets="htmlcontentSearch" + href="%{ajaxSearch}" + indicator="indicator" + button="true" + buttonIcon="ui-icon-refresh" + value="Search" + > + </sj:submit> + + <input type="submit" name="Save" /> + </p> +</center> +<div id="htmlcontentSearch" ></div> +</form> + +<!-- + <div id="searchTree"> + + <s:url id="searchTreeUrl" action="search?address=http://localhost/scmsvn"/> + + <sjt:tree id="svnTree" + jstreetheme="classic" + href="%{searchTreeUrl}" + onClickTopics="treeClicked"/> + + </div> + --> + +<p align="right">©2004-2009 CodeLutin</p> +</body> +</html> Added: trunk/src/main/webapp/WEB-INF/content/preview.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/preview.jsp (rev 0) +++ trunk/src/main/webapp/WEB-INF/content/preview.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,10 @@ + <%@ taglib prefix="s" uri="/struts-tags"%> + <%@page contentType="text/html" pageEncoding="UTF-8"%> + <%--Title and div for rst preview--%> + <h3 id="prevtitle" >Preview :</h3> + + <div id="prev" title="Preview"> + <div id="preview" > + <s:property value="XMLResponse" escapeHtml="false"/> + </div> + </div> Added: trunk/src/main/webapp/WEB-INF/content/privateSvnRedirect.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/privateSvnRedirect.jsp (rev 0) +++ trunk/src/main/webapp/WEB-INF/content/privateSvnRedirect.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,29 @@ +<%-- Document : PrivateSvnRedirect Created on : 30 sept. 2009, 14:05:43 +Author : glorieux --%> <%@page contentType="text/html" +pageEncoding="UTF-8"%> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> + +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>Private Scm</title> +<link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> +<link rel="stylesheet" type="text/css" href="css/main.css"> +</head> +<body> +<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> +<form method="post" action="checkout.action" > +<input type="hidden" name="address" value="<%=request.getAttribute("address")%>"/> +<input type="hidden" name="projectUrl" value="<%=request.getAttribute("projectUrl")%>"/> +<script src="cancelRedirect.js"></script> +<p>You try to access a Private SCM. Please login</p> +<p><label ACCESSKEY=U>User name: <input TYPE=text + NAME=username SIZE=12></label> <label ACCESSKEY=P>Password: <input + TYPE=password NAME=pw SIZE=12></label></p> +<input type="submit" value="Submit" name="Save" /> <input type="button" + value="Exit" name="Cancel" + onclick="cancelRedirect(this.form.projectUrl);" /></form> +<p>©2004-2009 CodeLutin</p> +</body> +</html> \ No newline at end of file Added: trunk/src/main/webapp/WEB-INF/content/recall.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/recall.jsp (rev 0) +++ trunk/src/main/webapp/WEB-INF/content/recall.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,13 @@ +<%-- Document : Recall Created on : 30 sept. 2009, 17:05:40 Author : +glorieux --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> + +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>Redirect...</title> +<meta http-equiv="Refresh" content="0; url= +<%=request.getAttribute("Redirect_url")%>"> +</head> +</html> Added: trunk/src/main/webapp/WEB-INF/content/redirect.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/redirect.jsp (rev 0) +++ trunk/src/main/webapp/WEB-INF/content/redirect.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,23 @@ +<%-- Document : Redirect Created on : 10 sept. 2009, 13:43:11 Author : +glorieux --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> + +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>Redirection...</title> +<link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> +<link rel="stylesheet" type="text/css" href="css/main.css"> +<meta http-equiv="Refresh" content="2; url= +<%=request.getAttribute("Redirection_url")%>"> +</head> +<body> +<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> +<p>Thank you using RSTEditor</p> +<p>You should be transferred automatically to the new page. If not +please <a href="<%=request.getAttribute("Redirection_url")%>">click +this link</a>.</p> +<p>©2004-2009 CodeLutin</p> +</body> +</html> Added: trunk/src/main/webapp/WEB-INF/content/reset.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/reset.jsp (rev 0) +++ trunk/src/main/webapp/WEB-INF/content/reset.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,12 @@ +<%@ taglib prefix="s" uri="/struts-tags"%> + + <s:set name="lastRevision"> + <s:property value="lastRevision"/> + </s:set> + + <s:hidden id="valueOfLastRevision" value="%{lastRevision}" /> + <script type="text/javascript"> + + editor.mirror.setValue(document.getElementById('valueOfLastRevision').value); + + </script> \ No newline at end of file Added: trunk/src/main/webapp/WEB-INF/content/save.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/save.jsp (rev 0) +++ trunk/src/main/webapp/WEB-INF/content/save.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,17 @@ + <%@ taglib prefix="s" uri="/struts-tags"%> + <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> + + + + <s:if test="result=='authError'" > + <h4> <font color="red"> Bad username or password, can't save modification</font> </h4> + </s:if> + <s:elseif test="result=='error'" > + <h4> Can't save modification </h4> + </s:elseif> + <s:elseif test="result=='uselessSave'" > + <h4> It's useless to save the file, file is not modify</h4> + </s:elseif> + <s:else> + <h4>Last change save <s:property value="formatDate" /> </h4> + </s:else> \ No newline at end of file Added: trunk/src/main/webapp/WEB-INF/content/search.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/search.jsp (rev 0) +++ trunk/src/main/webapp/WEB-INF/content/search.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,49 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@page import="org.nuiton.scmwebeditor.actions.SearchAction"%> +<%@page import="java.util.LinkedList" %> +<%@page import="java.util.Iterator" %> + + + <%@ taglib prefix="s" uri="/struts-tags"%> + <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> + <%@ taglib prefix="sjt" uri="/struts-jquery-tree-tags" %> + + <sj:head debug="true" jquerytheme="default"/> + +<script> +$.subscribe('treeClicked', function(event, data) { + var item = event.originalEvent.data.rslt.obj; + + if(item.text().indexOf("/") == -1) { + document.location.href=("checkout.action?address="+item.attr("id")); + } + +}); + +</script> + + <div id="searchTree"> + <s:set name="address"> + <s:property value="address"/> + </s:set> + <s:set name="username"> + <s:property value="username"/> + </s:set> + <s:set name="pw"> + <s:property value="pw"/> + </s:set> + + + <s:url id="searchTreeUrl" action="search?address=%{address}&username=%{username}&pw=%{pw}" /> + <sjt:tree id="svnTree" + htmlTitles="true" + jstreetheme="classic" + href="%{searchTreeUrl}" + onClickTopics="treeClicked" + /> + + </div> + + <s:label name="error"></s:label> + Added: trunk/src/main/webapp/WEB-INF/content/upload.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/upload.jsp (rev 0) +++ trunk/src/main/webapp/WEB-INF/content/upload.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,14 @@ +<%@ taglib prefix="s" uri="/struts-tags"%> + +<p>Result : </p> + + + <s:if test="badLogin"> + <p><font color="red">Bad username or password</font></p> + </s:if> + <s:elseif test="error"> + <p><font color="red">Erreur SVN</font></p> + </s:elseif> + <s:else> + <p>File upload successful</p> + </s:else> \ No newline at end of file Added: trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp (rev 0) +++ trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,28 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + <%@ taglib prefix="s" uri="/struts-tags"%> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>UploadFile</title> +</head> +<body> + + <form method="POST" id="uploadForm" action="doUpload" 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/> + + <s:if test="badLogin"> + <p><font color="red">Bad username or password</font></p> + </s:if> + <s:elseif test="error"> + <p><font color="red">Erreur SVN</font></p> + </s:elseif> + <input type="submit"/> + </form> + +</body> +</html> \ No newline at end of file Added: trunk/src/main/webapp/WEB-INF/content/uploadSuccess.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/uploadSuccess.jsp (rev 0) +++ trunk/src/main/webapp/WEB-INF/content/uploadSuccess.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,15 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>Success</title> +</head> +<body> +<p>File upload successful</p> + <form> + <input type="button" value="close" onclick="window.close()"> + </form> +</body> +</html> \ No newline at end of file Modified: trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/src/main/webapp/WEB-INF/web.xml 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/WEB-INF/web.xml 2011-07-12 12:40:41 UTC (rev 171) @@ -15,7 +15,7 @@ <welcome-file-list> - <welcome-file>index.jsp</welcome-file> + <welcome-file>/WEB-INF/content/index.jsp</welcome-file> </welcome-file-list> <listener> Deleted: trunk/src/main/webapp/accueil.jsp =================================================================== --- trunk/src/main/webapp/accueil.jsp 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/accueil.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -1,3 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" %> - - <p>Parametres detectés</p> Deleted: trunk/src/main/webapp/cancelRedirect.js =================================================================== --- trunk/src/main/webapp/cancelRedirect.js 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/cancelRedirect.js 2011-07-12 12:40:41 UTC (rev 171) @@ -1,11 +0,0 @@ -/** - * @author geoffroy lorieux - */ - - -function cancelRedirect(url) - { - if (confirm("Exit SCMWebEditor ?")){ - window.location.replace(url.value); - } - } \ No newline at end of file Deleted: trunk/src/main/webapp/index.jsp =================================================================== --- trunk/src/main/webapp/index.jsp 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/index.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -1,3 +0,0 @@ -<% -response.sendRedirect("checkout.action"); -%> \ No newline at end of file Added: trunk/src/main/webapp/js/cancelRedirect.js =================================================================== --- trunk/src/main/webapp/js/cancelRedirect.js (rev 0) +++ trunk/src/main/webapp/js/cancelRedirect.js 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,11 @@ +/** + * @author geoffroy lorieux + */ + + +function cancelRedirect(url) + { + if (confirm("Exit SCMWebEditor ?")){ + window.location.replace(url.value); + } + } \ No newline at end of file Added: trunk/src/main/webapp/js/gereSession.js =================================================================== --- trunk/src/main/webapp/js/gereSession.js (rev 0) +++ trunk/src/main/webapp/js/gereSession.js 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,41 @@ +/** + * @author geoffroy lorieux + */ + +function rappelSession(minutes) +{ + var msg='Your session expire on '+minutes+' minute'; + if(minutes>1) + { + msg+='s'; + } + msg+='.\nDo you want to reload this page ?(You will not lose your data)'; + + if(confirm(msg)) + { + location.reload(); + } +} + +/** + * affiche une alerte sur l'expiration de la session et redirige vers une autre page + */ +function expirationSession() +{ + alert("Your session has expire. Please relogin"); + window.history.back(-1); +} + +/** + * affiche des avertissements sur le délai d'expiration de la session : + * - un premier au bout de (expiration-rappel) minutes (par ex. : 20-3 = 17 minutes) + * - un second au bout de (expiration) minutes (par ex. : 20 minutes) + */ +function geresession(expiration, rappel) +{ + // affichage du rappel + var chronoRappel=setTimeout('rappelSession('+rappel+')', (expiration-rappel)*60*1000); + + // une fois le rappel affiché, on avertit uniquement de l'expiration + var chronoExpiration=setTimeout('expirationSession()', (expiration)*60*1000); +} Added: trunk/src/main/webapp/js/pictureUpload.js =================================================================== --- trunk/src/main/webapp/js/pictureUpload.js (rev 0) +++ trunk/src/main/webapp/js/pictureUpload.js 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,4 @@ +function upload_popup(page, name) +{ +window.open (page, name, config='top=300, left=300, height=300, width=500, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no') +} \ No newline at end of file Added: trunk/src/main/webapp/js/selectLanguage.js =================================================================== --- trunk/src/main/webapp/js/selectLanguage.js (rev 0) +++ trunk/src/main/webapp/js/selectLanguage.js 2011-07-12 12:40:41 UTC (rev 171) @@ -0,0 +1,92 @@ +/** + * + */ + + +function contains(text, test) { + + if(text.indexOf(test) == -1) { + return false; + } + else { + return true; + } +} + + + +function changeModeBy(CodeMirrorEditor, select){ + CodeMirrorEditor.mirror.setOption("mode",select.value); +} + + + +function selectLanguage(minetype, format) { + + var typeEditor = null; + + if(typeEditor==null && minetype!=null) { + + if(contains(minetype, "rst") ) { + typeEditor="rst"; + document.getElementById('language').selectedIndex=1 + } + else if(contains(minetype, "javascript")) { + typeEditor="javascript"; + document.getElementById('language').selectedIndex=2 + } + else if(contains(minetype, "html") ) { + typeEditor="text/html"; + + + document.getElementById('language').selectedIndex=3 + + + } + else if( contains(minetype, "xml") ) { + typeEditor="xml"; + + + document.getElementById('language').selectedIndex=4 + + + } + } + + if (typeEditor==null && format!=null){ + + + if (format==("rst")) { + typeEditor="rst"; + + + document.getElementById('language').selectedIndex=1 +// var element = document.getElementById('language'); +// element.value = "rst"; + + } else if(format==("javascript")) { + typeEditor="javascript"; + + document.getElementById('language').selectedIndex=2 + + } else if(format==("html")) { + typeEditor="text/html"; + + document.getElementById('language').selectedIndex=3 + + } else if(format==("xml")) { + typeEditor="xml"; + + document.getElementById('language').selectedIndex=4 + + } else if(format==("java")) { + typeEditor="text/x-java"; + + document.getElementById('language').selectedIndex=5 + + } + + } + + +} \ No newline at end of file Deleted: trunk/src/main/webapp/pictureUpload.js =================================================================== --- trunk/src/main/webapp/pictureUpload.js 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/pictureUpload.js 2011-07-12 12:40:41 UTC (rev 171) @@ -1,4 +0,0 @@ -function upload_popup(page, name) -{ -window.open (page, name, config='top=300, left=300, height=300, width=500, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no') -} \ No newline at end of file Deleted: trunk/src/main/webapp/reset.jsp =================================================================== --- trunk/src/main/webapp/reset.jsp 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/reset.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -1,12 +0,0 @@ -<%@ taglib prefix="s" uri="/struts-tags"%> - - <s:set name="lastRevision"> - <s:property value="lastRevision"/> - </s:set> - - <s:hidden id="valueOfLastRevision" value="%{lastRevision}" /> - <script type="text/javascript"> - - editor.mirror.setValue(document.getElementById('valueOfLastRevision').value); - - </script> \ No newline at end of file Deleted: trunk/src/main/webapp/selectLanguage.js =================================================================== --- trunk/src/main/webapp/selectLanguage.js 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/selectLanguage.js 2011-07-12 12:40:41 UTC (rev 171) @@ -1,92 +0,0 @@ -/** - * - */ - - -function contains(text, test) { - - if(text.indexOf(test) == -1) { - return false; - } - else { - return true; - } -} - - - -function changeModeBy(CodeMirrorEditor, select){ - CodeMirrorEditor.mirror.setOption("mode",select.value); -} - - - -function selectLanguage(minetype, format) { - - var typeEditor = null; - - if(typeEditor==null && minetype!=null) { - - if(contains(minetype, "rst") ) { - typeEditor="rst"; - document.getElementById('language').selectedIndex=1 - } - else if(contains(minetype, "javascript")) { - typeEditor="javascript"; - document.getElementById('language').selectedIndex=2 - } - else if(contains(minetype, "html") ) { - typeEditor="text/html"; - - - document.getElementById('language').selectedIndex=3 - - - } - else if( contains(minetype, "xml") ) { - typeEditor="xml"; - - - document.getElementById('language').selectedIndex=4 - - - } - } - - if (typeEditor==null && format!=null){ - - - if (format==("rst")) { - typeEditor="rst"; - - - document.getElementById('language').selectedIndex=1 -// var element = document.getElementById('language'); -// element.value = "rst"; - - } else if(format==("javascript")) { - typeEditor="javascript"; - - document.getElementById('language').selectedIndex=2 - - } else if(format==("html")) { - typeEditor="text/html"; - - document.getElementById('language').selectedIndex=3 - - } else if(format==("xml")) { - typeEditor="xml"; - - document.getElementById('language').selectedIndex=4 - - } else if(format==("java")) { - typeEditor="text/x-java"; - - document.getElementById('language').selectedIndex=5 - - } - - } - - -} \ No newline at end of file Deleted: trunk/src/main/webapp/upload.jsp =================================================================== --- trunk/src/main/webapp/upload.jsp 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/upload.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -1,14 +0,0 @@ -<%@ taglib prefix="s" uri="/struts-tags"%> - -<p>Result : </p> - - - <s:if test="badLogin"> - <p><font color="red">Bad username or password</font></p> - </s:if> - <s:elseif test="error"> - <p><font color="red">Erreur SVN</font></p> - </s:elseif> - <s:else> - <p>File upload successful</p> - </s:else> \ No newline at end of file Deleted: trunk/src/main/webapp/uploadForm.jsp =================================================================== --- trunk/src/main/webapp/uploadForm.jsp 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/uploadForm.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -1,28 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - <%@ taglib prefix="s" uri="/struts-tags"%> -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<title>UploadFile</title> -</head> -<body> - - <form method="POST" id="uploadForm" action="doUpload" 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/> - - <s:if test="badLogin"> - <p><font color="red">Bad username or password</font></p> - </s:if> - <s:elseif test="error"> - <p><font color="red">Erreur SVN</font></p> - </s:elseif> - <input type="submit"/> - </form> - -</body> -</html> \ No newline at end of file Deleted: trunk/src/main/webapp/uploadSuccess.jsp =================================================================== --- trunk/src/main/webapp/uploadSuccess.jsp 2011-07-08 10:23:16 UTC (rev 170) +++ trunk/src/main/webapp/uploadSuccess.jsp 2011-07-12 12:40:41 UTC (rev 171) @@ -1,15 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<title>Success</title> -</head> -<body> -<p>File upload successful</p> - <form> - <input type="button" value="close" onclick="window.close()"> - </form> -</body> -</html> \ No newline at end of file