July 2011 - Scmwebeditor-commits - mailman.cloud.codelutin.com

r184 - in trunk/src/main/webapp: WEB-INF/content js
by kcardineaud＠users.nuiton.org 22 Jul '11

22 Jul '11

Author: kcardineaud Date: 2011-07-22 11:31:15 +0200 (Fri, 22 Jul 2011) New Revision: 184 Url: http://nuiton.org/repositories/revision/scmwebeditor/184 Log: Add LaTeX to supported file by codemirror Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp trunk/src/main/webapp/js/selectLanguage.js Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-07-22 09:04:24 UTC (rev 183) +++ trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-07-22 09:31:15 UTC (rev 184) @@ -19,6 +19,8 @@ <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"> @@ -32,6 +34,7 @@ <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> + <script src="codemirror-ui/lib/CodeMirror-2.1/mode/stex/stex.js"></script>  <script src="codemirror-ui/js/codemirror-ui.js" type="text/javascript"></script> @@ -98,6 +101,7 @@ <option value="xml">XML</option> <option value="text/x-java">JAVA</option> <option value="css">CSS</option> + <option value="stex">LaTeX</option> </select> </label> Modified: trunk/src/main/webapp/js/selectLanguage.js =================================================================== --- trunk/src/main/webapp/js/selectLanguage.js 2011-07-22 09:04:24 UTC (rev 183) +++ trunk/src/main/webapp/js/selectLanguage.js 2011-07-22 09:31:15 UTC (rev 184) @@ -44,13 +44,17 @@ document.getElementById('language').selectedIndex=4 } else if( contains(minetype, "java/application") ) { - typeEditor="xml"; + typeEditor="text/x-java"; document.getElementById('language').selectedIndex=5 } else if(contains(minetype, "text/css") ) { typeEditor="css"; document.getElementById('language').selectedIndex=6 } + else if(contains(minetype, "x-tex") ) { + typeEditor="text/stex"; + document.getElementById('language').selectedIndex=7 + } } if (typeEditor==null && format!=null){ @@ -82,10 +86,15 @@ document.getElementById('language').selectedIndex=5 } else if(format==("css")) { - typeEditor="css"; + typeEditor="css"; - document.getElementById('language').selectedIndex=6 + document.getElementById('language').selectedIndex=6 + } else if(format==("tex")) { + typeEditor="text/stex"; + + document.getElementById('language').selectedIndex=7 + } }

1 0

r183 - in trunk/src/main/java/org/nuiton/scmwebeditor: . actions
by kcardineaud＠users.nuiton.org 22 Jul '11

22 Jul '11

Author: kcardineaud Date: 2011-07-22 11:04:24 +0200 (Fri, 22 Jul 2011) New Revision: 183 Url: http://nuiton.org/repositories/revision/scmwebeditor/183 Log: Add some file's types in compatibility list Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-21 08:19:04 UTC (rev 182) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-22 09:04:24 UTC (rev 183) @@ -235,7 +235,7 @@ } - protected String getMineType(File file) throws IOException, SAXException, TikaException { + protected String getMimeType(File file) throws IOException, SAXException, TikaException { InputStream is = new FileInputStream(file); try { BodyContentHandler contenthandler = new BodyContentHandler(); @@ -254,7 +254,7 @@ } } - protected String getMineType(String content, String filename) throws IOException, SAXException, TikaException { + protected String getMimeType(String content, String filename) throws IOException, SAXException, TikaException { InputStream is = new ByteArrayInputStream(content.getBytes()); try { BodyContentHandler contenthandler = new BodyContentHandler(); @@ -274,4 +274,26 @@ } } + protected String[] getMimeTypes(String content, String filename) throws IOException, SAXException, TikaException { + InputStream is = new ByteArrayInputStream(content.getBytes()); + try { + BodyContentHandler contenthandler = new BodyContentHandler(); + Metadata metadata = new Metadata(); + metadata.set(Metadata.RESOURCE_NAME_KEY, filename); + AutoDetectParser parser = new AutoDetectParser(); + parser.parse(is, contenthandler, metadata); + String[] result = metadata.getValues(Metadata.CONTENT_TYPE); + + if(log.isDebugEnabled()) { + log.debug("Mine type of " + filename + " is : " + result); + } + + return result; + } + finally { + is.close(); + } + } + + } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-21 08:19:04 UTC (rev 182) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-22 09:04:24 UTC (rev 183) @@ -2,6 +2,7 @@ import java.io.ByteArrayOutputStream; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; @@ -21,6 +22,7 @@ import org.tmatesoft.svn.core.io.SVNRepositoryFactory; import org.tmatesoft.svn.core.wc.SVNWCUtil; + import com.opensymphony.xwork2.Action; public class ScmWebEditorMainAction extends ScmWebEditorBaseAction implements ServletRequestAware { @@ -123,9 +125,6 @@ HttpSession httpSession = request.getSession(true); - if(log.isInfoEnabled()) { - log.info("IP client : "+request.getRemoteAddr() + " , get file : "+address); - } //SvnSession object creation if doesn't already exist SvnSession svnSess = getSvnSession(httpSession); @@ -204,6 +203,9 @@ request.setAttribute("projectUrl", projectUrl); //Suppression du repertoire temporaire delTempDirectory(svnSess); + if(log.isErrorEnabled()) { + log.error("Error with svn path or file "); + } return "errorPath"; } @@ -232,6 +234,9 @@ request.setAttribute("projectUrl", projectUrl); //Suppression du repertoire temporaire delTempDirectory(svnSess); + if(log.isErrorEnabled()) { + log.error("SVN error ",e); + } return "errorPath"; } @@ -239,26 +244,44 @@ - String mineType =null; + String mimeType =null; try { - mineType = getMineType(originalText, svnSess.getFileName()); + mimeType = getMimeType(originalText, svnSess.getFileName()); } catch (Exception e) { if(log.isErrorEnabled()) { log.error("Can't get MimeType",e); } } + /* + String[] mimeTypes =null; + try { + mimeTypes = getMimeTypes(originalText, svnSess.getFileName()); + + log.info("size : "+mimeTypes.length); + + for (String element : mimeTypes){ + log.info("Type : "+element); + } + } catch (Exception e) { + log.error("tika error",e); + } + */ // Si le fichier n'est pas de type texte, on ne peut pas l'éditer - if(mineType==null || !mineType.matches(".*text.*|.*xml.*|.*javascript.*") ) { + if(mimeType==null || !mimeType.matches(".*text.*|.*xml.*|.*javascript.*|.*sh.*|.*x-tex.*") ) { request.setAttribute("projectUrl", projectUrl); //On supprime le repertoire temporaire delTempDirectory(svnSess); + + if(log.isErrorEnabled()) { + log.error("Can't edit this file, mimetype : "+mimeType); + } return "errorPath"; } else { - request.setAttribute("minetype", mineType); + request.setAttribute("minetype", mimeType); } @@ -277,6 +300,10 @@ request.setAttribute(ATTRIBUTE_SCM_EDITOR_URI, request.getRequestURI()); request.setAttribute(ATTRIBUTE_PREVIEW_SERVLET_URL, request.getContextPath() + "/previewservlet"); + if(log.isInfoEnabled()) { + log.info("IP client : "+request.getRemoteAddr() + " , get file : "+address+ ". File's mimetype : "+mimeType); + } + return "editPage";

1 0

r182 - in trunk: . src/main/resources/i18n src/main/webapp/WEB-INF/content
by kcardineaud＠users.nuiton.org 21 Jul '11

21 Jul '11

Author: kcardineaud Date: 2011-07-21 10:19:04 +0200 (Thu, 21 Jul 2011) New Revision: 182 Url: http://nuiton.org/repositories/revision/scmwebeditor/182 Log: Fix some name in i18n proterties files Modified: trunk/pom.xml trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-20 10:26:16 UTC (rev 181) +++ trunk/pom.xml 2011-07-21 08:19:04 UTC (rev 182) @@ -198,7 +198,7 @@ <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> - <i18n.silent>true</i18n.silent> + <i18n.bundleOutputName>scmwebeditor-i18n</i18n.bundleOutputName> <i18n.bundleOutputPackage/> @@ -233,7 +233,7 @@ <artifactId>maven-i18n-plugin</artifactId> <version>${nuitonI18nVersion}</version> <configuration> - <bundles>fr_FR</bundles> + <bundles>fr_FR,en_GB</bundles> </configuration> <executions> <execution> Modified: trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-07-20 10:26:16 UTC (rev 181) +++ trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-07-21 08:19:04 UTC (rev 182) @@ -1,45 +1,45 @@ -scm.outConnection.search=Search -scm.outConnection.scmPath=SCM path \: -scm.welcome=Welcome on SCMWebEditor -scm.outConnection.noJavascript=Javascript is not activated. Please activate it for a fully use of ScmWebEditor. -scm.outConnection.enterRepo=Please enter your repository address. +scm.FileInEditor=File in editor \: +scm.badPathOrFileName=Bad repository path or file name\! Please correct it. +scm.badUsernameOrPassword=Bad username or password +scm.beTransferred=You should be transferred automatically to the new page. If not please +scm.clickHere=click here +scm.commitMessage=Commit message +scm.commitMessageTitle=let a message for commit +scm.erreurRepo=Error on repository +scm.exit=Exit +scm.exitJavascript=Exit ScmWebEditor without saving ? All modification will be lost. +scm.exitTitle=Exit ScmWebEditor without saving. +scm.formTransferred=You should be transferred automatically to the form page. If not please scm.info.ProblemWithRst=For any Problem with RestruturedText visit scm.info.rstWebsite=RST documentation website scm.language=Language -scm.text=Text +scm.logAs=You are log as \: +scm.loginButton=Login +scm.modificationViewer.betterUseJavascript=For a better use of SCMWebEditor please activate JavaScript. scm.modificationViewer.noJavascript=Javascript is not activated. You can't only use Save and Quit or upload button. -scm.modificationViewer.betterUseJavascript=For a better use of SCMWebEditor please activate JavaScript. -scm.commitMessage=Commit message -scm.username=Username +scm.mustBeLog=You must be login to see this repository. +scm.outConnection.enterRepo=Please enter your repository address. +scm.outConnection.noJavascript=Javascript is not activated. Please activate it for a fully use of ScmWebEditor. +scm.outConnection.scmPath=SCM path \: +scm.outConnection.search=Search scm.password=Password -scm.commitMessageTitle=let a message for commit -scm.FileInEditor=File in editor \: -scm.usernameTitle=Repository username scm.passwordTitle=Repository password -scm.logAs=You are log as \: +scm.preview=Preview +scm.privateScmAccess=You try to access a Private SCM. Please login +scm.redirection=Redirection... +scm.reset=Reset +scm.resetTitle=Go back to the last revision of the file scm.saveAndContinue=Save and Continue Editing scm.saveAndContinueTitle=Commit modifications and continue editing the file. scm.saveAndQuit=Save and quit scm.saveAndQuitTitle=Save this file and go back to previous page. -scm.preview=Preview -scm.reset=Reset -scm.resetTitle=Go back to the last revision of the file -scm.exit=Exit -scm.exitTitle=Exit ScmWebEditor without saving. -scm.exitJavascript=Exit ScmWebEditor without saving ? All modification will be lost. +scm.text=Text +scm.thankUsing=Thank you using SCMWebEditor scm.upload=Upload -scm.uploadTitle=Upload a file on the repository scm.uploadFile=File Url scm.uploadPath=Path on Repository -scm.badUsernameOrPassword=Bad username or password -scm.erreurRepo=Error on repository scm.uploadSuccess=File upload successful -scm.mustBeLog=You must be login to see this repository. -scm.loginButton=Login -scm.privateScmAccess=You try to access a Private SCM. Please login -scm.thankUsing=Thank you using SCMWebEditor -scm.beTransferred=You should be transferred automatically to the new page. If not please -scm.clickHere=click here -scm.redirection=Redirection... -badPathOrFileName=Bad repository path or file name! Please correct it. -scm.formTransferred=You should be transferred automatically to the form page. If not please \ No newline at end of file +scm.uploadTitle=Upload a file on the repository +scm.username=Username +scm.usernameTitle=Repository username +scm.welcome=Welcome on SCMWebEditor Modified: trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-20 10:26:16 UTC (rev 181) +++ trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-21 08:19:04 UTC (rev 182) @@ -1,5 +1,5 @@ -badPathOrFileName=L''adresse du depot ou le nom du fichier est incorrect \! scm.FileInEditor=Fichier dans l''editeur \: +scm.badPathOrFileName=L''adresse du depot ou le nom du fichier est incorrect \! scm.badUsernameOrPassword=Identifiant ou mot de passe incorrect scm.beTransferred=Vous devrais être redirige sur une nouvelle page. si non scm.clickHere=cliquez ici Modified: trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp 2011-07-20 10:26:16 UTC (rev 181) +++ trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp 2011-07-21 08:19:04 UTC (rev 182) @@ -15,7 +15,7 @@ </head> <body> <a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> -<p><s:text name="badPathOrFileName" /></p> +<p><s:text name="scm.badPathOrFileName" /></p> <p><s:text name="scm.formTransferred" /> <a href="<%=request.getAttribute("projectUrl")%>"> <s:text name="scm.clickHere" /></a>.</p> <p>©2004-2009 CodeLutin</p>

1 0

r181 - in trunk/src/main: resources webapp/WEB-INF/content webapp/js
by kcardineaud＠users.nuiton.org 20 Jul '11

20 Jul '11

Author: kcardineaud Date: 2011-07-20 12:26:16 +0200 (Wed, 20 Jul 2011) New Revision: 181 Url: http://nuiton.org/repositories/revision/scmwebeditor/181 Log: Add CSS to support language Modified: trunk/src/main/resources/log4j.properties trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp trunk/src/main/webapp/js/selectLanguage.js Modified: trunk/src/main/resources/log4j.properties =================================================================== --- trunk/src/main/resources/log4j.properties 2011-07-20 09:49:00 UTC (rev 180) +++ trunk/src/main/resources/log4j.properties 2011-07-20 10:26:16 UTC (rev 181) @@ -25,6 +25,8 @@ #log4j.appender.rolling.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n # package level +#log4j.logger.org.nuiton.scmwebeditor.actions=DEBUG + #log4j.logger.org.chorem.jtimer=DEBUG #log4j.logger.org.chorem.jtimer.ws=DEBUG #log4j.logger.org.chorem.jtimer.ui.report=DEBUG Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-07-20 09:49:00 UTC (rev 180) +++ trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-07-20 10:26:16 UTC (rev 181) @@ -97,6 +97,7 @@ <option value="text/html">HTML</option> <option value="xml">XML</option> <option value="text/x-java">JAVA</option> + <option value="css">CSS</option> </select> </label> Modified: trunk/src/main/webapp/js/selectLanguage.js =================================================================== --- trunk/src/main/webapp/js/selectLanguage.js 2011-07-20 09:49:00 UTC (rev 180) +++ trunk/src/main/webapp/js/selectLanguage.js 2011-07-20 10:26:16 UTC (rev 181) @@ -37,33 +37,30 @@ } else if(contains(minetype, "html") ) { typeEditor="text/html"; - - - document.getElementById('language').selectedIndex=3 - - - } + document.getElementById('language').selectedIndex=3 + } else if( contains(minetype, "xml") ) { typeEditor="xml"; - - - document.getElementById('language').selectedIndex=4 - - + document.getElementById('language').selectedIndex=4 } + else if( contains(minetype, "java/application") ) { + typeEditor="xml"; + document.getElementById('language').selectedIndex=5 + } + else if(contains(minetype, "text/css") ) { + typeEditor="css"; + document.getElementById('language').selectedIndex=6 + } } if (typeEditor==null && format!=null){ if (format==("rst")) { - typeEditor="rst"; + typeEditor="rst"; + + document.getElementById('language').selectedIndex=1 - - document.getElementById('language').selectedIndex=1 -// var element = document.getElementById('language'); -// element.value = "rst"; - } else if(format==("javascript")) { typeEditor="javascript"; @@ -84,6 +81,11 @@ document.getElementById('language').selectedIndex=5 + } else if(format==("css")) { + typeEditor="css"; + + document.getElementById('language').selectedIndex=6 + } }

1 0

r180 - trunk/src/main/java/org/nuiton/scmwebeditor/actions
by kcardineaud＠users.nuiton.org 20 Jul '11

20 Jul '11

Author: kcardineaud Date: 2011-07-20 11:49:00 +0200 (Wed, 20 Jul 2011) New Revision: 180 Url: http://nuiton.org/repositories/revision/scmwebeditor/180 Log: Add logs that give some informations about the user who commit Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-20 08:53:51 UTC (rev 179) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-20 09:49:00 UTC (rev 180) @@ -242,6 +242,11 @@ } //Suppression du repertoire temporaire delTempDirectory(svnSess); + + if(log.isInfoEnabled()) { + log.info(username + " with IP "+request.getRemoteAddr()+" commit the file "+address+" with message : "+commitMessage); + } + return "success"; } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-07-20 08:53:51 UTC (rev 179) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-07-20 09:49:00 UTC (rev 180) @@ -96,7 +96,7 @@ error=false; if(log.isDebugEnabled()) { - log.debug("PictureName : "+uploadFileName); + log.debug("FileName : "+uploadFileName); log.debug("ContentType : "+uploadContentType); } @@ -240,6 +240,9 @@ log.debug("File upload successful"); } + if(log.isInfoEnabled()) { + log.info(username + " with IP "+request.getRemoteAddr()+" add the file "+this.getUploadFileName()+" on the repository."); + } return SUCCESS;

1 0

r179 - in trunk/src/main: java/org/nuiton/scmwebeditor java/org/nuiton/scmwebeditor/actions webapp/WEB-INF/content
by kcardineaud＠users.nuiton.org 20 Jul '11

20 Jul '11

Author: kcardineaud Date: 2011-07-20 10:53:51 +0200 (Wed, 20 Jul 2011) New Revision: 179 Url: http://nuiton.org/repositories/revision/scmwebeditor/179 Log: Modify some log Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-19 16:05:25 UTC (rev 178) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-20 08:53:51 UTC (rev 179) @@ -244,7 +244,9 @@ AutoDetectParser parser = new AutoDetectParser(); parser.parse(is, contenthandler, metadata); String result = metadata.get(Metadata.CONTENT_TYPE); - log.info("Mine type of " + file.getName() + " is : " + result); + if(log.isDebugEnabled()) { + log.debug("Mine type of " + file.getName() + " is : " + result); + } return result; } finally { @@ -261,7 +263,10 @@ AutoDetectParser parser = new AutoDetectParser(); parser.parse(is, contenthandler, metadata); String result = metadata.get(Metadata.CONTENT_TYPE); - log.info("Mine type of " + filename + " is : " + result); + if(log.isDebugEnabled()) { + log.debug("Mine type of " + filename + " is : " + result); + } + return result; } finally { Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java 2011-07-19 16:05:25 UTC (rev 178) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java 2011-07-20 08:53:51 UTC (rev 179) @@ -60,7 +60,7 @@ log.debug(newText); } XMLResponse=""; - //Using jrst for generate html document + //Using jrst to generate html document try { XMLResponse = JRST.generate(JRST.TYPE_HTML, newText); if(log.isDebugEnabled()) { @@ -71,7 +71,7 @@ if(log.isWarnEnabled()) { log.warn("RST generate fail",eee); } - XMLResponse = "<h4>Parsing érror, please read RST specification<h4>"; + XMLResponse = "<h4>Parsing error, please read RST specification<h4>"; return; } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java 2011-07-19 16:05:25 UTC (rev 178) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java 2011-07-20 08:53:51 UTC (rev 179) @@ -50,6 +50,7 @@ String url = svnSess.getSvnPath(); String file = svnSess.getFileName(); + //Si le login ou le mot de passe ne sont pas renseignes, on tente de se connecter en anonyme if(login==null && pw==null) { login = "anonymous"; pw = "anonymous"; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-19 16:05:25 UTC (rev 178) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-20 08:53:51 UTC (rev 179) @@ -111,6 +111,7 @@ svnSess.getPassword() != null && !svnSess.getPassword().equalsIgnoreCase("") ? svnSess.getPassword() : pw); + // Avant le commit, il faut checkout le repertoire try { checkout(svnSess); } catch (SVNAuthenticationException authexep) { @@ -126,7 +127,7 @@ return Action.LOGIN; } catch (SVNException e) { - //Suppression du repertoire temporaire + //Suppression du repertoire temporaire delTempDirectory(svnSess); return "errorPath"; } @@ -188,7 +189,7 @@ File[] tabFile = new File[1]; tabFile[0] = pathToFile; -// Sending Data to SVN + try { Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-19 16:05:25 UTC (rev 178) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-20 08:53:51 UTC (rev 179) @@ -103,9 +103,7 @@ if(log.isDebugEnabled()) { - log.debug("--------------------------\n" + - "Connection to SCMWebEditor\n" + - "--------------------------"); + log.debug("Connection to SCMWebEditor\n"); } @@ -117,15 +115,16 @@ return "noParameter"; } - if(log.isInfoEnabled()) { - log.info("ProjectUrl= "+request.getHeader("referer")); + if(log.isDebugEnabled()) { + log.debug("ProjectUrl= "+request.getHeader("referer")); } + projectUrl=request.getHeader("referer"); HttpSession httpSession = request.getSession(true); if(log.isInfoEnabled()) { - log.info("IP client : "+request.getRemoteAddr()); + log.info("IP client : "+request.getRemoteAddr() + " , get file : "+address); } //SvnSession object creation if doesn't already exist Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-07-19 16:05:25 UTC (rev 178) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-07-20 08:53:51 UTC (rev 179) @@ -123,8 +123,8 @@ public String search() { - if(log.isInfoEnabled()) { - log.info("Enter in search action"); + if(log.isDebugEnabled()) { + log.debug("Enter in search action"); } @@ -162,8 +162,9 @@ if(id.equals("")) { try { - log.info("Address svn : "+address); - + if(log.isDebugEnabled()) { + log.debug("Address svn : "+address); + } repository = SVNRepositoryFactory.create( SVNURL.parseURIDecoded( address ) ); authManager = SVNWCUtil.createDefaultAuthenticationManager( name , password ); @@ -200,21 +201,21 @@ authManager = SVNWCUtil.createDefaultAuthenticationManager( name , password ); repository.setAuthenticationManager( authManager ); - if(log.isInfoEnabled()) { - log.info( "Repository Root: " + repository.getRepositoryRoot( true ) ); - log.info( "Repository UUID: " + repository.getRepositoryUUID( true ) ); + if(log.isDebugEnabled()) { + log.debug( "Repository Root: " + repository.getRepositoryRoot( true ) ); + log.debug( "Repository UUID: " + repository.getRepositoryUUID( true ) ); } SVNNodeKind nodeKind = repository.checkPath( "" , -1 ); if ( nodeKind == SVNNodeKind.NONE ) { - if(log.isErrorEnabled()) { - log.error( "There is no entry at '" + url + "'." ); + if(log.isWarnEnabled()) { + log.warn( "There is no entry at '" + url + "'." ); } error="There is no entry at '" + url + "'."; return Action.SUCCESS; } else if ( nodeKind == SVNNodeKind.FILE ) { - if(log.isInfoEnabled()) { - log.info( "The entry at '" + url + "' is a file." ); + if(log.isDebugEnabled()) { + log.debug( "The entry at '" + url + "' is a file." ); } TreeNode node = new TreeNode(); node.setId(url); @@ -226,8 +227,8 @@ } numberOfFile=0; listEntries( repository , "" ); - if(log.isInfoEnabled()) { - log.info("Nombre de fichier : "+files.size()); + if(log.isDebugEnabled()) { + log.debug("Number of file : "+files.size()); } @@ -272,7 +273,10 @@ error="Can't access to the repository"; } - log.info("Search success"); + if(log.isDebugEnabled()) { + log.debug("Search success"); + } + return Action.SUCCESS; } @@ -282,7 +286,9 @@ try { entries = repository.getDir( path, -1 , null , (Collection<?>) null ); } catch (SVNException e) { - log.error("Can not reach the repository",e); + if(log.isErrorEnabled()) { + log.error("Can not reach the repository",e); + } } Iterator<?> iterator = entries.iterator(); @@ -328,7 +334,9 @@ public String getAddressUnique(String leFichier) { String result = leFichier.replaceAll("/|:", ""); - log.info("Result of getAddressUnique : "+result); + if(log.isDebugEnabled()) { + log.debug("Result of getAddressUnique : "+result); + } return result; } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-07-19 16:05:25 UTC (rev 178) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-07-20 08:53:51 UTC (rev 179) @@ -95,9 +95,9 @@ badLogin=false; error=false; - if(log.isInfoEnabled()) { - log.info("PictureName : "+uploadFileName); - log.info("ContentType : "+uploadContentType); + if(log.isDebugEnabled()) { + log.debug("PictureName : "+uploadFileName); + log.debug("ContentType : "+uploadContentType); } @@ -163,7 +163,9 @@ FileUtils.copyFile(upload, file); } catch (IOException e) { error=true; - log.error("Can't copy the file to the checkout directory",e); + if(log.isErrorEnabled()) { + log.error("Can't copy the file to the checkout directory",e); + } return ERROR; } @@ -190,7 +192,9 @@ } catch (SVNException e) { - log.error("Erreur SVN Add",e); + if(log.isErrorEnabled()){ + log.error("Erreur SVN Add",e); + } error=true; //Suppression du repertoire temporaire delTempDirectory(svnSess); @@ -210,14 +214,18 @@ } } catch (SVNAuthenticationException authexep) { - log.error("authentification fail"); + if(log.isErrorEnabled()) { + log.error("authentification fail"); + } badLogin=true; //Suppression du repertoire temporaire delTempDirectory(svnSess); return Action.LOGIN; } catch (SVNException e) { - log.error("Erreur SVN commit",e); + if(log.isErrorEnabled()) { + log.error("Erreur SVN commit",e); + } error=true; //Suppression du repertoire temporaire delTempDirectory(svnSess); @@ -228,8 +236,8 @@ //Suppression du repertoire temporaire delTempDirectory(svnSess); - if(log.isInfoEnabled()) { - log.info("File upload successful"); + if(log.isDebugEnabled()) { + log.debug("File upload successful"); } return SUCCESS; Modified: trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp 2011-07-19 16:05:25 UTC (rev 178) +++ trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp 2011-07-20 08:53:51 UTC (rev 179) @@ -16,7 +16,7 @@ <body> <a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> <p><s:text name="badPathOrFileName" /></p> -<p><s:text name="scm.formTransferred" /> You should be transferred automatically to the form page. If notplease <a href="<%=request.getAttribute("projectUrl")%>"> +<p><s:text name="scm.formTransferred" /> <a href="<%=request.getAttribute("projectUrl")%>"> <s:text name="scm.clickHere" /></a>.</p> <p>©2004-2009 CodeLutin</p> </body>

1 0

r178 - in trunk/src/main: resources/i18n webapp/WEB-INF/content
by kcardineaud＠users.nuiton.org 19 Jul '11

19 Jul '11

Author: kcardineaud Date: 2011-07-19 18:05:25 +0200 (Tue, 19 Jul 2011) New Revision: 178 Url: http://nuiton.org/repositories/revision/scmwebeditor/178 Log: Add some i18n properties Removed: trunk/src/main/webapp/WEB-INF/content/accueil.jsp Modified: trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp trunk/src/main/webapp/WEB-INF/content/error.jsp trunk/src/main/webapp/WEB-INF/content/preview.jsp trunk/src/main/webapp/WEB-INF/content/recall.jsp trunk/src/main/webapp/WEB-INF/content/redirect.jsp Modified: trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-07-19 15:16:35 UTC (rev 177) +++ trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-07-19 16:05:25 UTC (rev 178) @@ -36,4 +36,10 @@ scm.uploadSuccess=File upload successful scm.mustBeLog=You must be login to see this repository. scm.loginButton=Login -scm.privateScmAccess=You try to access a Private SCM. Please login \ No newline at end of file +scm.privateScmAccess=You try to access a Private SCM. Please login +scm.thankUsing=Thank you using SCMWebEditor +scm.beTransferred=You should be transferred automatically to the new page. If not please +scm.clickHere=click here +scm.redirection=Redirection... +badPathOrFileName=Bad repository path or file name! Please correct it. +scm.formTransferred=You should be transferred automatically to the form page. If not please \ No newline at end of file Modified: trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-19 15:16:35 UTC (rev 177) +++ trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-19 16:05:25 UTC (rev 178) @@ -1,11 +1,15 @@ +badPathOrFileName=L''adresse du depot ou le nom du fichier est incorrect \! scm.FileInEditor=Fichier dans l''editeur \: scm.badUsernameOrPassword=Identifiant ou mot de passe incorrect +scm.beTransferred=Vous devrais être redirige sur une nouvelle page. si non +scm.clickHere=cliquez ici scm.commitMessage=Message associe au commit scm.commitMessageTitle=laisser un message pour le commit scm.erreurRepo=Erreur sur le depot scm.exit=Quitter scm.exitJavascript=Quitter ScmWebEditor sans sauvegarder ? Toutes les modifications serons perdues. scm.exitTitle=Quitter ScmWebEditor sans sauvegarder. +scm.formTransferred=Vous devrais être redirige vers la page du formulaire. si non scm.info.ProblemWithRst=Si vous rencontrez des problemes avec RestruturedText, visitez le scm.info.rstWebsite=site de la documentation RST scm.language=Langage @@ -22,6 +26,7 @@ scm.passwordTitle=Mot de passe du depot scm.preview=Apercu scm.privateScmAccess=Pour modifier ce fichier, veuillez vous connecter. +scm.redirection=Redirection... scm.reset=Reinitialiser scm.resetTitle=Retour a la derniere revision du fichier scm.saveAndContinue=Sauvegarder et continuer @@ -29,6 +34,7 @@ scm.saveAndQuit=Sauvegarder et quitter scm.saveAndQuitTitle=Sauvegarder le fichier sur le depot et retourner à la page precedente. scm.text=Texte +scm.thankUsing=merci d'avoir utilise SCMWebEditor scm.upload=Ajouter un fichier scm.uploadFile=Url du fichier scm.uploadPath=Repertoire sur le depot Deleted: trunk/src/main/webapp/WEB-INF/content/accueil.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/accueil.jsp 2011-07-19 15:16:35 UTC (rev 177) +++ trunk/src/main/webapp/WEB-INF/content/accueil.jsp 2011-07-19 16:05:25 UTC (rev 178) @@ -1,3 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" %> - - <p>Parametres detectés</p> Modified: trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp 2011-07-19 15:16:35 UTC (rev 177) +++ trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp 2011-07-19 16:05:25 UTC (rev 178) @@ -1,6 +1,7 @@ <%-- Document : BadFileRedirect Created on : 6 oct. 2009, 15:33:56 Author : glorieux --%> <%@page contentType="text/html" 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"> @@ -14,10 +15,9 @@ </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><s:text name="badPathOrFileName" /></p> +<p><s:text name="scm.formTransferred" /> You should be transferred automatically to the form page. If notplease <a href="<%=request.getAttribute("projectUrl")%>"> +<s:text name="scm.clickHere" /></a>.</p> <p>©2004-2009 CodeLutin</p> </body> </html> Modified: trunk/src/main/webapp/WEB-INF/content/error.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/error.jsp 2011-07-19 15:16:35 UTC (rev 177) +++ trunk/src/main/webapp/WEB-INF/content/error.jsp 2011-07-19 16:05:25 UTC (rev 178) @@ -1,5 +1,6 @@ <%-- Document : Error Created on : 15 sept. 2009, 12:22:29 Author : glorieux --%> <%@page contentType="text/html" 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"> @@ -16,7 +17,7 @@ </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><s:text name="scm.badUsernameOrPassword"/></p> <p>©2004-2009 CodeLutin</p> </body> </html> Modified: trunk/src/main/webapp/WEB-INF/content/preview.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/preview.jsp 2011-07-19 15:16:35 UTC (rev 177) +++ trunk/src/main/webapp/WEB-INF/content/preview.jsp 2011-07-19 16:05:25 UTC (rev 178) @@ -1,7 +1,7 @@ <%@ taglib prefix="s" uri="/struts-tags"%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%--Title and div for rst preview--%> - <h3 id="prevtitle" >Preview :</h3> + <h3 id="prevtitle" ><s:text name="scm.preview" /> :</h3> <div id="prev" title="Preview"> <div id="preview" > Modified: trunk/src/main/webapp/WEB-INF/content/recall.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/recall.jsp 2011-07-19 15:16:35 UTC (rev 177) +++ trunk/src/main/webapp/WEB-INF/content/recall.jsp 2011-07-19 16:05:25 UTC (rev 178) @@ -1,12 +1,13 @@ <%-- Document : Recall Created on : 30 sept. 2009, 17:05:40 Author : glorieux --%> <%@page contentType="text/html" 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>Redirect...</title> +<title><s:text name="scm.redirection" /></title> <meta http-equiv="Refresh" content="0; url= <%=request.getAttribute("Redirect_url")%>"> </head> Modified: trunk/src/main/webapp/WEB-INF/content/redirect.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/redirect.jsp 2011-07-19 15:16:35 UTC (rev 177) +++ trunk/src/main/webapp/WEB-INF/content/redirect.jsp 2011-07-19 16:05:25 UTC (rev 178) @@ -1,12 +1,13 @@ <%-- Document : Redirect Created on : 10 sept. 2009, 13:43:11 Author : glorieux --%> <%@page contentType="text/html" 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>Redirection...</title> +<title><s:text name="scm.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= @@ -14,10 +15,8 @@ </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><s:text name="scm.thankUsing" /></p> +<p><s:text name="scm.beTransferred" /> <a href="<%=request.getAttribute("Redirection_url")%>"><s:text name="scm.clickHere" /></a>.</p> <p>©2004-2009 CodeLutin</p> </body> </html>

1 0

r177 - in trunk/src/main/webapp: css img
by kcardineaud＠users.nuiton.org 19 Jul '11

19 Jul '11

Author: kcardineaud Date: 2011-07-19 17:16:35 +0200 (Tue, 19 Jul 2011) New Revision: 177 Url: http://nuiton.org/repositories/revision/scmwebeditor/177 Log: Add an icon for file in repository tree Added: trunk/src/main/webapp/img/file.png Modified: trunk/src/main/webapp/css/main.css Modified: trunk/src/main/webapp/css/main.css =================================================================== --- trunk/src/main/webapp/css/main.css 2011-07-19 14:18:47 UTC (rev 176) +++ trunk/src/main/webapp/css/main.css 2011-07-19 15:16:35 UTC (rev 177) @@ -10,6 +10,11 @@ display:inline; } +.ui-icon-document { + background-image:url("../img/file.png") !important; + background-position: 0 1px !important ; +} + #form { width:70%; margin:auto; Added: trunk/src/main/webapp/img/file.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/file.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r176 - in trunk/src/main: i18n resources resources/i18n webapp/WEB-INF/content webapp/css
by kcardineaud＠users.nuiton.org 19 Jul '11

19 Jul '11

Author: kcardineaud Date: 2011-07-19 16:18:47 +0200 (Tue, 19 Jul 2011) New Revision: 176 Url: http://nuiton.org/repositories/revision/scmwebeditor/176 Log: add i18n for login Modified: trunk/src/main/i18n/jsp.rules trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties trunk/src/main/resources/struts.properties trunk/src/main/webapp/WEB-INF/content/loginSearch.jsp trunk/src/main/webapp/WEB-INF/content/privateSvnRedirect.jsp trunk/src/main/webapp/css/main.css Modified: trunk/src/main/i18n/jsp.rules =================================================================== --- trunk/src/main/i18n/jsp.rules 2011-07-19 13:21:29 UTC (rev 175) +++ trunk/src/main/i18n/jsp.rules 2011-07-19 14:18:47 UTC (rev 176) @@ -9,4 +9,6 @@ //s:file/@key //s:label/@key //s:optiontransferselect/@key -//s:select/@key \ No newline at end of file +//s:select/@key +//sj:head/@key +//s:if/@key \ No newline at end of file Modified: trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-07-19 13:21:29 UTC (rev 175) +++ trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-07-19 14:18:47 UTC (rev 176) @@ -33,4 +33,7 @@ scm.uploadPath=Path on Repository scm.badUsernameOrPassword=Bad username or password scm.erreurRepo=Error on repository -scm.uploadSuccess=File upload successful \ No newline at end of file +scm.uploadSuccess=File upload successful +scm.mustBeLog=You must be login to see this repository. +scm.loginButton=Login +scm.privateScmAccess=You try to access a Private SCM. Please login \ No newline at end of file Modified: trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-19 13:21:29 UTC (rev 175) +++ trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-19 14:18:47 UTC (rev 176) @@ -9,16 +9,19 @@ scm.info.ProblemWithRst=Si vous rencontrez des problemes avec RestruturedText, visitez le scm.info.rstWebsite=site de la documentation RST scm.language=Langage -scm.logAs=Connecte +scm.logAs=Connecte en tant que +scm.loginButton=Connection scm.modificationViewer.betterUseJavascript= scm.modificationViewer.noJavascript=Javascript est desactive. Vous pouvais seulement utiliser les boutons sauvegarder et quitter, quitter ou upload. +scm.mustBeLog=Vous devez vous identifier pour parcourir ce depot. scm.outConnection.enterRepo=Entrez l''adresse de votre depot. scm.outConnection.noJavascript=Javascript n''est pas active. Certaines fonctions ne serons pas accessible. scm.outConnection.scmPath=Repertoire SCM \: scm.outConnection.search=Chercher scm.password=Mot de passe -scm.passwordTitle=Mot de pass du depot +scm.passwordTitle=Mot de passe du depot scm.preview=Apercu +scm.privateScmAccess=Pour modifier ce fichier, veuillez vous connecter. scm.reset=Reinitialiser scm.resetTitle=Retour a la derniere revision du fichier scm.saveAndContinue=Sauvegarder et continuer Modified: trunk/src/main/resources/struts.properties =================================================================== --- trunk/src/main/resources/struts.properties 2011-07-19 13:21:29 UTC (rev 175) +++ trunk/src/main/resources/struts.properties 2011-07-19 14:18:47 UTC (rev 176) @@ -20,7 +20,7 @@ struts.tag.altSyntax=true -struts.devMode=true +struts.devMode=false struts.i18n.reload=true Modified: trunk/src/main/webapp/WEB-INF/content/loginSearch.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/loginSearch.jsp 2011-07-19 13:21:29 UTC (rev 175) +++ trunk/src/main/webapp/WEB-INF/content/loginSearch.jsp 2011-07-19 14:18:47 UTC (rev 176) @@ -6,13 +6,16 @@ <sj:head jquerytheme="default"/> <div id="search"> - <p>You must be login to see this repository.</p> + <p><s:text name="scm.mustBeLog"/></p> <p> - <label>Username : <input type="text" name="username"></input></label><br/> - <label>Password : <input type ="password" name="pw"></input></label><br/> + <label><s:text name="scm.username"/> : <input type="text" name="username"></input></label><br/> + <label><s:text name="scm.password"/> : <input type ="password" name="pw"></input></label><br/> <s:url id="ajaxSearchLogin" value="search.action" /> + <s:set id="scm.loginButton"> + <s:text name="scm.loginButton"/> + </s:set> <sj:submit id="ajaxSearchButtonLogin" formIds="configForm" @@ -21,7 +24,7 @@ indicator="indicator" button="true" buttonIcon="ui-icon-refresh" - value="Login" + value="%{scm.loginButton}" > </sj:submit> </p> Modified: trunk/src/main/webapp/WEB-INF/content/privateSvnRedirect.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/privateSvnRedirect.jsp 2011-07-19 13:21:29 UTC (rev 175) +++ trunk/src/main/webapp/WEB-INF/content/privateSvnRedirect.jsp 2011-07-19 14:18:47 UTC (rev 176) @@ -1,6 +1,7 @@ <%-- Document : PrivateSvnRedirect Created on : 30 sept. 2009, 14:05:43 Author : glorieux --%> <%@page contentType="text/html" 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"> @@ -17,13 +18,25 @@ <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 +<p><s:text name="scm.privateScmAccess" /></p> +<p><label ACCESSKEY=U><s:text name="scm.username" /> : <input TYPE=text + NAME=username SIZE=12></label> + <label ACCESSKEY=P><s:text name="scm.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> + + +<input type="submit" name="Save" /> + + + <s:set id="scm.exit"> + <s:text name="scm.exit"/> + </s:set> + <s:set id="scm.exitJavascript"> + <s:text name="scm.exitJavascript"/> + </s:set> + <s:submit type="button" value="%{scm.exit}" name="exitLogin" onclick="return cancelRedirect('%{scm.exitJavascript}',this.form.ProjectUrl);"/> + +</form> <p>©2004-2009 CodeLutin</p> </body> </html> \ No newline at end of file Modified: trunk/src/main/webapp/css/main.css =================================================================== --- trunk/src/main/webapp/css/main.css 2011-07-19 13:21:29 UTC (rev 175) +++ trunk/src/main/webapp/css/main.css 2011-07-19 14:18:47 UTC (rev 176) @@ -19,20 +19,25 @@ } #wwctrl_Save, #wwctrl_Cancel, #wwctrl_uploadButton { - text-align:center; + text-align:center; } +#wwctrl_exitLogin { + text-align:left; + display:inline; +} + #wwgrp_username { float:left; - } +} #scmButton { - + } #loginDiv { - margin:auto; - width:285px; + margin:auto; + width:285px; }

1 0

r175 - in trunk/src/main: resources/i18n webapp/WEB-INF/content
by kcardineaud＠users.nuiton.org 19 Jul '11

19 Jul '11

Author: kcardineaud Date: 2011-07-19 15:21:29 +0200 (Tue, 19 Jul 2011) New Revision: 175 Url: http://nuiton.org/repositories/revision/scmwebeditor/175 Log: Add i18n for upload Modified: trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 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 Modified: trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-07-19 12:41:07 UTC (rev 174) +++ trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-07-19 13:21:29 UTC (rev 175) @@ -28,4 +28,9 @@ scm.exitTitle=Exit ScmWebEditor without saving. scm.exitJavascript=Exit ScmWebEditor without saving ? All modification will be lost. scm.upload=Upload -scm.uploadTitle=Upload a file on the repository \ No newline at end of file +scm.uploadTitle=Upload a file on the repository +scm.uploadFile=File Url +scm.uploadPath=Path on Repository +scm.badUsernameOrPassword=Bad username or password +scm.erreurRepo=Error on repository +scm.uploadSuccess=File upload successful \ No newline at end of file Modified: trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-19 12:41:07 UTC (rev 174) +++ trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-19 13:21:29 UTC (rev 175) @@ -1,6 +1,8 @@ scm.FileInEditor=Fichier dans l''editeur \: +scm.badUsernameOrPassword=Identifiant ou mot de passe incorrect scm.commitMessage=Message associe au commit scm.commitMessageTitle=laisser un message pour le commit +scm.erreurRepo=Erreur sur le depot scm.exit=Quitter scm.exitJavascript=Quitter ScmWebEditor sans sauvegarder ? Toutes les modifications serons perdues. scm.exitTitle=Quitter ScmWebEditor sans sauvegarder. @@ -25,6 +27,9 @@ scm.saveAndQuitTitle=Sauvegarder le fichier sur le depot et retourner à la page precedente. scm.text=Texte scm.upload=Ajouter un fichier +scm.uploadFile=Url du fichier +scm.uploadPath=Repertoire sur le depot +scm.uploadSuccess=Fichier telecharche avec succes scm.uploadTitle=Ajouter un fichier sur le depot scm.username=Identifiant scm.usernameTitle=Identifiant du depot Modified: trunk/src/main/webapp/WEB-INF/content/upload.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/upload.jsp 2011-07-19 12:41:07 UTC (rev 174) +++ trunk/src/main/webapp/WEB-INF/content/upload.jsp 2011-07-19 13:21:29 UTC (rev 175) @@ -1,14 +1,13 @@ <%@ taglib prefix="s" uri="/struts-tags"%> -<p>Result : </p> <s:if test="badLogin"> - <p><font color="red">Bad username or password</font></p> + <p><font color="red"><s:text name="scm.badUsernameOrPassword"/></font></p> </s:if> <s:elseif test="error"> - <p><font color="red">Erreur SVN</font></p> + <p><font color="red"><s:text name="scm.erreurRepo"/></font></p> </s:elseif> <s:else> - <p>File upload successful</p> + <p><s:text name="scm.uploadSuccess"/></p> </s:else> \ No newline at end of file Modified: trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp 2011-07-19 12:41:07 UTC (rev 174) +++ trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp 2011-07-19 13:21:29 UTC (rev 175) @@ -9,17 +9,17 @@ </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/> + <form method="POST" id="uploadForm" action="doUpload.action" enctype="multipart/form-data"> + <label><s:text name="scm.uploadFile" /> : <input type="file" name="upload"/></label><br/> + <label><s:text name="scm.uploadPath" /> : <input type="text" name="svnPath" /></label><br/> + <label><s:text name="scm.username" /> : <input type="text" name="username" /></label><br/> + <label><s:text name="scm.password" /> : <input type="password" name="pw" /></label><br/> <s:if test="badLogin"> - <p><font color="red">Bad username or password</font></p> + <p><font color="red"><s:text name="scm.badUsernameOrPassword"/></font></p> </s:if> <s:elseif test="error"> - <p><font color="red">Erreur SVN</font></p> + <p><font color="red"><s:text name="scm.erreurRepo"/></font></p> </s:elseif> <input type="submit"/> </form> Modified: trunk/src/main/webapp/WEB-INF/content/uploadSuccess.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/uploadSuccess.jsp 2011-07-19 12:41:07 UTC (rev 174) +++ trunk/src/main/webapp/WEB-INF/content/uploadSuccess.jsp 2011-07-19 13:21:29 UTC (rev 175) @@ -1,5 +1,6 @@ <%@ 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> @@ -7,7 +8,7 @@ <title>Success</title> </head> <body> -<p>File upload successful</p> +<p><s:text name="scm.uploadSuccess"/></p> <form> <input type="button" value="close" onclick="window.close()"> </form>

1 0