mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-09-12 07:10:07 +02:00
Fix login.
This commit is contained in:
parent
726ffcd817
commit
6624abb9ed
@ -177,7 +177,7 @@ input#selectAll {
|
|||||||
span.starredOff {
|
span.starredOff {
|
||||||
background: url('../images/star-off.png') no-repeat center left;
|
background: url('../images/star-off.png') no-repeat center left;
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
margin: 0 0px 0 5px;
|
margin: 0 0 0 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
span.starredOff:hover {
|
span.starredOff:hover {
|
||||||
@ -187,7 +187,7 @@ span.starredOff:hover {
|
|||||||
span.starredOn {
|
span.starredOn {
|
||||||
background: url('../images/star-on.png') no-repeat center left;
|
background: url('../images/star-on.png') no-repeat center left;
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
margin: 0 0px 0 5px;
|
margin: 0 0 0 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
span.starredOn:hover {
|
span.starredOn:hover {
|
||||||
@ -212,4 +212,14 @@ abbr[title] {
|
|||||||
|
|
||||||
#foldersContainer {
|
#foldersContainer {
|
||||||
padding-top: 60px;
|
padding-top: 60px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#footerContainer > ul {
|
||||||
|
padding:0px;
|
||||||
|
margin:0px;
|
||||||
|
}
|
||||||
|
#footerContainer > li.active {
|
||||||
|
padding:0px;
|
||||||
|
margin:0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ html,body {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#headerToolbar {
|
#headerToolbar {
|
||||||
height: 30px;
|
height: 35px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
background-color: #171a17;
|
background-color: #171a17;
|
||||||
border-top: 1px solid #999999;
|
border-top: 1px solid #999999;
|
||||||
@ -36,7 +36,7 @@ html,body {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#headerLogo {
|
#headerLogo {
|
||||||
margin-top: 18px;
|
margin-top: 23px;
|
||||||
height: 80px;
|
height: 80px;
|
||||||
width: 160px;
|
width: 160px;
|
||||||
background: url("../images/logo-medium.png") no-repeat;
|
background: url("../images/logo-medium.png") no-repeat;
|
||||||
|
@ -23,30 +23,25 @@
|
|||||||
<form action="<c:url value='/c/j_spring_security_check'/>" method="POST" class="form-horizontal" id="loginForm">
|
<form action="<c:url value='/c/j_spring_security_check'/>" method="POST" class="form-horizontal" id="loginForm">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-2 control-label" for="email"><spring:message code="EMAIL"/></label>
|
<label class="col-sm-2 control-label" for="email"><spring:message code="EMAIL"/></label>
|
||||||
<div class="col-md-12">
|
<div class="col-md-10">
|
||||||
<input type='email' tabindex="1" id="email" name='j_username' required="required" class="form-control"/>
|
<input type='email' tabindex="1" id="email" name='j_username' required="required" class="form-control"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-2 control-label" for="password"><spring:message code="PASSWORD"/></label>
|
<label class="col-sm-2 control-label" for="password"><spring:message code="PASSWORD"/></label>
|
||||||
<div class="col-md-12">
|
<div class="col-md-10">
|
||||||
<input type='password' tabindex="2" id="password" name='j_password' required="required" class="form-control"/>
|
<input type='password' tabindex="2" id="password" name='j_password' required="required" class="form-control"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group" style="text-align: right">
|
<div class="form-group" style="text-align: center" >
|
||||||
|
<div class="col-md-offset-2 col-md-10" style="text-align: center" >
|
||||||
<label>
|
<button class="btn btn-primary" tabindex="4" data-loading-text="<spring:message code="SIGN_ING"/>"><spring:message code="SIGN_IN"/></button>
|
||||||
<button class="btn btn-primary" tabindex="4" data-loading-text="<spring:message code="SIGN_ING"/>">
|
<input type="checkbox" id="rememberme" name="_spring_security_remember_me"/> <label for="rememberme"><spring:message code="REMEMBER_ME"/></label>
|
||||||
<spring:message code="SIGN_IN"/></button>
|
|
||||||
<input type="checkbox" id="rememberme" name="_spring_security_remember_me"
|
|
||||||
tabindex="3"/> <spring:message code="REMEMBER_ME"/>
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<div style="text-align: center">
|
|
||||||
<a href="<c:url value="/c/user/resetPassword"/>"><spring:message code="FORGOT_PASSWORD"/></a>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="form-group" style="text-align: center" >
|
||||||
|
<a href="<c:url value="/c/user/resetPassword"/>"><spring:message code="FORGOT_PASSWORD"/></a>
|
||||||
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<c:if test="${not empty param.login_error}">
|
<c:if test="${not empty param.login_error}">
|
||||||
<c:choose>
|
<c:choose>
|
||||||
@ -64,7 +59,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div id="register" class="col-md-12">
|
<div id="register" class="col-md-10">
|
||||||
<c:if test="${requestScope['security.type']=='db'}">
|
<c:if test="${requestScope['security.type']=='db'}">
|
||||||
<b><spring:message code="NOT_READY_A_USER"/></b>
|
<b><spring:message code="NOT_READY_A_USER"/></b>
|
||||||
<spring:message code="NOT_READY_A_USER_MESSAGE"/>
|
<spring:message code="NOT_READY_A_USER_MESSAGE"/>
|
||||||
|
@ -88,7 +88,7 @@
|
|||||||
|
|
||||||
// Customize search action ...
|
// Customize search action ...
|
||||||
$('#mindmapListTable_filter').appendTo("#tableActions");
|
$('#mindmapListTable_filter').appendTo("#tableActions");
|
||||||
$('#mindmapListTable_filter input').addClass('input-medium search-query');
|
$('#mindmapListTable_filter input').addClass('input-medium search-query form-control');
|
||||||
$('#mindmapListTable_filter input').attr('placeholder', 'Search');
|
$('#mindmapListTable_filter input').attr('placeholder', 'Search');
|
||||||
$("#mindmapListTable_info").appendTo("#pageInfo");
|
$("#mindmapListTable_info").appendTo("#pageInfo");
|
||||||
|
|
||||||
@ -132,7 +132,6 @@
|
|||||||
<div class="col-md-1"></div>
|
<div class="col-md-1"></div>
|
||||||
<div class="col-md-2" id="foldersContainer">
|
<div class="col-md-2" id="foldersContainer">
|
||||||
<ul class="nav nav-list">
|
<ul class="nav nav-list">
|
||||||
<li class="nav-header"><spring:message code="FILTERS"/></li>
|
|
||||||
<li data-filter="all" class="active"><a href="#"><i class="glyphicon glyphicon-inbox glyphicon-white"></i> <spring:message
|
<li data-filter="all" class="active"><a href="#"><i class="glyphicon glyphicon-inbox glyphicon-white"></i> <spring:message
|
||||||
code="ALL_MAPS"/></a></li>
|
code="ALL_MAPS"/></a></li>
|
||||||
<li data-filter="my_maps"><a href="#"><i class="glyphicon glyphicon-user"></i> <spring:message code="MY_MAPS"/></a>
|
<li data-filter="my_maps"><a href="#"><i class="glyphicon glyphicon-user"></i> <spring:message code="MY_MAPS"/></a>
|
||||||
|
Loading…
Reference in New Issue
Block a user