branch develop updated (5d1a132 -> 99f7738)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git from 5d1a132 Code refactoring to make the GitConnection and SvnConnection classes shorter new 99f7738 Fix the commit form and the logout button The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 99f7738b65b666a939f71c39fd08bb957dfbf9e9 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Tue Jun 2 16:26:16 2015 +0200 Fix the commit form and the logout button Summary of changes: .../org/nuiton/scmwebeditor/svn/SvnConnection.java | 2 +- .../scmwebeditor/uiweb/actions/LogoutAction.java | 2 ++ .../webapp/WEB-INF/content/modificationViewer.jsp | 32 ++++++++++++---------- swe-ui-web/src/main/webapp/css/main.css | 1 + 4 files changed, 21 insertions(+), 16 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 99f7738b65b666a939f71c39fd08bb957dfbf9e9 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Tue Jun 2 16:26:16 2015 +0200 Fix the commit form and the logout button --- .../org/nuiton/scmwebeditor/svn/SvnConnection.java | 2 +- .../scmwebeditor/uiweb/actions/LogoutAction.java | 2 ++ .../webapp/WEB-INF/content/modificationViewer.jsp | 32 ++++++++++++---------- swe-ui-web/src/main/webapp/css/main.css | 1 + 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnConnection.java b/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnConnection.java index 47df65d..e6cda7e 100644 --- a/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnConnection.java +++ b/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnConnection.java @@ -584,7 +584,7 @@ public class SvnConnection implements ScmConnection { repositoryUUID = repository.getRepositoryUUID(true); } catch (SVNException e) { if (log.isDebugEnabled()) { - log.debug("Can't get UUID"); + log.debug("Can't get UUID", e); } return null; } diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/LogoutAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/LogoutAction.java index 0b3a638..d0a9f5b 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/LogoutAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/LogoutAction.java @@ -33,6 +33,7 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.File; +import java.text.Normalizer; /** * Ends the user session on the repository @@ -81,6 +82,7 @@ public class LogoutAction extends AbstractScmWebEditorAction implements ServletR String repositoryId = scmConn.getRepositoryId(); if (repositoryId == null) { repositoryId = address.replace(' ', '_'); + repositoryId = Normalizer.normalize(repositoryId, Normalizer.Form.NFD).replaceAll("[\u0300-\u036F]", ""); } // deleting the cookies for this repository diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp index 3fc4c5e..cd7c0f8 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp @@ -507,7 +507,8 @@ </s:if> <s:else> - <s:text name="scm.logAs"/> <s:property value="username"/> <br/> + <div> + <s:text name="scm.logAs"/> <s:property value="username"/> <s:set id="addressDeco"> <s:property value="address"/> @@ -522,24 +523,25 @@ > <div id="logoutButton"></div> </s:a> + </div> </s:else> - </form> + <s:set id="scm.submit"> + <s:text name="scm.submit"/> + </s:set> - <s:set id="scm.submit"> - <s:text name="scm.submit"/> - </s:set> + <sj:a + onBeforeTopics="beforeCommit" + id="ajaxSaveButton" + formIds="editForm,commitForm" + targets="htmlcontentCommit" + href="%{ajaxCommit}" + title="%{scm.saveAndContinueTitle}" + > + <s:submit id="Save" value="%{scm.submit}" onclick="return false;"/> + </sj:a> - <sj:a - onBeforeTopics="beforeCommit" - id="ajaxSaveButton" - formIds="editForm,commitForm" - targets="htmlcontentCommit" - href="%{ajaxCommit}" - title="%{scm.saveAndContinueTitle}" - > - <s:submit id="Save" value="%{scm.submit}"/> - </sj:a> + </form> <div id="htmlcontentCommit"> <s:if test="badLogin"> diff --git a/swe-ui-web/src/main/webapp/css/main.css b/swe-ui-web/src/main/webapp/css/main.css index 313021e..f5c6b5d 100644 --- a/swe-ui-web/src/main/webapp/css/main.css +++ b/swe-ui-web/src/main/webapp/css/main.css @@ -310,6 +310,7 @@ ul.flags li { height:33px; width:33px; background-position: 0px -4px; + float: right; } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm