This is an automated email from the git hooks/post-receive script. New commit to branch refonteUI-2017 in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit bb444cf58aa630f5db52ccad1dda35bbd205b283 Author: kaufmann <kaufmann@codelutin.com> Date: Wed Feb 5 11:22:45 2020 +0100 Modification de l'affichage de l'écran de connexion --- bow-ui/src/main/less/common/_notifications.less | 30 ++++++++++++------------- bow-ui/src/main/less/components/connexion.less | 20 +++++++++++++---- bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp | 21 ++++++++++++----- 3 files changed, 45 insertions(+), 26 deletions(-) diff --git a/bow-ui/src/main/less/common/_notifications.less b/bow-ui/src/main/less/common/_notifications.less index db82230..9fae669 100644 --- a/bow-ui/src/main/less/common/_notifications.less +++ b/bow-ui/src/main/less/common/_notifications.less @@ -1,4 +1,8 @@ - +#msg { + position: fixed; + top: @default-sidebar-width + 20px; + right : 20px; +} .error{ float:left; overflow:auto; @@ -6,33 +10,27 @@ margin-bottom:25px; padding:4px; - color:red; + color:@color-red; background-color:white; font-size:medium; } .errorMessage{ - color:red; - - font-size:12px; - font-weight:normal; + background: #e3d0d0; + padding: 20px; + list-style: none; + border-left: 10px solid @color-red; + color: @color-black; + + font-size:12px; + font-weight:normal; } #actionmessageHeader{ - position:fixed; - top:12px; - left:25%; - - color:blue; } #actionerrorHeader{ - position:relative; - top:12px; - left:25%; - - color:red; } #actionmessageHeader ul, #actionerrorHeader ul{ diff --git a/bow-ui/src/main/less/components/connexion.less b/bow-ui/src/main/less/components/connexion.less index fd11ef2..4677a45 100644 --- a/bow-ui/src/main/less/components/connexion.less +++ b/bow-ui/src/main/less/components/connexion.less @@ -6,9 +6,21 @@ min-height: calc(~"100vh" - @default-footer-height); .gradient(@color-main, @color-main, darken(@color-main, 15)); color: #FFF; -} -#bow-login-header { - background-color: @color-sidebar-background; - min-height: @default-sidebar-width; + h1, + label, + a, + button, + .submit-button { + color: #FFF; + } + a:hover { + color: @color-link-hover; + } + .submit-button { + border-bottom-color: #FFF; + border-left-color: #FFF; + border-right-color: #AAA; + border-top-color: #AAA; + } } diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp index 8d79f53..df2f7a7 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp @@ -30,19 +30,28 @@ <title><s:text name="bow.login.title" /></title> <body> <div id="bow-login"> - <div id="bow-login-header"> - </div> + <jsp:include page="inc/header-empty.jsp" flush="true"/> <div class="centered-wrapper"> <h1><s:text name="bow.login.title" /></h1> - <s:actionerror /> + <s:form action="login"> - <s:textfield key="bow.login.email" name="email" labelposition="top" labelSeparator=" :" /> - <s:password key="bow.login.password" name="password" labelposition="top" labelSeparator=" :" /> - <s:submit key="bow.login.submit" name="submit" /> + <div class="bow-form-row"> + <s:textfield key="bow.login.email" name="email" labelposition="top" labelSeparator=" :" /> + </div> + <div class="bow-form-row"> + <s:password key="bow.login.password" name="password" labelposition="top" labelSeparator=" :" /> + </div> + + <div class="bow-form-row"> + <s:submit key="bow.login.submit" name="submit" cssClass="submit-button"/> + </div> </s:form> + <s:a action="register_input" id="registerLink"><s:text name="bow.register.title" /></s:a><br /> <s:a action="forgotPassword_input" id="forgotPwd"><s:text name="bow.forgotpwd.title" /></s:a> + + <s:actionerror /> </div> </div> </body> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.