zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix login page.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2014-02-09 21:58:23 -03:00
parent 95d9414ae3
commit bbc380366f
7 changed files with 151 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
wise-webapp/src/main/webapp/jsp/login.jsp
View File

@@ -12,54 +12,63 @@
});
</script>
<div class="row">
<div class="col-md-5" style="margin-top: 20px">
<div class="row" id="login">
<div class="col-md-6" style="padding-top: 25px">
<h1><spring:message code="WELCOME_TO_WISEMAPPING"/></h1>
<spring:message code="WELCOME_DETAILS"/>
</div>
<div id="login" class="fform col-md-6">
<h1><spring:message code="SIGN_IN"/></h1>
<div class="col-md-6">
<div class="row jumbotron" id="loginPanel">
<h1><spring:message code="SIGN_IN"/></h1>
<form action="<c:url value='/c/j_spring_security_check'/>" method="POST" class="form-horizontal" id="loginForm">
<div class="form-group">
<label class="col-md-2 control-label" for="email"><spring:message code="EMAIL"/></label>
<div class="col-md-10">
<input type='email' tabindex="1" id="email" name='j_username' required="required" class="form-control"/>
<form action="<c:url value='/c/j_spring_security_check'/>" method="POST" class="form-horizontal"
id="loginForm">
<div class="form-group">
<label class="col-md-3 control-label" for="email"><spring:message code="EMAIL"/>: </label>
<div class="col-md-9">
<input type='email' tabindex="1" id="email" name='j_username' required="required"
class="form-control"/>
</div>
</div>
</div>
<div class="form-group">
<label class="col-md-2 control-label" for="password"><spring:message code="PASSWORD"/></label>
<div class="col-md-10">
<input type='password' tabindex="2" id="password" name='j_password' required="required" class="form-control"/>
<div class="form-group">
<label class="col-md-3 control-label" for="password"><spring:message code="PASSWORD"/>: </label>
<div class="col-md-9">
<input type='password' tabindex="2" id="password" name='j_password' required="required"
class="form-control"/>
</div>
</div>
</div>
<div class="form-group" style="text-align: center" >
<div class="col-md-offset-2 col-md-10" style="text-align: center" >
<button class="btn btn-primary" tabindex="4" data-loading-text="<spring:message code="SIGN_ING"/>"><spring:message code="SIGN_IN"/></button>
<input type="checkbox" id="rememberme" name="_spring_security_remember_me"/> <label for="rememberme"><spring:message code="REMEMBER_ME"/></label>
<div class="form-group" style="text-align: center">
<div class="col-md-offset-2 col-md-10" style="text-align: center">
<button class="btn btn-primary" tabindex="4"
data-loading-text="<spring:message code="SIGN_ING"/>">
<spring:message code="SIGN_IN"/></button>
<input type="checkbox" id="rememberme" name="_spring_security_remember_me"/> <label
for="rememberme"><spring:message code="REMEMBER_ME"/></label>
</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">
<c:if test="${not empty param.login_error}">
<c:choose>
<c:when test="${param.login_error == 3}">
<div class="alert alert-danger"><spring:message code="USER_INACTIVE"/></div>
</c:when>
<c:otherwise>
<div class="alert alert-danger"><spring:message code="LOGIN_ERROR"/></div>
</c:otherwise>
</c:choose>
</c:if>
</div>
</form>
<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">
<c:if test="${not empty param.login_error}">
<c:choose>
<c:when test="${param.login_error == 3}">
<div class="alert alert-danger"><spring:message code="USER_INACTIVE"/></div>
</c:when>
<c:otherwise>
<div class="alert alert-danger"><spring:message code="LOGIN_ERROR"/></div>
</c:otherwise>
</c:choose>
</c:if>
</div>
</form>
</div>
</div>
</div>
<div class="row">
<div id="register" class="col-md-10">
<div id="register" class="col-md-12">
<c:if test="${requestScope['security.type']=='db'}">
<b><spring:message code="NOT_READY_A_USER"/></b>
<spring:message code="NOT_READY_A_USER_MESSAGE"/>
@@ -69,19 +78,21 @@
</c:if>
<c:if test="${requestScope['security.openid.enabled']}">
<p>
<spring:message code="LOGIN_USING_OPENID"/> <a href="/c/loginopenid"><b><spring:message code="HERE"/></b></a>.
<spring:message code="LOGIN_USING_OPENID"/> <a href="/c/loginopenid"><b><spring:message
code="HERE"/></b></a>.
</p>
</c:if>
</div>
</div>
<c:if test="${isHsql== 'true'}">
<c:if test="${isHsql== 'false'}">
<div class="row">
<div class="alert alert-info col-md-offset12">
<span class="label label-danger"><spring:message code="WARNING"/></span> <spring:message
code="NO_PRODUCTION_DATABASE_CONFIGURED"/>&nbsp;<a
href="https://wisemapping.atlassian.net/wiki/display/WS/Database+Configuration"><spring:message code="HERE"/></a>.
href="https://wisemapping.atlassian.net/wiki/display/WS/Database+Configuration"><spring:message
code="HERE"/></a>.
</div>
</div>
</c:if>

11
wise-webapp/src/main/webapp/jsp/template.jsp
View File

@@ -51,13 +51,12 @@
<jsp:param name="removeSignin" value="${requestScope.removeSignin}"/>
</jsp:include>
<div class="bodyContainer">
<div class="container">
<div class="row">
<div class="col-md-2"></div>
<div class="pageBodyContent col-md-8">
<div class="row">
<tiles:insertAttribute name="body"/>
</div>
<div class="col-md-offset-1 col-md-10">
<div class="jumbotron" style="margin:40px 0 100px 0;padding: 10px 60px;">
<tiles:insertAttribute name="body"/>
</div>
</div>
<c:if test="${requestScope['google.ads.enabled']}">
<div class="row" style="text-align: center;margin: 5px">

33
wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp
View File

@@ -9,29 +9,22 @@
});
</script>
<div>
<div class="fform">
<h1>
<spring:message code="FORGOT_PASSWORD"/>
</h1>
<h1>
<spring:message code="FORGOT_PASSWORD"/>
</h1>
<p><spring:message code="FORGOT_PASSWORD_MESSAGE"/></p>
<p><spring:message code="FORGOT_PASSWORD_MESSAGE"/></p>
<form:form method="post" commandName="resetPassword" class="form-horizontal">
<fieldset>
<label for="email" class="col-md-2 control-label"><spring:message code="EMAIL"/>: </label>
<div class="col-md-5">
<input id="email" type="email" required="required" name="email" class="form-control"/>
</div>
<input type="submit" value="<spring:message code="SEND_ME_A_NEW_PASSWORD"/>" class="btn btn-primary"
data-loading-text="<spring:message code="SENDING"/>"/>
<input type="button" value="<spring:message code="CANCEL"/>" class="btn"
onclick="window.location='<c:url value="c/maps/"/>'"/>
</fieldset>
</form:form>
</br>
<form:form method="post" commandName="resetPassword" class="form-horizontal">
<label for="email" class="col-md-2 control-label"><spring:message code="EMAIL"/>: </label>
<div class="col-md-5">
<input id="email" type="email" required="required" name="email" class="form-control"/>
</div>
</div>
<input type="submit" value="<spring:message code="SEND_ME_A_NEW_PASSWORD"/>" class="btn btn-primary"
data-loading-text="<spring:message code="SENDING"/>"/>
<input type="button" value="<spring:message code="CANCEL"/>" class="btn"
onclick="window.location='<c:url value="c/maps/"/>'"/>
</form:form>
<div id="register">
<b>

120
wise-webapp/src/main/webapp/jsp/userRegistration.jsp
View File

@@ -1,79 +1,79 @@
<%@page pageEncoding="UTF-8" %>
<%@include file="/jsp/init.jsp" %>
<div class="fform" >
<h1><spring:message code="USER_REGISTRATION"/></h1>
<h1><spring:message code="USER_REGISTRATION"/></h1>
<p><spring:message code="REGISTRATION_TITLE_MSG"/></p>
<form:form method="post" commandName="user" class="form-horizontal">
<div class="form-group">
<label for="email" class="col-md-2 control-label"><spring:message code="EMAIL"/>: </label>
<div class="col-md-5">
<form:input path="email" id="email" type="email" required="required" class="form-control"/>
<form:errors path="email" cssClass="errorMsg"/>
</div>
</div>
<div class="form-group">
<label for="firstname" class="col-md-2 control-label"><spring:message code="FIRSTNAME"/>: </label>
<p><spring:message code="REGISTRATION_TITLE_MSG"/></p>
<form:form method="post" commandName="user" class="form-horizontal">
<fieldset>
<div class="form-group">
<label for="email" class="col-md-2 control-label"><spring:message code="EMAIL"/>: </label>
<div class="col-md-5">
<form:input path="email" id="email" type="email" required="required" class="form-control"/>
<form:errors path="email" cssClass="errorMsg"/>
</div>
<div class="col-md-5">
<form:input path="firstname" id="firstname" required="required" class="form-control"/>
<form:errors path="firstname" cssClass="errorMsg"/>
</div>
<div class="form-group">
<label for="firstname" class="col-md-2 control-label"><spring:message code="FIRSTNAME"/>: </label>
<div class="col-md-5">
<form:input path="firstname" id="firstname" required="required" class="form-control"/>
<form:errors path="firstname" cssClass="errorMsg"/>
</div>
</div>
<div class="form-group">
<label for="lastname" class="col-md-2 control-label"><spring:message code="LASTNAME"/>: </label>
<div class="col-md-5">
<form:input path="lastname" id="lastname" required="required" class="form-control"/>
<form:errors path="lastname" cssClass="errorMsg"/>
</div>
<div class="form-group">
<label for="lastname" class="col-md-2 control-label"><spring:message code="LASTNAME"/>: </label>
<div class="col-md-5">
<form:input path="lastname" id="lastname" required="required" class="form-control"/>
<form:errors path="lastname" cssClass="errorMsg"/>
</div>
</div>
<div class="form-group">
<label for="password" class="col-md-2 control-label"><spring:message code="PASSWORD"/>: </label>
<div class="col-md-5">
<form:password path="password" id="password" required="required" class="form-control"/>
<form:errors path="password" cssClass="errorMsg"/>
</div>
<div class="form-group">
<label for="password" class="col-md-2 control-label"><spring:message code="PASSWORD"/>: </label>
<div class="col-md-5">
<form:password path="password" id="password" required="required" class="form-control"/>
<form:errors path="password" cssClass="errorMsg"/>
</div>
</div>
<div class="form-group">
<label for="retypePassword" class="col-md-2 control-label"><spring:message
code="RETYPE_PASSWORD"/>: </label>
<div class="col-md-5">
<form:password path="retypePassword" id="retypePassword" class="form-control"/>
<form:errors path="retypePassword" cssClass="errorMsg"/>
</div>
<div class="form-group">
<label for="retypePassword" class="col-md-2 control-label"><spring:message code="RETYPE_PASSWORD"/>: </label>
<div class="col-md-5">
<form:password path="retypePassword" id="retypePassword" class="form-control"/>
<form:errors path="retypePassword" cssClass="errorMsg"/>
</div>
</div>
<div class="form-group">
<div class="col-md-10 col-md-offset-2">
<c:if test="${requestScope.captchaEnabled}">
${requestScope.captchaHtml}
</div>
<div class="form-group">
<div class="col-md-10 col-md-offset-2">
<c:if test="${requestScope.captchaEnabled}">
${requestScope.captchaHtml}
<p>
<form:errors path="captcha" cssClass="errorMsg"/>
</p>
</c:if>
</div>
</div>
<div>
<p>
<spring:message code="TERM_OF_THE_SERVICE"/>
<spring:message code="WISEMAPPING_ACCOUNT_MESSAGE"/> <a href="c/termsOfUse"
target="_blank"><spring:message
code="HERE"/></a>.
<spring:message code="REGISTRATION_CLICK_ADVICE"/>
</p>
</div>
<div class="form-group">
<div class="col-md-offset-2 col-md-10">
</div>
<div class="form-group">
<p>
<spring:message code="TERM_OF_THE_SERVICE"/>
<spring:message code="WISEMAPPING_ACCOUNT_MESSAGE"/>
<a href="c/termsOfUse" target="_blank"><spring:message code="HERE"/></a>.
<spring:message code="REGISTRATION_CLICK_ADVICE"/>
</p>
</div>
<div class="form-group">
<div class="col-md-offset-2 col-md-10">
<input type="submit" value="<spring:message code="REGISTER"/>"
data-loading-text="<spring:message code="REGISTER"/> ..." id="submitButton"
class="btn btn-primary">
data-loading-text="<spring:message code="REGISTER"/> ..." id="submitButton"
class="btn btn-primary">
<input type="button" value="<spring:message code="CANCEL"/>"
onclick="window.location='c/<c:url value="maps/"/>'" class="btn">
<div>
<div>
</fieldset>
onclick="window.location='c/<c:url value="maps/"/>'" class="btn">
</div>
</div>
</form:form>
</form:form>
</div>