Author: tchemit Date: 2011-08-26 17:24:50 +0200 (Fri, 26 Aug 2011) New Revision: 249 Url: http://nuiton.org/repositories/revision/scmwebeditor/249 Log: reformat jsp Modified: trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp trunk/src/main/webapp/WEB-INF/content/badRstFile.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/fileModify.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/logout.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 Modified: trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp 2011-08-26 15:09:03 UTC (rev 248) +++ trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp 2011-08-26 15:24:50 UTC (rev 249) @@ -23,35 +23,41 @@ #L% --%> <%-- 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"%> +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"> +"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"> -<% if(request.getAttribute("projectUrl")!=null) { %> -<meta http-equiv="Refresh" content="3; url=<%=request.getAttribute("projectUrl")%>"> -<% } else { %> -<meta http-equiv="Refresh" content="3;URL=checkout.action"> -<% } %> + <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"> + <% if (request.getAttribute("projectUrl") != null) { %> + <meta http-equiv="Refresh" + content="3; url=<%=request.getAttribute("projectUrl")%>"> + <% } else { %> + <meta http-equiv="Refresh" content="3;URL=checkout.action"> + <% } %> </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="scm.badPathOrFileName" /></p> -<p><s:text name="scm.formTransferred" /> -<% if(request.getAttribute("projectUrl")!=null) { %> - <a href="<%=request.getAttribute("projectUrl")%>"> -<% } else { %> +<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img + src="img/ScmWebEditor_main.png" alt="$alt"/></a> + +<p><s:text name="scm.badPathOrFileName"/></p> + +<p><s:text name="scm.formTransferred"/> + <% if (request.getAttribute("projectUrl") != null) { %> + <a href="<%=request.getAttribute("projectUrl")%>"> + <% } else { %> <a href="checkout.action"> -<% } %> -<s:text name="scm.clickHere" /></a>.</p> + <% } %> + <s:text name="scm.clickHere"/></a>.</p> + <p>©2004-2009 CodeLutin</p> </body> </html> Modified: trunk/src/main/webapp/WEB-INF/content/badRstFile.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/badRstFile.jsp 2011-08-26 15:09:03 UTC (rev 248) +++ trunk/src/main/webapp/WEB-INF/content/badRstFile.jsp 2011-08-26 15:24:50 UTC (rev 249) @@ -23,54 +23,56 @@ #L% --%> <%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib prefix="s" uri="/struts-tags"%> + 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>RST is not valid</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="Content-Type" content="text/html; charset=UTF-8"> + <title>RST is not valid</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> +<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img + src="img/ScmWebEditor_main.png" alt="$alt"/></a> - <form id="forceCommitForm" method="POST" action="commit.action" > - <h4><s:text name="scm.rstNotValidMessage" /></h4> - - <input type="hidden" name="force" value="true"/> - <s:hidden name="address" value="%{address}" /> - <s:hidden name="commitMessage" value="%{commitMessage}" /> - <s:hidden name="newText" value="%{newText}" /> - <s:hidden name="lastText" value="%{lastText}" /> - <s:hidden name="fileType" value="%{fileType}" /> - <s:hidden name="projectUrl" value="%{projectUrl}" /> - <s:hidden name="format" value="%{format}" /> - - <s:hidden name="username" value="%{username}" /> - <s:hidden name="pw" value="%{pw}" /> - - - <s:set id="scm.yes"> - <s:text name="scm.yes"/> - </s:set> - - <s:submit - id="ajaxForceCommitButton" - formIds="forceCommitForm" - indicator="indicator" - button="true" +<form id="forceCommitForm" method="POST" action="commit.action"> + <h4><s:text name="scm.rstNotValidMessage"/></h4> + + <input type="hidden" name="force" value="true"/> + <s:hidden name="address" value="%{address}"/> + <s:hidden name="commitMessage" value="%{commitMessage}"/> + <s:hidden name="newText" value="%{newText}"/> + <s:hidden name="lastText" value="%{lastText}"/> + <s:hidden name="fileType" value="%{fileType}"/> + <s:hidden name="projectUrl" value="%{projectUrl}"/> + <s:hidden name="format" value="%{format}"/> + + <s:hidden name="username" value="%{username}"/> + <s:hidden name="pw" value="%{pw}"/> + + + <s:set id="scm.yes"> + <s:text name="scm.yes"/> + </s:set> + + <s:submit + id="ajaxForceCommitButton" + formIds="forceCommitForm" + indicator="indicator" + button="true" buttonIcon="ui-icon-refresh" - value="%{scm.yes}" + value="%{scm.yes}" > - </s:submit> - - <s:set id="scm.no"> - <s:text name="scm.no"/> - </s:set> - <s:submit type="button" value="%{scm.no}" onclick="history.back();return false;" /> - - </form> + </s:submit> + + <s:set id="scm.no"> + <s:text name="scm.no"/> + </s:set> + <s:submit type="button" value="%{scm.no}" + onclick="history.back();return false;"/> + +</form> </body> </html> \ No newline at end of file Modified: trunk/src/main/webapp/WEB-INF/content/badUseRedirect.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/badUseRedirect.jsp 2011-08-26 15:09:03 UTC (rev 248) +++ trunk/src/main/webapp/WEB-INF/content/badUseRedirect.jsp 2011-08-26 15:24:50 UTC (rev 249) @@ -23,34 +23,40 @@ #L% --%> <%-- Document : BadFileRedirect Created on : 6 oct. 2009, 15:33:56 -Author : glorieux --%> <%@page contentType="text/html" -pageEncoding="UTF-8"%> +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"> +"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"> -<% if(request.getAttribute("projectUrl")!=null) { %> -<meta http-equiv="Refresh" content="3; url=<%=request.getAttribute("projectUrl")%>"> -<% } else { %> -<meta http-equiv="Refresh" content="3;URL=checkout.action"> -<% } %> + <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"> + <% if (request.getAttribute("projectUrl") != null) { %> + <meta http-equiv="Refresh" + content="3; url=<%=request.getAttribute("projectUrl")%>"> + <% } else { %> + <meta http-equiv="Refresh" content="3;URL=checkout.action"> + <% } %> </head> <body> -<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> +<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 -<% if(request.getAttribute("projectUrl")!=null) { %> - <a href="<%=request.getAttribute("projectUrl")%>"> -<% } else { %> + please + <% if (request.getAttribute("projectUrl") != null) { %> + <a href="<%=request.getAttribute("projectUrl")%>"> + <% } else { %> <a href="checkout.action"> -<% } %> -click this link</a>.</p> + <% } %> + click this link</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-08-26 15:09:03 UTC (rev 248) +++ trunk/src/main/webapp/WEB-INF/content/error.jsp 2011-08-26 15:24:50 UTC (rev 249) @@ -23,27 +23,32 @@ #L% --%> <%-- 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"%> +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"> +"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"> -<% if(request.getAttribute("projectUrl")!=null) { %> -<meta http-equiv="Refresh" content="3; url=<%=request.getAttribute("projectUrl")%>"> -<% } else { %> -<meta http-equiv="Refresh" content="3;URL=checkout.action"> -<% } %> -<%--%=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")%>"--%> + <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"> + <% if (request.getAttribute("projectUrl") != null) { %> + <meta http-equiv="Refresh" + content="3; url=<%=request.getAttribute("projectUrl")%>"> + <% } else { %> + <meta http-equiv="Refresh" content="3;URL=checkout.action"> + <% } %> + <%--%=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> +<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img + src="img/ScmWebEditor_main.png" alt="$alt"/></a> + <p><s:text name="scm.badUsernameOrPassword"/></p> + <p>©2004-2009 CodeLutin</p> </body> </html> Modified: trunk/src/main/webapp/WEB-INF/content/fileModify.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/fileModify.jsp 2011-08-26 15:09:03 UTC (rev 248) +++ trunk/src/main/webapp/WEB-INF/content/fileModify.jsp 2011-08-26 15:24:50 UTC (rev 249) @@ -23,71 +23,74 @@ #L% --%> <%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib prefix="s" uri="/struts-tags"%> + 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><s:text name="scm.fileModify" /></title> -<link rel="stylesheet" type="text/css" href="css/main.css"> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title><s:text name="scm.fileModify"/></title> + <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> +<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img + src="img/ScmWebEditor_main.png" alt="$alt"/></a> - - - - <form id="forceCommitForm" method="POST" action="commit.action" > - <h4><s:text name="scm.fileModify" /> <s:text name="scm.by" /> <s:property value="headCommiter" /></h4> - - <s:set id="scm.showDiff" > - <s:text name="scm.showDiff" /> - </s:set> - <s:submit value="%{scm.showDiff}" onclick="getElementById('diffArea').style.display='inline';return false;" /> - - <s:set id="diff" > - <s:property value="diff" /> - </s:set> - <s:textarea id="diffArea" cssStyle="display:none" rows="20" cols="80" value="%{diff}" /> - - - <input type="hidden" name="force" value="true"/> - <s:hidden name="address" value="%{address}" /> - <s:hidden name="commitMessage" value="%{commitMessage}" /> - <s:hidden name="newText" value="%{newText}" /> - <s:hidden name="lastText" value="%{lastText}" /> - <s:hidden name="fileType" value="%{fileType}" /> - <s:hidden name="projectUrl" value="%{projectUrl}" /> - <s:hidden name="format" value="%{format}" /> - - <s:hidden name="username" value="%{username}" /> - <s:hidden name="pw" value="%{pw}" /> - - - <s:set id="scm.forceSave"> - <s:text name="scm.forceSave"/> - </s:set> - - <input type="hidden" name="force" value="true"/> - <s:submit - id="ajaxForceSaveButton" - formIds="editForm" - indicator="indicator" - button="true" - buttonIcon="ui-icon-refresh" - value="%{scm.forceSave}" - > - </s:submit> - - - <s:set id="scm.exit"> - <s:text name="scm.exit"/> - </s:set> - <s:submit type="button" value="%{scm.exit}" onclick="history.back();return false;" /> - - - </form> - + +<form id="forceCommitForm" method="POST" action="commit.action"> + <h4><s:text name="scm.fileModify"/> <s:text name="scm.by"/> <s:property + value="headCommiter"/></h4> + + <s:set id="scm.showDiff"> + <s:text name="scm.showDiff"/> + </s:set> + <s:submit value="%{scm.showDiff}" + onclick="getElementById('diffArea').style.display='inline';return false;"/> + + <s:set id="diff"> + <s:property value="diff"/> + </s:set> + <s:textarea id="diffArea" cssStyle="display:none" rows="20" cols="80" + value="%{diff}"/> + + + <input type="hidden" name="force" value="true"/> + <s:hidden name="address" value="%{address}"/> + <s:hidden name="commitMessage" value="%{commitMessage}"/> + <s:hidden name="newText" value="%{newText}"/> + <s:hidden name="lastText" value="%{lastText}"/> + <s:hidden name="fileType" value="%{fileType}"/> + <s:hidden name="projectUrl" value="%{projectUrl}"/> + <s:hidden name="format" value="%{format}"/> + + <s:hidden name="username" value="%{username}"/> + <s:hidden name="pw" value="%{pw}"/> + + + <s:set id="scm.forceSave"> + <s:text name="scm.forceSave"/> + </s:set> + + <input type="hidden" name="force" value="true"/> + <s:submit + id="ajaxForceSaveButton" + formIds="editForm" + indicator="indicator" + button="true" + buttonIcon="ui-icon-refresh" + value="%{scm.forceSave}" + > + </s:submit> + + + <s:set id="scm.exit"> + <s:text name="scm.exit"/> + </s:set> + <s:submit type="button" value="%{scm.exit}" + onclick="history.back();return false;"/> + + +</form> + </body> </html> \ No newline at end of file Modified: trunk/src/main/webapp/WEB-INF/content/index.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/index.jsp 2011-08-26 15:09:03 UTC (rev 248) +++ trunk/src/main/webapp/WEB-INF/content/index.jsp 2011-08-26 15:24:50 UTC (rev 249) @@ -23,5 +23,5 @@ #L% --%> <% -response.sendRedirect("checkout.action"); + response.sendRedirect("checkout.action"); %> \ No newline at end of file Modified: trunk/src/main/webapp/WEB-INF/content/loginSearch.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/loginSearch.jsp 2011-08-26 15:09:03 UTC (rev 248) +++ trunk/src/main/webapp/WEB-INF/content/loginSearch.jsp 2011-08-26 15:24:50 UTC (rev 249) @@ -23,33 +23,36 @@ #L% --%> <%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="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"/> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> +<sj:head jquerytheme="default"/> -<div id="search"> - <p><s:text name="scm.mustBeLog"/></p> - <p> - <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" - targets="htmlcontentSearch" - href="%{ajaxSearchLogin}" - indicator="indicator" - button="true" - buttonIcon="ui-icon-refresh" - value="%{scm.loginButton}" - > - </sj:submit> - </p> +<div id="search"> + <p><s:text name="scm.mustBeLog"/></p> + + <p> + <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" + targets="htmlcontentSearch" + href="%{ajaxSearchLogin}" + indicator="indicator" + button="true" + buttonIcon="ui-icon-refresh" + value="%{scm.loginButton}" + > + </sj:submit> + </p> </div> \ No newline at end of file Modified: trunk/src/main/webapp/WEB-INF/content/logout.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/logout.jsp 2011-08-26 15:09:03 UTC (rev 248) +++ trunk/src/main/webapp/WEB-INF/content/logout.jsp 2011-08-26 15:24:50 UTC (rev 249) @@ -23,32 +23,37 @@ #L% --%> <%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - <%@ taglib prefix="s" uri="/struts-tags"%> + 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>Logout...</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="Content-Type" content="text/html; charset=UTF-8"> + <title>Logout...</title> + <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> + <link rel="stylesheet" type="text/css" href="css/main.css"> -<% if(request.getAttribute("projectUrl")!=null) { %> -<meta http-equiv="Refresh" content="0;URL=checkout.action?address=<%=request.getAttribute("address")%>&projectUrl=<%=request.getAttribute("projectUrl")%>"> -<% } else { %> -<meta http-equiv="Refresh" content="0;URL=checkout.action?address=<%=request.getAttribute("address")%>"> -<% } %> + <% if (request.getAttribute("projectUrl") != null) { %> + <meta http-equiv="Refresh" + content="0;URL=checkout.action?address=<%=request.getAttribute("address")%>&projectUrl=<%=request.getAttribute("projectUrl")%>"> + <% } else { %> + <meta http-equiv="Refresh" + content="0;URL=checkout.action?address=<%=request.getAttribute("address")%>"> + <% } %> </head> <body> -<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> +<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img + src="img/ScmWebEditor_main.png" alt="$alt"/></a> +<p><s:text name="scm.logoutWait"/><a + href="checkout.action?address=<%=request.getAttribute("address")%>"> <s:text + name="scm.clickHere"/> </a>.</p> -<p><s:text name="scm.logoutWait" /><a href="checkout.action?address=<%=request.getAttribute("address")%>"> <s:text name="scm.clickHere" /> </a>.</p> <p>©2004-2009 CodeLutin</p> </body> </html> \ No newline at end of file Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-08-26 15:09:03 UTC (rev 248) +++ trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-08-26 15:24:50 UTC (rev 249) @@ -22,402 +22,410 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --%> - <%-- Document : ModificationViewer Created on : 10 sept. 2009, 13:43:11 Author : glorieux --%> +<%-- Document : ModificationViewer Created on : 10 sept. 2009, 13:43:11 Author : glorieux --%> -<%@page contentType="text/html" pageEncoding="UTF-8"%> - <%@ taglib prefix="s" uri="/struts-tags"%> - <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> - <sj:head jquerytheme="default"/> +<%@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"> +"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> + <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> - - <script src="codemirror-ui/lib/CodeMirror-2.1/mode/stex/stex.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" /> - - - <script src="js/cancelRedirect.js" type="text/javascript"></script> - <script src="js/pictureUpload.js" type="text/javascript"></script> - - - <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> - <link rel="stylesheet" type="text/css" href="css/main.css"> - - + <!-- 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> + + <script src="codemirror-ui/lib/CodeMirror-2.1/mode/stex/stex.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"/> + + + <script src="js/cancelRedirect.js" type="text/javascript"></script> + <script src="js/pictureUpload.js" type="text/javascript"></script> + + + <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> + <link rel="stylesheet" type="text/css" href="css/main.css"> + + </head> <body> <div id="wrapper"> - <form method="POST" action="commit.action" id="editForm"> +<form method="POST" action="commit.action" id="editForm"> - <div id="head"> - - - <div id="flagEdit"> - - <ul> - <li> - <s:if test="%{#session['WW_TRANS_I18N_LOCALE'] != null && #session['WW_TRANS_I18N_LOCALE'].language == 'en'}"> - <img src="img/flag-i18n-uk.png" /> - </s:if> - <s:else> - <s:a action="checkout.action" namespace="/"> - <s:param name="address"><s:property value="address"/></s:param> - <s:param name="request_locale">en_GB</s:param> - <img src="img/flag-i18n-uk.png" /> - </s:a> - </s:else> - </li> - <li> - <s:if - test="%{#session['WW_TRANS_I18N_LOCALE'] == null || #session['WW_TRANS_I18N_LOCALE'].language == 'fr'}"> - <img src="img/flag-i18n-fr.png" /> - </s:if> - <s:else> - <s:a action="checkout.action" namespace="/"> - <s:param name="address"><s:property value="address"/></s:param> - <s:param name="request_locale">fr_FR</s:param> - <img src="img/flag-i18n-fr.png" /> - </s:a> - </s:else> - </li> - - </ul> - - </div> - - - +<div id="head"> + + +<div id="flagEdit"> + + <ul> + <li> + <s:if + test="%{#session['WW_TRANS_I18N_LOCALE'] != null && #session['WW_TRANS_I18N_LOCALE'].language == 'en'}"> + <img src="img/flag-i18n-uk.png"/> + </s:if> + <s:else> + <s:a action="checkout.action" namespace="/"> + <s:param name="address"><s:property value="address"/></s:param> + <s:param name="request_locale">en_GB</s:param> + <img src="img/flag-i18n-uk.png"/> + </s:a> + </s:else> + </li> + <li> + <s:if + test="%{#session['WW_TRANS_I18N_LOCALE'] == null || #session['WW_TRANS_I18N_LOCALE'].language == 'fr'}"> + <img src="img/flag-i18n-fr.png"/> + </s:if> + <s:else> + <s:a action="checkout.action" namespace="/"> + <s:param name="address"><s:property value="address"/></s:param> + <s:param name="request_locale">fr_FR</s:param> + <img src="img/flag-i18n-fr.png"/> + </s:a> + </s:else> + </li> + + </ul> + +</div> + + <!-- <a title="ScmWebEditor Project Website" target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img width="200" height="160" src="img/editor/machine-a-ecrire.png" alt="ScmWebEditor logo"/></a> --> - - <h1 id="editorTitle" >SCMWebEditor</h1> - - + +<h1 id="editorTitle">SCMWebEditor</h1> + + <!-- authentification --> - <div id="headLogin"> - - <div id="authDiv"> - <h3><s:text name="scm.connection" /></h3> - - <s:if test="username==null || pw==null" > - <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> - - <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}" /> - <input type="checkbox" name="saveCookie" value="true" ><s:text name="scm.stayLogin" /> - </s:if> - <s:else > - - <s:set id="addressDeco"> - <s:property value="address"/> - </s:set> - <s:set id="projectUrlDeco"> - <s:property value="projectUrl"/> - </s:set> - <s:a - id="logout" - href="logout.action?address=%{addressDeco}&projectUrl=%{projectUrlDeco}" - title="Logout" - > - <div id="logoutButton" ></div> - </s:a> - - <s:text name="scm.logAs" /> <s:property value="username" /> - +<div id="headLogin"> + <div id="authDiv"> + <h3><s:text name="scm.connection"/></h3> - <br/> - </s:else> - - <div id="htmlcontentCommit"> - <s:if test="badLogin" > - <p> - <font color="red"> - <s:text name="scm.badUsernameOrPassword"/> - </font> - </p> - </s:if> - </div> - - + <s:if test="username==null || pw==null"> + <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> + + <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}"/> + <input type="checkbox" name="saveCookie" value="true"><s:text + name="scm.stayLogin"/> + </s:if> + <s:else> + + <s:set id="addressDeco"> + <s:property value="address"/> + </s:set> + <s:set id="projectUrlDeco"> + <s:property value="projectUrl"/> + </s:set> + <s:a + id="logout" + href="logout.action?address=%{addressDeco}&projectUrl=%{projectUrlDeco}" + title="Logout" + > + <div id="logoutButton"></div> + </s:a> + + <s:text name="scm.logAs"/> <s:property value="username"/> + + + <br/> + </s:else> + + <div id="htmlcontentCommit"> + <s:if test="badLogin"> + <p> + <font color="red"> + <s:text name="scm.badUsernameOrPassword"/> + </font> + </p> + </s:if> </div> - - - <noscript> - <s:set id="scm.saveAndQuitTitle"> - <s:text name="scm.saveAndQuitTitle"/> - </s:set> - <s:submit - value="commit" - title="Deconnexion" - name="Save" - /> - </noscript> - - <div id="buttonList" > - <!--BEGIN Save and continue --> - <s:url id="ajaxCommit" value="save.action" /> - - <s:set id="scm.saveAndContinueTitle"> - <s:text name="scm.saveAndContinueTitle"/> - </s:set> - <sj:a - onclick="loadChange()" - id="ajaxSaveButton" - formIds="editForm" - targets="htmlcontentCommit" - href="%{ajaxCommit}" - title="%{scm.saveAndContinueTitle}" - > - <div id="saveButton" ></div> - </sj:a> - <!--END Save and continue --> - - <!--BEGIN preview --> - <s:if test="format=='rst'"> - <s:url id="ajaxPreview" value="preview.action" /> - - <s:set id="scm.preview"> - <s:text name="scm.preview"/> - </s:set> - <sj:a onclick="loadChange()" - id="ajaxPreviewButton" - formIds="editForm" - targets="htmlcontentPreview" - href="%{ajaxPreview}" - title="%{scm.preview}" - - > - <div id="previewButton" ></div> - </sj:a> - </s:if> + </div> - <!--END preview --> - - <!--BEGIN reset --> - - <s:set id="scm.resetTitle"> - <s:text name="scm.resetTitle"/> - </s:set> - <sj:a - title="%{scm.resetTitle}" - formIds="editForm" - id="resetButton" - targets="htmlcontentCommit" - href="reset.action" - > - <div id="resetButton" ></div> - </sj:a> - - <!--END reset --> - - <!-- BEGIN save and exit --> - <s:set id="scm.saveAndQuitTitle"> - <s:text name="scm.saveAndQuitTitle"/> - </s:set> - - <s:a - href="javascript:document.getElementById('editForm').submit();" - title="%{scm.saveAndQuitTitle}" - name="Save" - > - <div id="saveAndQuitButton" ></div> - </s:a> - - <!-- END save and exit --> - - <!-- BEGIN exit --> - - <s:if test="projectUrl!=null"> - <s:hidden key="projectUrl" /> - </s:if> - <s:else> - <s:hidden id="projectUrl" value="checkout.action" /> - </s:else> - - - <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:a - href="#" - title="%{scm.exitTitle}" - value="%{scm.exit}" - name="Cancel" - onclick="return cancelRedirect('%{scm.exitJavascript}',document.getElementById('projectUrl'));"> - <div id="exitButton" ></div> - </s:a> - - <!-- END exit --> - - </div> - </div> - - - - <s:set id="scm.commitMessage"> - <s:text name="scm.commitMessage"/> + <noscript> + <s:set id="scm.saveAndQuitTitle"> + <s:text name="scm.saveAndQuitTitle"/> </s:set> - <s:set id="scm.commitMessageTitle"> - <s:text name="scm.commitMessageTitle"/> - </s:set> - - <div id="commitArea" > - <s:textarea cols="60" label="%{scm.commitMessage} " name="commitMessage" title="%{scm.commitMessageTitle}" ></s:textarea> - </div> - </div> - + <s:submit + value="commit" + title="Deconnexion" + name="Save" + /> + </noscript> - <s:hidden key="format" /> - <s:hidden key="mimeType" /> - - <s:if test="format=='rst'"> - <h4><s:text name="scm.info.ProblemWithRst"/> <a href="http://docutils.sourceforge.net/docs/user/rst/quickref.html"><s:text name="scm.info.rstWebsite"/></a>.</h4> - </s:if> - + <div id="buttonList"> - + <!--BEGIN Save and continue --> + <s:url id="ajaxCommit" value="save.action"/> - <p> - <s:text name="scm.FileInEditor"/> <s:a href="%{address}" ><s:property value="address" /></s:a> - <s:text name="scm.atRevision"/> <span id="numrevisionDiv"><s:property value="numRevision" /></span> - </p> - - - <textarea id="newTextId" rows="50" cols="80" name="newText" ><s:property escapeHtml="false" value="OrigText" /></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><s:text name="scm.language"/> - <select id="language" name="langageSelection" onchange="changeModeBy(editor,this)"> - <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> - <option value="xml">XML</option> - <option value="text/x-java">JAVA</option> - <option value="css">CSS</option> - <option value="stex">LaTeX</option> - </select> - </label> + <s:set id="scm.saveAndContinueTitle"> + <s:text name="scm.saveAndContinueTitle"/> + </s:set> + <sj:a + onclick="loadChange()" + id="ajaxSaveButton" + formIds="editForm" + targets="htmlcontentCommit" + href="%{ajaxCommit}" + title="%{scm.saveAndContinueTitle}" + > + <div id="saveButton"></div> + </sj:a> + <!--END Save and continue --> + <!--BEGIN preview --> - - <script type='text/javascript'> - selectLanguage('<s:property value="mimeType"/>','<s:property value="format"/>' ); - changeModeBy(editor, document.getElementById('language')); - </script> + <s:if test="format=='rst'"> + <s:url id="ajaxPreview" value="preview.action"/> + <s:set id="scm.preview"> + <s:text name="scm.preview"/> + </s:set> + <sj:a onclick="loadChange()" + id="ajaxPreviewButton" + formIds="editForm" + targets="htmlcontentPreview" + href="%{ajaxPreview}" + title="%{scm.preview}" - <script type="text/javascript"> - function loadChange() { - document.getElementById('newTextId').value = editor.mirror.getValue(); - } - </script> + > + <div id="previewButton"></div> + </sj:a> + </s:if> + <!--END preview --> - + <!--BEGIN reset --> - <noscript><h4><s:text name="scm.modificationViewer.noJavascript"/></h4></noscript> - <noscript><h4><s:text name="scm.modificationViewer.betterUseJavascript"/></h4></noscript> - - <div id="form"> - + <s:set id="scm.resetTitle"> + <s:text name="scm.resetTitle"/> + </s:set> + <sj:a + title="%{scm.resetTitle}" + formIds="editForm" + id="resetButton" + targets="htmlcontentCommit" + href="reset.action" + > + <div id="resetButton"></div> + </sj:a> - + <!--END reset --> - <p> + <!-- BEGIN save and exit --> + <s:set id="scm.saveAndQuitTitle"> + <s:text name="scm.saveAndQuitTitle"/> + </s:set> - + <s:a + href="javascript:document.getElementById('editForm').submit();" + title="%{scm.saveAndQuitTitle}" + name="Save" + > + <div id="saveAndQuitButton"></div> + </s:a> - <s:hidden key="address" /> - <s:hidden key="origText" /> - <s:hidden key="scmEditorUrl" /> + <!-- END save and exit --> + <!-- BEGIN exit --> - <div id="scmButton"></div> - - </div> - </form> - - <s:set id="scm.upload"> - <s:text name="scm.upload"/> + <s:if test="projectUrl!=null"> + <s:hidden key="projectUrl" label=''/> + </s:if> + <s:else> + <s:hidden id="projectUrl" value="checkout.action"/> + </s:else> + + + <s:set id="scm.exitTitle"> + <s:text name="scm.exitTitle"/> </s:set> - <s:set id="scm.uploadTitle"> - <s:text name="scm.uploadTitle"/> + <s:set id="scm.exitJavascript"> + <s:text name="scm.exitJavascript"/> </s:set> - <s:set name="address"> - <s:property value="address" /> - </s:set> - <center> - <s:submit name="uploadButton" value="%{scm.upload}" title="%{scm.uploadTitle}" onClick="javascript:upload_popup('doUpload.action', 'upload' , getElementById('address') );" /> - </center> - - - - <div> - - - </div> - - - <!-- + <s:a + href="#" + title="%{scm.exitTitle}" + value="%{scm.exit}" + name="Cancel" + onclick="return cancelRedirect('%{scm.exitJavascript}',document.getElementById('projectUrl'));"> + <div id="exitButton"></div> + </s:a> + + <!-- END exit --> + + </div> +</div> + + +<s:set id="scm.commitMessage"> + <s:text name="scm.commitMessage"/> +</s:set> +<s:set id="scm.commitMessageTitle"> + <s:text name="scm.commitMessageTitle"/> +</s:set> + +<div id="commitArea"> + <s:textarea cols="60" label="%{scm.commitMessage} " name="commitMessage" + title="%{scm.commitMessageTitle}"></s:textarea> +</div> +</div> + + +<s:hidden key="format" label=''/> +<s:hidden key="mimeType" label=''/> + +<s:if test="format=='rst'"> + <h4><s:text name="scm.info.ProblemWithRst"/> <a + href="http://docutils.sourceforge.net/docs/user/rst/quickref.html"><s:text + name="scm.info.rstWebsite"/></a>.</h4> +</s:if> + + +<p> + <s:text name="scm.FileInEditor"/> <s:a href="%{address}"><s:property + value="address"/></s:a> + <s:text name="scm.atRevision"/> <span id="numrevisionDiv"><s:property + value="numRevision"/></span> +</p> + + +<textarea id="newTextId" rows="50" cols="80" name="newText"><s:property + escapeHtml="false" value="OrigText"/></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><s:text name="scm.language"/> + <select id="language" name="langageSelection" + onchange="changeModeBy(editor,this)"> + <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> + <option value="xml">XML</option> + <option value="text/x-java">JAVA</option> + <option value="css">CSS</option> + <option value="stex">LaTeX</option> + </select> +</label> + + +<script type='text/javascript'> + selectLanguage('<s:property value="mimeType"/>', '<s:property value="format"/>'); + changeModeBy(editor, document.getElementById('language')); +</script> + + +<script type="text/javascript"> + function loadChange() { + document.getElementById('newTextId').value = editor.mirror.getValue(); + } +</script> + + +<noscript><h4><s:text name="scm.modificationViewer.noJavascript"/></h4> +</noscript> +<noscript><h4><s:text name="scm.modificationViewer.betterUseJavascript"/></h4> +</noscript> + +<div id="form"> + + + <p> + + + <s:hidden key="address" label=''/> + <s:hidden key="origText" label=''/> + <s:hidden key="scmEditorUrl" label=''/> + + + <div id="scmButton"></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> + +<s:set name="address"> + <s:property value="address"/> +</s:set> +<center> + <s:submit name="uploadButton" value="%{scm.upload}" title="%{scm.uploadTitle}" + onClick="javascript:upload_popup('doUpload.action', 'upload' , getElementById('address') );"/> +</center> + + +<div> + + +</div> + + +<!-- <div id="uploadFormId" > <s:form method="POST" id="uploadForm" action="uploadFile" enctype="multipart/form-data"> @@ -438,13 +446,13 @@ </s:form> </div> --> - - <div id="targetContentUpload"></div> - - <div id="htmlcontentPreview"></div> - -</div> - <p align="right">©2004-2009 CodeLutin</p> +<div id="targetContentUpload"></div> + + +<div id="htmlcontentPreview"></div> + +</div> +<p align="right">©2004-2009 CodeLutin</p> </body> </html> Modified: trunk/src/main/webapp/WEB-INF/content/outConnection.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/outConnection.jsp 2011-08-26 15:09:03 UTC (rev 248) +++ trunk/src/main/webapp/WEB-INF/content/outConnection.jsp 2011-08-26 15:24:50 UTC (rev 249) @@ -22,105 +22,106 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --%> -<%-- 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"/> +<%-- 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"> +"http://www.w3.org/TR/html4/loose.dtd"> -<html> +<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> + <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/accueil/machine-a-ecrire.png" alt="$alt" /></a> --> <div id="wrapperConfig"> + <div id="flagHome"> -<div id="flagHome"> - <ul> <li> - <s:if test="%{#session['WW_TRANS_I18N_LOCALE'] != null && #session['WW_TRANS_I18N_LOCALE'].language == 'en'}"> - <img src="img/flag-i18n-uk.png" /> + <s:if + test="%{#session['WW_TRANS_I18N_LOCALE'] != null && #session['WW_TRANS_I18N_LOCALE'].language == 'en'}"> + <img src="img/flag-i18n-uk.png"/> </s:if> <s:else> <s:a action="checkout.action" namespace="/"> <s:param name="request_locale">en_GB</s:param> - <img src="img/flag-i18n-uk.png" /> + <img src="img/flag-i18n-uk.png"/> </s:a> </s:else> </li> <li> <s:if test="%{#session['WW_TRANS_I18N_LOCALE'] == null || #session['WW_TRANS_I18N_LOCALE'].language == 'fr'}"> - <img src="img/flag-i18n-fr.png" /> + <img src="img/flag-i18n-fr.png"/> </s:if> <s:else> <s:a action="checkout.action" namespace="/"> <s:param name="request_locale">fr_FR</s:param> - <img src="img/flag-i18n-fr.png" /> + <img src="img/flag-i18n-fr.png"/> </s:a> </s:else> </li> - + </ul> -</div> + </div> -<div id="wrapper2Config"> + <div id="wrapper2Config"> -<div id="titleConfig" > - <h2><s:text name="scm.welcome"/></h2> - <noscript><h4><s:text name="scm.outConnection.noJavascript"/></h4></noscript> - <h4> - <s:text name="scm.outConnection.enterRepo"/> - </h4> -</div> + <div id="titleConfig"> + <h2><s:text name="scm.welcome"/></h2> + <noscript><h4><s:text name="scm.outConnection.noJavascript"/></h4> + </noscript> + <h4> + <s:text name="scm.outConnection.enterRepo"/> + </h4> + </div> + <form id="configForm" method="get" action="checkout.action"> + <center> -<form id="configForm" method="get" action="checkout.action"> -<center> + <p><label><s:text name="scm.outConnection.scmPath"/> <input TYPE=text + name="address" + SIZE=50></label> + <s:url id="ajaxSearch" value="search.action"/> - <p><label><s:text name="scm.outConnection.scmPath"/> <input TYPE=text name="address" SIZE=50></label> - - <s:url id="ajaxSearch" value="search.action" /> - - <s:set id="search"> - <s:text name="scm.outConnection.search"/> - </s:set> - <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" /> - </p> -</center> -<div id="htmlcontentSearch" ></div> -</form> + <s:set id="search"> + <s:text name="scm.outConnection.search"/> + </s:set> + <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"/> + </p> + </center> + <div id="htmlcontentSearch"></div> + </form> + + <!-- <div id="searchTree"> <s:url id="searchTreeUrl" action="search?address=http://localhost/scmsvn"/> @@ -132,8 +133,8 @@ </div> --> + </div> </div> -</div> <p align="right">©2004-2011 CodeLutin</p> </body> Modified: trunk/src/main/webapp/WEB-INF/content/preview.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/preview.jsp 2011-08-26 15:09:03 UTC (rev 248) +++ trunk/src/main/webapp/WEB-INF/content/preview.jsp 2011-08-26 15:24:50 UTC (rev 249) @@ -22,13 +22,13 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --%> - <%@ taglib prefix="s" uri="/struts-tags"%> - <%@page contentType="text/html" pageEncoding="UTF-8"%> - <%--Title and div for rst preview--%> - <h3 id="prevtitle" ><s:text name="scm.preview" /> :</h3> - - <div id="prev" title="Preview"> - <div id="preview" > - <s:property value="XMLResponse" escapeHtml="false"/> - </div> - </div> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%--Title and div for rst preview--%> +<h3 id="prevtitle"><s:text name="scm.preview"/> :</h3> + +<div id="prev" title="Preview"> + <div id="preview"> + <s:property value="XMLResponse" escapeHtml="false"/> + </div> +</div> Modified: trunk/src/main/webapp/WEB-INF/content/privateSvnRedirect.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/privateSvnRedirect.jsp 2011-08-26 15:09:03 UTC (rev 248) +++ trunk/src/main/webapp/WEB-INF/content/privateSvnRedirect.jsp 2011-08-26 15:24:50 UTC (rev 249) @@ -23,53 +23,61 @@ #L% --%> <%-- 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"%> +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"> +"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"> + <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="fromLoginPage" value="true"> +<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img + src="img/ScmWebEditor_main.png" alt="$alt"/></a> -<% if(request.getAttribute("projectUrl")!=null) { %> -<input type="hidden" name="ProjectUrl" value="<%=request.getAttribute("projectUrl")%>"/> -<% } else { %> -<input type="hidden" name="ProjectUrl" value="checkout.action"/> -<% } %> +<form method="post" action="checkout.action"> + <input type="hidden" name="address" + value="<%=request.getAttribute("address")%>"/> + <input type="hidden" name="fromLoginPage" value="true"> -<script src="cancelRedirect.js"></script> -<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> - <input type="checkbox" name="saveCookie" value="true" >Rester connecté - - </p> - - -<input type="submit" name="Save" /> + <% if (request.getAttribute("projectUrl") != null) { %> + <input type="hidden" name="ProjectUrl" + value="<%=request.getAttribute("projectUrl")%>"/> + <% } else { %> + <input type="hidden" name="ProjectUrl" value="checkout.action"/> + <% } %> + <script src="cancelRedirect.js"></script> + <p><s:text name="scm.privateScmAccess"/></p> - <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);"/> - + <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> + <input type="checkbox" name="saveCookie" value="true">Rester connecté + + </p> + + + <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> Modified: trunk/src/main/webapp/WEB-INF/content/recall.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/recall.jsp 2011-08-26 15:09:03 UTC (rev 248) +++ trunk/src/main/webapp/WEB-INF/content/recall.jsp 2011-08-26 15:24:50 UTC (rev 249) @@ -23,20 +23,22 @@ #L% --%> <%-- 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"%> +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"> +"http://www.w3.org/TR/html4/loose.dtd"> <html> <head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<title><s:text name="scm.redirection" /></title> -<% if(request.getAttribute("projectUrl")!=null) { %> -<meta http-equiv="Refresh" content="3; url=<%=request.getAttribute("projectUrl")%>"> -<% } else { %> -<meta http-equiv="Refresh" content="3;URL=checkout.action"> -<% } %> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title><s:text name="scm.redirection"/></title> + <% if (request.getAttribute("projectUrl") != null) { %> + <meta http-equiv="Refresh" + content="3; url=<%=request.getAttribute("projectUrl")%>"> + <% } else { %> + <meta http-equiv="Refresh" content="3;URL=checkout.action"> + <% } %> </head> </html> Modified: trunk/src/main/webapp/WEB-INF/content/redirect.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/redirect.jsp 2011-08-26 15:09:03 UTC (rev 248) +++ trunk/src/main/webapp/WEB-INF/content/redirect.jsp 2011-08-26 15:24:50 UTC (rev 249) @@ -23,33 +23,39 @@ #L% --%> <%-- 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"%> +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"> +"http://www.w3.org/TR/html4/loose.dtd"> <html> <head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<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"> -<% if(request.getAttribute("projectUrl")!=null) { %> -<meta http-equiv="Refresh" content="3; url=<%=request.getAttribute("projectUrl")%>"> -<% } else { %> -<meta http-equiv="Refresh" content="3;URL=checkout.action"> -<% } %> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <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"> + <% if (request.getAttribute("projectUrl") != null) { %> + <meta http-equiv="Refresh" + content="3; url=<%=request.getAttribute("projectUrl")%>"> + <% } else { %> + <meta http-equiv="Refresh" content="3;URL=checkout.action"> + <% } %> </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="scm.thankUsing" /></p> -<p><s:text name="scm.beTransferred" /> -<% if(request.getAttribute("projectUrl")!=null) { %> - <a href="<%=request.getAttribute("projectUrl")%>"> -<% } else { %> +<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img + src="img/ScmWebEditor_main.png" alt="$alt"/></a> + +<p><s:text name="scm.thankUsing"/></p> + +<p><s:text name="scm.beTransferred"/> + <% if (request.getAttribute("projectUrl") != null) { %> + <a href="<%=request.getAttribute("projectUrl")%>"> + <% } else { %> <a href="checkout.action"> -<% } %> -<s:text name="scm.clickHere" /></a>.</p> + <% } %> + <s:text name="scm.clickHere"/></a>.</p> + <p>©2004-2009 CodeLutin</p> </body> </html> Modified: trunk/src/main/webapp/WEB-INF/content/reset.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/reset.jsp 2011-08-26 15:09:03 UTC (rev 248) +++ trunk/src/main/webapp/WEB-INF/content/reset.jsp 2011-08-26 15:24:50 UTC (rev 249) @@ -22,27 +22,27 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --%> -<%@ taglib prefix="s" uri="/struts-tags"%> +<%@ taglib prefix="s" uri="/struts-tags" %> - <s:set name="lastRevision"> - <s:property value="lastRevision"/> - </s:set> - - <s:hidden id="valueOfLastRevision" value="%{lastRevision}" /> - <s:if test="error=='authError'"> - <p><font color="red"><s:text name="scm.badUsernameOrPassword"/></font></p> - </s:if> - <s:elseif test="error=='errorPath'"> - <p><font color="red"><s:text name="scm.erreurRepo"/></font></p> - </s:elseif> - <s:else> - <script type="text/javascript"> - - editor.mirror.setValue(document.getElementById('valueOfLastRevision').value); - - var numrev = <s:property value="numRevision" />; - if(numrev!=null) { - document.getElementById('numrevisionDiv').innerHTML=numrev; - } - </script> - </s:else> \ No newline at end of file +<s:set name="lastRevision"> + <s:property value="lastRevision"/> +</s:set> + +<s:hidden id="valueOfLastRevision" value="%{lastRevision}"/> +<s:if test="error=='authError'"> + <p><font color="red"><s:text name="scm.badUsernameOrPassword"/></font></p> +</s:if> +<s:elseif test="error=='errorPath'"> + <p><font color="red"><s:text name="scm.erreurRepo"/></font></p> +</s:elseif> +<s:else> + <script type="text/javascript"> + + editor.mirror.setValue(document.getElementById('valueOfLastRevision').value); + + var numrev = <s:property value="numRevision" />; + if (numrev != null) { + document.getElementById('numrevisionDiv').innerHTML = numrev; + } + </script> +</s:else> \ No newline at end of file Modified: trunk/src/main/webapp/WEB-INF/content/save.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/save.jsp 2011-08-26 15:09:03 UTC (rev 248) +++ trunk/src/main/webapp/WEB-INF/content/save.jsp 2011-08-26 15:24:50 UTC (rev 249) @@ -22,92 +22,95 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --%> - <%@ taglib prefix="s" uri="/struts-tags"%> - <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> - +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> - - <s:if test="result=='login'" > - <p> <font color="red"><s:text name="scm.badUsernameOrPassword"/><br/> <s:text name="scm.cannotSave"/></font> </p> - </s:if> - <s:elseif test="result=='error'" > - <p> <s:text name="scm.cannotSave" /></p> - </s:elseif> - <s:elseif test="result=='errorRst'" > - - <p> <s:text name="scm.rstNotValidMessage" /> </p> - <s:url id="ajaxForceSave" action="save" /> - <input type="hidden" name="force" value="true"/> - - <s:set id="scm.yes"> - <s:text name="scm.yes"/> - </s:set> - - <sj:submit - id="ajaxForceSaveButton" - formIds="editForm" - targets="htmlcontentCommit" - href="%{ajaxForceSave}" - indicator="indicator" - button="true" - buttonIcon="ui-icon-refresh" - value="%{scm.yes}" - > - </sj:submit> - - </s:elseif> - - <s:elseif test="result=='fileModify'" > - <p><s:text name="scm.fileModify" /> <s:text name="scm.by" /> <s:property value="headCommiter" /></p> - - <s:set id="scm.showDiff" > - <s:text name="scm.showDiff" /> - </s:set> - <s:submit value="%{scm.showDiff}" onclick="getElementById('diffArea').style.display='inline';return false;" /> - - <s:set id="diff" > - <s:property value="diff" /> - </s:set> - <s:textarea id="diffArea" cssStyle="display:none" rows="20" cols="80" value="%{diff}" /> - <s:url id="ajaxForceSave" action="save" /> - - <input type="hidden" name="force" value="true"/> - - <s:set id="scm.forceSave"> - <s:text name="scm.forceSave"/> - </s:set> - <sj:submit - id="ajaxForceSaveButton" - formIds="editForm" - targets="htmlcontentCommit" - href="%{ajaxForceSave}" - indicator="indicator" - button="true" - buttonIcon="ui-icon-refresh" - value="%{scm.forceSave}" - > - </sj:submit> - - </s:elseif> - - <s:elseif test="result=='errorPath'" > - <p><s:text name="scm.cannotSave"/>, <s:text name="scm.pathError"/></p> - </s:elseif> - - <s:elseif test="result=='uselessSave'" > - <p><s:text name="scm.uselessSave"/></p> - </s:elseif> - - <s:else> - <p><s:text name="scm.lastChangeSave"/>: <s:property value="formatDate" /> </p> - <s:set id="lastRevSet" value="newText" /> - <s:hidden id="lastRev" value="%{lastText}" /> - <script type="text/javascript"> - origText = document.getElementById("origText"); - origText.value = document.getElementById("lastRev").value; - var numrev = <s:property value="numRevision" />; - if(numrev!=null) { - document.getElementById('numrevisionDiv').innerHTML=numrev; - } - </script> - </s:else> \ No newline at end of file + +<s:if test="result=='login'"> + <p><font color="red"><s:text name="scm.badUsernameOrPassword"/><br/> <s:text + name="scm.cannotSave"/></font></p> +</s:if> +<s:elseif test="result=='error'"> + <p><s:text name="scm.cannotSave"/></p> +</s:elseif> +<s:elseif test="result=='errorRst'"> + + <p><s:text name="scm.rstNotValidMessage"/></p> + <s:url id="ajaxForceSave" action="save"/> + <input type="hidden" name="force" value="true"/> + + <s:set id="scm.yes"> + <s:text name="scm.yes"/> + </s:set> + + <sj:submit + id="ajaxForceSaveButton" + formIds="editForm" + targets="htmlcontentCommit" + href="%{ajaxForceSave}" + indicator="indicator" + button="true" + buttonIcon="ui-icon-refresh" + value="%{scm.yes}" + > + </sj:submit> + +</s:elseif> + +<s:elseif test="result=='fileModify'"> + <p><s:text name="scm.fileModify"/> <s:text name="scm.by"/> <s:property + value="headCommiter"/></p> + + <s:set id="scm.showDiff"> + <s:text name="scm.showDiff"/> + </s:set> + <s:submit value="%{scm.showDiff}" + onclick="getElementById('diffArea').style.display='inline';return false;"/> + + <s:set id="diff"> + <s:property value="diff"/> + </s:set> + <s:textarea id="diffArea" cssStyle="display:none" rows="20" cols="80" + value="%{diff}"/> + <s:url id="ajaxForceSave" action="save"/> + + <input type="hidden" name="force" value="true"/> + + <s:set id="scm.forceSave"> + <s:text name="scm.forceSave"/> + </s:set> + <sj:submit + id="ajaxForceSaveButton" + formIds="editForm" + targets="htmlcontentCommit" + href="%{ajaxForceSave}" + indicator="indicator" + button="true" + buttonIcon="ui-icon-refresh" + value="%{scm.forceSave}" + > + </sj:submit> + +</s:elseif> + +<s:elseif test="result=='errorPath'"> + <p><s:text name="scm.cannotSave"/>, <s:text name="scm.pathError"/></p> +</s:elseif> + +<s:elseif test="result=='uselessSave'"> + <p><s:text name="scm.uselessSave"/></p> +</s:elseif> + +<s:else> + <p><s:text name="scm.lastChangeSave"/>: <s:property value="formatDate"/></p> + <s:set id="lastRevSet" value="newText"/> + <s:hidden id="lastRev" value="%{lastText}"/> + <script type="text/javascript"> + origText = document.getElementById("origText"); + origText.value = document.getElementById("lastRev").value; + var numrev = <s:property value="numRevision" />; + if (numrev != null) { + document.getElementById('numrevisionDiv').innerHTML = numrev; + } + </script> +</s:else> \ No newline at end of file Modified: trunk/src/main/webapp/WEB-INF/content/search.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/search.jsp 2011-08-26 15:09:03 UTC (rev 248) +++ trunk/src/main/webapp/WEB-INF/content/search.jsp 2011-08-26 15:24:50 UTC (rev 249) @@ -23,47 +23,48 @@ #L% --%> <%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> + 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 debug="true" jquerytheme="default"/> +<%@ 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) { + $.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")); + 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> +<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> + <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> + Modified: trunk/src/main/webapp/WEB-INF/content/upload.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/upload.jsp 2011-08-26 15:09:03 UTC (rev 248) +++ trunk/src/main/webapp/WEB-INF/content/upload.jsp 2011-08-26 15:24:50 UTC (rev 249) @@ -22,16 +22,15 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --%> -<%@ taglib prefix="s" uri="/struts-tags"%> +<%@ taglib prefix="s" uri="/struts-tags" %> - - - <s:if test="badLogin"> - <p><font color="red"><s:text name="scm.badUsernameOrPassword"/></font></p> - </s:if> - <s:elseif test="error"> - <p><font color="red"><s:text name="scm.erreurRepo"/></font></p> - </s:elseif> - <s:else> - <p><s:text name="scm.uploadSuccess"/></p> - </s:else> \ No newline at end of file + +<s:if test="badLogin"> + <p><font color="red"><s:text name="scm.badUsernameOrPassword"/></font></p> +</s:if> +<s:elseif test="error"> + <p><font color="red"><s:text name="scm.erreurRepo"/></font></p> +</s:elseif> +<s:else> + <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-08-26 15:09:03 UTC (rev 248) +++ trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp 2011-08-26 15:24:50 UTC (rev 249) @@ -23,19 +23,19 @@ #L% --%> <%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> + pageEncoding="UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags"%> - <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> - <%@ taglib prefix="sjt" uri="/struts-jquery-tree-tags" %> - +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> +<%@ taglib prefix="sjt" uri="/struts-jquery-tree-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> -<link rel="stylesheet" type="text/css" href="css/main.css"> -<link rel="stylesheet" type="text/css" href="css/uploadForm.css"> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>UploadFile</title> + <link rel="stylesheet" type="text/css" href="css/main.css"> + <link rel="stylesheet" type="text/css" href="css/uploadForm.css"> </head> @@ -44,59 +44,65 @@ <sj:head debug="true" jquerytheme="default"/> <script> -$.subscribe('treeClicked', function(event, data) { + $.subscribe('treeClicked', function(event, data) { var item = event.originalEvent.data.rslt.obj; - if(item.text().indexOf("/") != -1) { - window.document.getElementById("svnPath").value=item.attr("id"); + if (item.text().indexOf("/") != -1) { + window.document.getElementById("svnPath").value = item.attr("id"); } -}); + }); </script> +<form method="POST" id="uploadForm" action="doUpload.action" + enctype="multipart/form-data"> - <form method="POST" id="uploadForm" action="doUpload.action" enctype="multipart/form-data"> - - <center><h1><s:text name="scm.upload" ></s:text></h1></center> - - <label><s:text name="scm.uploadFile" /> : <input type="file" name="upload"/></label><br/> - <label><s:text name="scm.uploadPath" /> : <s:textfield size="50px" type="text" name="svnPath" id="svnPath" value="%{fileRoot}" /></label><br/> - - - <div id="searchTree"> + <center><h1><s:text name="scm.upload"></s:text></h1></center> - <s:url id="searchTreeUrl" action="search?address=%{svnRoot}&username=%{username}&pw=%{pw}" /> - <sjt:tree id="svnTree" - htmlTitles="true" - jstreetheme="classic" - href="%{searchTreeUrl}" - onClickTopics="treeClicked" - /> - - </div> - + <label><s:text name="scm.uploadFile"/> : <input type="file" + name="upload"/></label><br/> + <label><s:text name="scm.uploadPath"/> : <s:textfield size="50px" type="text" + name="svnPath" + id="svnPath" + value="%{fileRoot}"/></label><br/> - <s:if test="username==null || pw==null" > - <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> - <s:else> - <s:text name="scm.logAs" /> <s:property value="username" /> <br/> - </s:else> - - - <s:hidden key="address" /> - <s:if test="badLogin"> - <p><font color="red"><s:text name="scm.badUsernameOrPassword"/></font></p> - </s:if> - <s:elseif test="error"> - <p><font color="red"><s:text name="scm.erreurRepo"/></font></p> - </s:elseif> - <input type="submit"/> - </form> + <div id="searchTree"> + <s:url id="searchTreeUrl" + action="search?address=%{svnRoot}&username=%{username}&pw=%{pw}"/> + <sjt:tree id="svnTree" + htmlTitles="true" + jstreetheme="classic" + href="%{searchTreeUrl}" + onClickTopics="treeClicked" + /> + + </div> + + + <s:if test="username==null || pw==null"> + <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> + + <s:else> + <s:text name="scm.logAs"/> <s:property value="username"/> <br/> + </s:else> + + + <s:hidden key="address"/> + <s:if test="badLogin"> + <p><font color="red"><s:text name="scm.badUsernameOrPassword"/></font></p> + </s:if> + <s:elseif test="error"> + <p><font color="red"><s:text name="scm.erreurRepo"/></font></p> + </s:elseif> + <input type="submit"/> +</form> + </body> </html> \ No newline at end of file Modified: trunk/src/main/webapp/WEB-INF/content/uploadSuccess.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/uploadSuccess.jsp 2011-08-26 15:09:03 UTC (rev 248) +++ trunk/src/main/webapp/WEB-INF/content/uploadSuccess.jsp 2011-08-26 15:24:50 UTC (rev 249) @@ -23,18 +23,19 @@ #L% --%> <%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - <%@ taglib prefix="s" uri="/struts-tags"%> + 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>Success</title> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>Success</title> </head> <body> <p><s:text name="scm.uploadSuccess"/></p> - <form> - <input type="button" value="close" onclick="window.close()"> - </form> + +<form> + <input type="button" value="close" onclick="window.close()"> +</form> </body> </html> \ No newline at end of file