Author: kcardineaud Date: 2011-07-19 14:41:07 +0200 (Tue, 19 Jul 2011) New Revision: 174 Url: http://nuiton.org/repositories/revision/scmwebeditor/174 Log: ModificationViewer.jsp is now in i18n Modified: trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties trunk/src/main/resources/struts.xml trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp trunk/src/main/webapp/css/main.css trunk/src/main/webapp/js/cancelRedirect.js Modified: trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-07-18 15:23:54 UTC (rev 173) +++ trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-07-19 12:41:07 UTC (rev 174) @@ -9,4 +9,23 @@ scm.text=Text 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 \: \ No newline at end of file +scm.commitMessage=Commit message +scm.username=Username +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.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.upload=Upload +scm.uploadTitle=Upload a file on the repository \ 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-18 15:23:54 UTC (rev 173) +++ trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-19 12:41:07 UTC (rev 174) @@ -1,12 +1,31 @@ -scm.commitMessage=Message associe au commit \: +scm.FileInEditor=Fichier dans l''editeur \: +scm.commitMessage=Message associe au commit +scm.commitMessageTitle=laisser un message pour le commit +scm.exit=Quitter +scm.exitJavascript=Quitter ScmWebEditor sans sauvegarder ? Toutes les modifications serons perdues. +scm.exitTitle=Quitter ScmWebEditor sans sauvegarder. scm.info.ProblemWithRst=Si vous rencontrez des problemes avec RestruturedText, visitez le scm.info.rstWebsite=site de la documentation RST -scm.language=langage +scm.language=Langage +scm.logAs=Connecte scm.modificationViewer.betterUseJavascript= scm.modificationViewer.noJavascript=Javascript est desactive. Vous pouvais seulement utiliser les boutons sauvegarder et quitter, quitter ou upload. -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.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.preview=Apercu +scm.reset=Reinitialiser +scm.resetTitle=Retour a la derniere revision du fichier +scm.saveAndContinue=Sauvegarder et continuer +scm.saveAndContinueTitle=Enregister les modifications sur le depot et continer d''editer le fichier +scm.saveAndQuit=Sauvegarder et quitter +scm.saveAndQuitTitle=Sauvegarder le fichier sur le depot et retourner à la page precedente. scm.text=Texte +scm.upload=Ajouter un fichier +scm.uploadTitle=Ajouter un fichier sur le depot +scm.username=Identifiant +scm.usernameTitle=Identifiant du depot scm.welcome=Bienvenue sur SCMWebEditor Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-07-18 15:23:54 UTC (rev 173) +++ trunk/src/main/resources/struts.xml 2011-07-19 12:41:07 UTC (rev 174) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-07-18 15:23:54 UTC (rev 173) +++ trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-07-19 12:41:07 UTC (rev 174) @@ -49,12 +49,12 @@ <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> + <h2><s:text name="scm.welcome"/></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> + <h4><s:text name="scm.info.ProblemWithRst"/> <a href="http://docutils.sourceforge.net/rst.html"><s:text name="scm.info.rstWebsite"/></a>.</h4> <% } %> </center> @@ -74,7 +74,9 @@ %> - <p>File in editor : <a href="<%=request.getAttribute("address")%>" ><%=request.getAttribute("address")%></a> </p> + <p> + <s:text name="scm.FileInEditor"/><a href="<%=request.getAttribute("address")%>" ><%=request.getAttribute("address")%></a> + </p> <textarea id="newTextId" rows="50" cols="80" name="newText"><%=valueTextarea%></textarea> @@ -87,9 +89,9 @@ </script> - <label>Language : + <label><s:text name="scm.language"/> <select id="language" name="langageSelection" onchange="changeModeBy(editor,this)"> - <option value="null">Text</option> + <option value="null"><s:text name="scm.text"/></option> <option value="rst">ReStructuredText</option> <option value="javascript">Javascript</option> <option value="text/html">HTML</option> @@ -117,15 +119,23 @@ <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> + <noscript><h4><s:text name="scm.modificationViewer.noJavascript"/></h4></noscript> + <noscript><h4><s:text name="scm.modificationViewer.betterUseJavascript"/></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> + <s:set id="scm.commitMessage"> + <s:text name="scm.commitMessage"/> + </s:set> + <s:set id="scm.commitMessageTitle"> + <s:text name="scm.commitMessageTitle"/> + </s:set> + <s:textfield required="true" label="%{scm.commitMessage}" name="commitMessage" title="%{scm.commitMessageTitle}" /> + + <%if (request.getAttribute("IsLogin").equals(false) == true){ %> <%if (request.getAttribute("badLogin")!=null && request.getAttribute("badLogin").equals(true)) { %> @@ -137,10 +147,27 @@ <% } %> <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><% + + <s:set id="scm.username"> + <s:text name="scm.username"/> + </s:set> + <s:set id="scm.usernameTitle"> + <s:text name="scm.usernameTitle"/> + </s:set> + <s:set id="scm.password"> + <s:text name="scm.password"/> + </s:set> + <s:set id="scm.passwordTitle"> + <s:text name="scm.passwordTitle"/> + </s:set> + <div id="loginDiv"> + <s:textfield accesskey="U" size="12" label="%{scm.username}" name="username" title="%{scm.usernameTitle}" /> + <s:password accesskey="P" size="12" label="%{scm.password}" name="pw" title="%{scm.passwordTitle}" /> + </div> + + <% } else { - %><p>You are log as: <%=request.getAttribute("Login")%></p> + %><p><s:text name="scm.logAs"/> <%=request.getAttribute("Login")%></p> <input type="hidden" NAME=username /> <input type="hidden" NAME=pw /><% }%> @@ -153,6 +180,15 @@ <s:url id="ajaxCommit" value="save.action" /> + + <div id="scmButton"> + + <s:set id="scm.saveAndContinue"> + <s:text name="scm.saveAndContinue"/> + </s:set> + <s:set id="scm.saveAndContinueTitle"> + <s:text name="scm.saveAndContinueTitle"/> + </s:set> <sj:submit onclick="loadChange()" id="ajaxSaveButton" formIds="editForm" @@ -161,17 +197,26 @@ indicator="indicator" button="true" buttonIcon="ui-icon-refresh" - value="Save and Continue Editing" - title="Commit modifications and continue editing the file" + value="%{scm.saveAndContinue}" + title="%{scm.saveAndContinueTitle}" > </sj:submit> - - <input title="Save this file and go back to previous page." type="submit" value="Save and Quit" name="Save"/> + <s:set id="scm.saveAndQuit"> + <s:text name="scm.saveAndQuit"/> + </s:set> + <s:set id="scm.saveAndQuitTitle"> + <s:text name="scm.saveAndQuitTitle"/> + </s:set> + <s:submit cssStyle="align:center;" title="%{scm.saveAndQuitTitle}" type="button" value="%{scm.saveAndQuit}" name="Save"/> + <%if (request.getAttribute("format")!=null && request.getAttribute("format")!=null && request.getAttribute("format").equals("rst") == true){ %> <s:url id="ajaxPreview" value="preview.action" /> - + + <s:set id="scm.preview"> + <s:text name="scm.preview"/> + </s:set> <sj:submit onclick="loadChange()" id="ajaxPreviewButton" formIds="editForm" @@ -179,35 +224,61 @@ href="%{ajaxPreview}" button="true" buttonIcon="ui-icon-refresh" - value="Preview" + value="%{scm.preview}" > </sj:submit> <%}%> + <s:set id="scm.reset"> + <s:text name="scm.reset"/> + </s:set> + <s:set id="scm.resetTitle"> + <s:text name="scm.resetTitle"/> + </s:set> <sj:submit - title="Go back to the last revision of the file" + title="%{scm.resetTitle}" id="resetButton" - targets="resetResult" - value="Reset" + targets="resetResult" + value="%{scm.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);"/> + + <s:set id="scm.exit"> + <s:text name="scm.exit"/> + </s:set> + <s:set id="scm.exitTitle"> + <s:text name="scm.exitTitle"/> + </s:set> + <s:set id="scm.exitJavascript"> + <s:text name="scm.exitJavascript"/> + </s:set> + <s:submit title="%{scm.exitTitle}" type="button" value="%{scm.exit}" name="Cancel" onclick="return cancelRedirect('%{scm.exitJavascript}',this.form.ProjectUrl);"/> + - <br/> + </div> </div> </form> + + <s:set id="scm.upload"> + <s:text name="scm.upload"/> + </s:set> + <s:set id="scm.uploadTitle"> + <s:text name="scm.uploadTitle"/> + </s:set> <center> - <button title="Upload a file on the repository" onClick="javascript:upload_popup('doUpload.action','upload');" >Upload</button> + <s:submit name="uploadButton" value="%{scm.upload}" title="%{scm.uploadTitle}" onClick="javascript:upload_popup('doUpload.action','upload');" /> </center> + + <div> Modified: trunk/src/main/webapp/css/main.css =================================================================== --- trunk/src/main/webapp/css/main.css 2011-07-18 15:23:54 UTC (rev 173) +++ trunk/src/main/webapp/css/main.css 2011-07-19 12:41:07 UTC (rev 174) @@ -6,6 +6,9 @@ margin:auto; } +.wwlbl , .wwctrl { + display:inline; +} #form { width:70%; @@ -15,6 +18,24 @@ text-align:center; } +#wwctrl_Save, #wwctrl_Cancel, #wwctrl_uploadButton { + text-align:center; +} + +#wwgrp_username { + float:left; + } + +#scmButton { + +} + +#loginDiv { + margin:auto; + width:285px; +} + + #uploadFormId { width:70%; margin:auto; Modified: trunk/src/main/webapp/js/cancelRedirect.js =================================================================== --- trunk/src/main/webapp/js/cancelRedirect.js 2011-07-18 15:23:54 UTC (rev 173) +++ trunk/src/main/webapp/js/cancelRedirect.js 2011-07-19 12:41:07 UTC (rev 174) @@ -3,9 +3,11 @@ */ -function cancelRedirect(url) +function cancelRedirect(text, url) { - if (confirm("Exit SCMWebEditor ?")){ + if (confirm(text)){ window.location.replace(url.value); + return false; } + else {return false}; } \ No newline at end of file