branch develop updated (486d842 -> 176a8a2)
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 486d842 Fix the access to a private Git repository by a direct link new 176a8a2 Put the logout button back on the editor page 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 176a8a26f6ace6ea5e611abc12df95a4b94c7162 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Fri May 29 16:52:51 2015 +0200 Put the logout button back on the editor page Summary of changes: .../main/webapp/WEB-INF/content/modificationViewer.jsp | 15 +++++++++++++++ swe-ui-web/src/main/webapp/css/main.css | 1 - 2 files changed, 15 insertions(+), 1 deletion(-) -- 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 176a8a26f6ace6ea5e611abc12df95a4b94c7162 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Fri May 29 16:52:51 2015 +0200 Put the logout button back on the editor page --- .../main/webapp/WEB-INF/content/modificationViewer.jsp | 15 +++++++++++++++ swe-ui-web/src/main/webapp/css/main.css | 1 - 2 files changed, 15 insertions(+), 1 deletion(-) 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 adfd4cd..65c39ef 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 @@ -479,10 +479,25 @@ <s:if test="username==null || pw==null"> <label for="username"><s:text name="scm.username"/> :</label> <input type="text" name="username" id="username"/><br/> <label for="pw"><s:text name="scm.password"/> :</label> <input type="password" id="pw" name="pw"/><br/> + <input type="checkbox" name="saveCookie" value="true"><s:text name="scm.stayLogin"/> </s:if> <s:else> <s:text name="scm.logAs"/> <s:property value="username"/> <br/> + + <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}&scmType=%{scmType}&selectedBranch=%{selectedBranch}&repositoryRoot=%{repositoryRoot}" + title="Logout" + > + <div id="logoutButton"></div> + </s:a> </s:else> </form> diff --git a/swe-ui-web/src/main/webapp/css/main.css b/swe-ui-web/src/main/webapp/css/main.css index a5d3fac..8898d09 100644 --- a/swe-ui-web/src/main/webapp/css/main.css +++ b/swe-ui-web/src/main/webapp/css/main.css @@ -299,7 +299,6 @@ ul.flags li { } #logoutButton { - float:right; background-image:url("../img/editor/shut-down-hover.png"); background-repeat:no-repeat; height:33px; -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm