Commit 7972af8a authored by Taisiya Glushko's avatar Taisiya Glushko
Browse files

registration-login-forgot-password-pages

parent 8ed34bd8
......@@ -2027,6 +2027,13 @@ $light-font-family: 'Roboto-Light';
.collect-info {
margin: 0 5px 20px 5px;
}
h1.green-bg {
color: #ffffff;
font-family: $heading-font-family;
padding: 18px 15px 23px 21px;
font-size: 24px;
margin: 0 -15px 20px -15px;
}
//country page
.country-page {
......@@ -2182,6 +2189,98 @@ $light-font-family: 'Roboto-Light';
}
}
}
//login, login-error, registration form
.genesys-page form:not(#loginForm).form-horizontal.row {
&:after {
display: block;
height: 80px;
width: 100%;
background: #D4D1C6;
}
.form-group {
width: 98%;
border: none;
margin: 0 auto 4px auto;
height: auto;
padding: 0 15px 0 11px;
&:nth-child(odd) {
background: #F8F7F5;
}
&:nth-child(even) {
background: #F3F2EE;
}
&:before {
display: none;
}
input {
border: 2px solid #c1c1c1;
width: 100%;
font-size: 14px;
padding: 11px;
margin: 10px 0 11px 0;
}
input.span3 {
width: 47.5%;
}
.control-label {
text-align: left;
padding: 0;
font-size: 14px;
font-family: $default-font-family;
font-weight: 400;
line-height: 66px;
}
button.btn.btn-primary, input.btn {
background-color: #88ba42;
font-family: $emphasis-font-family;
font-size: 17px;
padding: 10px 41px;
border: 2px solid #ffffff;
border-radius: 1px;
color: #ffffff;
text-transform: uppercase;
width: auto;
}
.btn-default {
background: transparent;
border: none;
font-size: 14px;
line-height: 34px;
}
.checkbox {
padding: 10px 0 11px 15px;
input[type='checkbox'] {
height: auto;
width: auto;
line-height: 66px;
position: relative;
margin-left: 0;
}
.control-label {
font-weight: 700;
line-height: 46px;
}
}
.g-recaptcha {
padding: 10px 0;
}
}
.alert {
margin-bottom: 10px;
}
.form-group.transparent {
background: transparent;
}
.form-group > div {
border-left: 2px solid #E7E5DF;
}
.form-group > div > button,
.form-group > div > a {
margin: 10px 0;
}
}
@media (min-width: 990px) and (max-width: 1919px) {
.genesys-page {
......@@ -3593,6 +3692,39 @@ $light-font-family: 'Roboto-Light';
}
}
}
// login, login-error, registration form
.genesys-page form:not(#loginForm).form-horizontal.row .form-group > div {
border-left: none;
padding: 0;
}
.genesys-page form:not(#loginForm).form-horizontal.row .form-group input.span3.required.form-control {
width: 100%;
}
.genesys-page form:not(#loginForm).form-horizontal.row .form-group .control-label {
line-height: 45px;
}
.genesys-page form:not(#loginForm).form-horizontal.row .form-group .btn-default {
display: block;
width: 150px;
text-align: left;
padding-left: 3px;
}
.genesys-page form:not(#loginForm).form-horizontal.row .form-group .btn-default.col-xs-12 {
width: 40%;
margin-right: 50%;
}
.genesys-page form:not(#loginForm).form-horizontal.row .alert {
margin-bottom: 20px;
}
.genesys-page form:not(#loginForm).form-horizontal.row .form-group > div > a {
margin: 0;
}
.genesys-page form:not(#loginForm).form-horizontal.row .form-group > div > button {
margin: 15px 0 0 0;
}
.genesys-page form:not(#loginForm).form-horizontal.row .form-group .checkbox {
padding-left: 0;
}
}
@media (min-width: 1920px) {
......
......@@ -7,7 +7,7 @@
<title><spring:message code="page.login"/></title>
</head>
<body>
<h1><spring:message code="page.login" /></h1>
<h1 class="green-bg"><spring:message code="page.login" /></h1>
<!-- Alerts? -->
<gui:alert type="danger" display="${param['error'] ne null}">
......@@ -17,35 +17,35 @@
<spring:message code="login.invalid-token" />
</gui:alert>
<form role="form" method="POST" action="<c:url value="/login-attempt" />" class="form-horizontal">
<form role="form" method="POST" action="<c:url value="/login-attempt" />" class="form-horizontal row">
<div class="form-group">
<label for="j_username" class="col-lg-2 control-label"><spring:message code="login.username"/></label>
<div class="col-lg-3">
<label for="j_username" class="col-lg-2 col-md-2 col-sm-2 col-xs-12 control-label"><spring:message code="login.username"/></label>
<div class="col-lg-4 col-md-4 col-sm-5 col-xs-12">
<input type="text" id="j_username" name="username" class="form-control grabfocus" autofocus="autofocus" />
</div>
</div>
<div class="form-group">
<label for="j_password" class="col-lg-2 control-label"><spring:message code="login.password"/></label>
<div class="col-lg-3">
<label for="j_password" class="col-lg-2 col-md-2 col-sm-2 col-xs-12 control-label"><spring:message code="login.password"/></label>
<div class="col-lg-4 col-md-4 col-sm-5 col-xs-12">
<input type="password" id="j_password" name="password" class="form-control" />
</div>
</div>
<div class="form-group">
<div class="col-lg-offset-2 col-lg-3">
<label class="" for='_spring_security_remember_me'>
<div class="col-lg-offset-2 col-lg-4 col-md-offset-2 col-md-4 col-sm-offset-2 col-sm-4 col-xs-12 checkbox">
<label class="control-label" for='_spring_security_remember_me'>
<input type='checkbox' name='_spring_security_remember_me' id='_spring_security_remember_me'/>
<spring:message code="login.remember-me"/>
</label>
</div>
</div>
<div class="form-group">
<div class="col-lg-offset-2 col-lg-10">
<div class="form-group transparent">
<div class="col-lg-offset-2 col-lg-10 col-md-offset-2 col-md-10 col-sm-offset-2 col-sm-12 col-xs-12">
<input type="submit" value="<spring:message code="login.login-button" />" class="btn btn-primary" />
<a href="<c:url value="/google/login" />" class="btn btn-default google-signin"><spring:message code="login.with-google-plus"/></a>
<a href="registration" id="registration" class="btn btn-default"><spring:message code="login.register-now"/></a>
<a href="/profile/forgot-password" id="forgot-password" class="btn"><spring:message code="login.forgot-password"/></a>
<a href="/profile/forgot-password" id="forgot-password" class="btn btn-default"><spring:message code="login.forgot-password"/></a>
</div>
</div>
<!-- CSRF protection -->
......
......@@ -7,10 +7,10 @@
<title><spring:message code="registration.page.title" /></title>
</head>
<body>
<h1>
<h1 class="green-bg">
<spring:message code="registration.title" />
</h1>
<security:authorize access="hasRole('ADMINISTRATOR')">
<a href="<c:url value="/content/registration/edit" />" class="close"> <spring:message code="edit" />
</a>
......@@ -26,15 +26,15 @@
<spring:message code="registration.user-exists" />
</gui:alert>
<form:form method="POST" action="/registration" cssClass="form-horizontal validate" modelAttribute="user">
<form:form method="POST" action="/registration" cssClass="form-horizontal validate row" modelAttribute="user">
<div class="form-group">
<form:label for="email" cssClass="col-lg-2 control-label" path="email">
<form:label for="email" cssClass="col-lg-2 col-md-2 col-sm-2 col-xs-12 control-label" path="email">
<spring:message code="registration.email" />
</form:label>
<div class="col-lg-3">
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12">
<form:input id="email" name="email" cssClass="span3 required email form-control" path="email"/>
</div>
<div class="col-lg-4">
<div class="col-lg-offset-2 col-lg-4 col-md-offset-2 col-md-4 col-sm-offset-2 col-sm-4 col-xs-12">
<spring:bind path="email">
<c:if test="${status.error}">
<gui:alert type="danger">
......@@ -45,13 +45,13 @@
</div>
</div>
<div class="form-group">
<form:label for="password" cssClass="col-lg-2 control-label" path="password">
<form:label for="password" cssClass="col-lg-2 col-md-2 col-sm-2 col-xs-12 control-label" path="password">
<spring:message code="registration.password" />
</form:label>
<div class="col-lg-3">
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12">
<form:password id="password" name="password" cssClass="span3 required form-control" path="password"/>
</div>
<div class="col-lg-4">
<div class="col-lg-offset-2 col-lg-4 col-md-offset-2 col-md-4 col-sm-offset-2 col-sm-4 col-xs-12">
<spring:bind path="password">
<c:if test="${status.error}">
<gui:alert type="danger">
......@@ -66,26 +66,26 @@
</div>
</div>
<div class="form-group">
<label for="confirm_password" class="col-lg-2 control-label">
<label for="confirm_password" class="col-lg-2 col-md-2 col-sm-2 col-xs-12 control-label">
<spring:message code="registration.confirm-password" />
</label>
<div class="col-lg-3">
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12">
<input type="password" id="confirm_password" name="confirm_password" class="span3 required form-control" equalTo="#password" />
</div>
<div class="col-lg-4">
<div class="col-lg-offset-2 col-lg-4 col-md-offset-2 col-md-4 col-sm-offset-2 col-sm-4 col-xs-12">
<gui:alert type="danger" display="${not empty passwordRepeatError}">
<spring:message code="${passwordRepeatError}" />
</gui:alert>
</div>
</div>
<div class="form-group">
<form:label for="name" cssClass="col-lg-2 control-label" path="name">
<form:label for="name" cssClass="col-lg-2 col-md-2 col-sm-2 col-xs-12 control-label" path="name">
<spring:message code="registration.full-name" />
</form:label>
<div class="col-lg-3">
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12">
<form:input id="name" name="name" cssClass="span3 required form-control" path="name"/>
</div>
<div class="col-lg-4">
<div class="col-lg-offset-2 col-lg-4 col-md-offset-2 col-md-4 col-sm-offset-2 col-sm-4 col-xs-12">
<spring:bind path="name">
<c:if test="${status.error}">
<gui:alert type="danger">
......@@ -96,22 +96,22 @@
</div>
</div>
<div class="form-group">
<label class="col-lg-2 control-label"><spring:message code="captcha.text" /></label>
<div class="col-lg-3">
<label class="col-lg-2 col-md-2 col-sm-2 col-xs-12 control-label"><spring:message code="captcha.text" /></label>
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12">
<local:captcha siteKey="${captchaSiteKey}" />
</div>
<div class="col-lg-4">
<div class="col-lg-offset-2 col-lg-4 col-md-offset-2 col-md-4 col-sm-offset-2 col-sm-4 col-xs-12">
<gui:alert type="danger" display="${not empty captchaError}">
<spring:message code="${captchaError}" />
</gui:alert>
</div>
</div>
<div class="form-group">
<div class="col-lg-offset-2 col-lg-10">
<form:button class="btn btn-primary">
<div class="form-group transparent">
<div class="col-lg-offset-2 col-lg-10 col-md-offset-2 col-md-10 col-sm-offset-2 col-sm-10 col-xs-12">
<form:button class="btn btn-primary col-lg-2 col-md-2 col-sm-2 col-xs-12">
<spring:message code="registration.create-account" />
</form:button>
<a class="btn btn-default"
<a class="btn btn-default col-lg-2 col-md-2 col-sm-2 col-xs-12"
href='<c:url value="/" />' id="registration">
<spring:message code="cancel" />
</a>
......
......@@ -7,7 +7,7 @@
<title><spring:message code="userprofile.password" /></title>
</head>
<body>
<h1>
<h1 class="green-bg">
<spring:message code="userprofile.password" />
</h1>
......@@ -17,23 +17,25 @@
<spring:message code="${error}" />
</gui:alert>
<form class="form-horizontal" action="<c:url value="/profile/password/reset"/>" method="post">
<form class="form-horizontal row" action="<c:url value="/profile/password/reset"/>" method="post">
<div class="form-group">
<label class="col-lg-2 control-label">
<label class="col-lg-2 col-md-2 col-sm-2 col-xs-12 control-label">
<spring:message code="captcha.text" />
</label>
<div class="col-lg-3">
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12">
<local:captcha siteKey="${captchaSiteKey}" />
</div>
</div>
<div class="form-group">
<label for="email" class="col-lg-2 control-label">
<label for="email" class="col-lg-2 col-md-2 col-sm-2 col-xs-12 control-label">
<spring:message code="userprofile.enter.email" />
</label>
<div class="col-lg-3">
<input type="text" id="email" name="email" class="span3 form-control" />
<div class="col-lg-4 col-md-4 col-sm-5 col-xs-12">
<input type="text" id="email" name="email" class="form-control" />
</div>
<div class="col-lg-1">
</div>
<div class="form-group transparent">
<div class="col-lg-offset-2 col-lg-10 col-md-offset-2 col-md-10 col-sm-offset-2 col-sm-10 col-xs-12">
<input type="submit" value="<spring:message code="userprofile.email.send" />" class="btn btn-primary" />
</div>
</div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment