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; }