vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-22 06:07:57 +01:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wise-webapp/src/main/resources/messages_en.properties
View File

@ -248,7 +248,7 @@ ACCESS_HAS_BEEN_REVOKED= Upps. your access permissions to this map has been revo
MAP_CAN_NOT_BE_FOUND= Upps. The map can not be found. It must have been deleted. MAP_CAN_NOT_BE_FOUND= Upps. The map can not be found. It must have been deleted.
LICENSE=License LICENSE=License
WELCOME_TO_WISEMAPPING=Welcome to WiseMapping WELCOME_TO_WISEMAPPING=Welcome to WiseMapping
WELCOME_DETAILS=WiseMapping will enable you to create and read your mind maps everywhere. With WiseMapping you can: <ul><li>Embed mind map it in web pages and blogs</li><li>Link mind map and documents</li><li>Share your maps with friend and colleagues</li><li>Export your maps SVG,PNG,JPG and FreeMind</li></ul>. WELCOME_DETAILS=WiseMapping will enable you to create and read your mind maps everywhere. With WiseMapping you can: <ul><li>Embed mind map it in web pages and blogs</li><li>Link mind map and documents</li><li>Share your maps with friend and colleagues</li><li>Export your maps SVG,PNG,JPG and FreeMind</li></ul>
OPENID_LOGIN=Open Id Login OPENID_LOGIN=Open Id Login
LOGING_OPENID_DETAILS=Do you already have an account on one of these sites?. Click the logo to log in with it here: LOGING_OPENID_DETAILS=Do you already have an account on one of these sites?. Click the logo to log in with it here:
WHY_OPENID=<b>Why OpenID ?</b></br> It's a single username and password that allows you to log in to any OpenID-enabled site. It works on thousands of websites.</br>It's an open standard. </br><a href="http://openid.net/what/">learn more</a> WHY_OPENID=<b>Why OpenID ?</b></br> It's a single username and password that allows you to log in to any OpenID-enabled site. It works on thousands of websites.</br>It's an open standard. </br><a href="http://openid.net/what/">learn more</a>

1
wise-webapp/src/main/webapp/css/pageHeaders.css
View File

@ -57,6 +57,7 @@ html,body {
padding-left: 7px; padding-left: 7px;
font-weight: bold; font-weight: bold;
vertical-align: middle; vertical-align: middle;
font-size: 20px;
} }
#headerButtons { #headerButtons {

58
wise-webapp/src/main/webapp/css/pageTemplate.css
View File

@ -2,7 +2,7 @@
@import "pageHeaders.css"; @import "pageHeaders.css";
div#register { div#register {
margin: 40px auto; margin: 20px auto;
text-align: center; text-align: center;
white-space: nowrap; white-space: nowrap;
} }
@ -17,34 +17,6 @@ div#pageContainer {
min-height: 100%; min-height: 100%;
} }
div.bodyContainer {
padding-top: 30px;
padding-bottom: 85px; /* Height of the footer */
}
div.bodyContainer h1 {
color: #093A9D;
font-size: 150%;
margin-bottom: 5px;
font-weight: bold;
}
div.bodyContainer h2 {
color: gray;
font-size: 150%;
border-bottom: 1px dashed #BBB4D6;
margin: 20px 0;
}
div.bodyContainer ul {
padding: 5px;
}
div.bodyContainer li {
list-style-type: disc;
margin-left: 12px;
}
#footerContainer { #footerContainer {
padding-top: 10px; padding-top: 10px;
border-top: 1px black solid; border-top: 1px black solid;
@ -62,17 +34,25 @@ span.errorMsg {
color: red; color: red;
} }
div.fform { /* Reduce styles */
background: #eeeeee; .jumbotron > h1 {
border: 1px solid #cfcfcf; font-size: 35px;
padding: 5px 25px;
-moz-border-radius: 8px;
-khtml-border-radius: 8px;
-webkit-border-radius: 8px;
border-radius: 8px;
} }
div.fform label { .jumbotron p {
font-weight: bold; font-size: 15px;
}
#login h1 {
font-size: 25px;
}
#loginPanel {
padding: 0 60px;
background: #ffffff;
margin-top: 40px;
background: #F7C931;
color: #ffffff;
} }

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

@ -12,54 +12,63 @@
}); });
</script> </script>
<div class="row"> <div class="row" id="login">
<div class="col-md-5" style="margin-top: 20px"> <div class="col-md-6" style="padding-top: 25px">
<h1><spring:message code="WELCOME_TO_WISEMAPPING"/></h1> <h1><spring:message code="WELCOME_TO_WISEMAPPING"/></h1>
<spring:message code="WELCOME_DETAILS"/> <spring:message code="WELCOME_DETAILS"/>
</div> </div>
<div id="login" class="fform col-md-6"> <div class="col-md-6">
<h1><spring:message code="SIGN_IN"/></h1> <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"> <form action="<c:url value='/c/j_spring_security_check'/>" method="POST" class="form-horizontal"
<div class="form-group"> id="loginForm">
<label class="col-md-2 control-label" for="email"><spring:message code="EMAIL"/></label> <div class="form-group">
<div class="col-md-10"> <label class="col-md-3 control-label" for="email"><spring:message code="EMAIL"/>: </label>
<input type='email' tabindex="1" id="email" name='j_username' required="required" class="form-control"/>
<div class="col-md-9">
<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-md-3 control-label" for="password"><spring:message code="PASSWORD"/>: </label>
<label class="col-md-2 control-label" for="password"><spring:message code="PASSWORD"/></label>
<div class="col-md-10"> <div class="col-md-9">
<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: center">
<div class="form-group" style="text-align: center" > <div class="col-md-offset-2 col-md-10" style="text-align: center">
<div class="col-md-offset-2 col-md-10" style="text-align: center" > <button class="btn btn-primary" tabindex="4"
<button class="btn btn-primary" tabindex="4" data-loading-text="<spring:message code="SIGN_ING"/>"><spring:message code="SIGN_IN"/></button> 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"/> <label
for="rememberme"><spring:message code="REMEMBER_ME"/></label>
</div>
</div> </div>
</div> <div class="form-group" style="text-align: center">
<div class="form-group" style="text-align: center" > <a href="<c:url value="/c/user/resetPassword"/>"><spring:message code="FORGOT_PASSWORD"/></a>
<a href="<c:url value="/c/user/resetPassword"/>"><spring:message code="FORGOT_PASSWORD"/></a> </div>
</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> <c:when test="${param.login_error == 3}">
<c:when test="${param.login_error == 3}"> <div class="alert alert-danger"><spring:message code="USER_INACTIVE"/></div>
<div class="alert alert-danger"><spring:message code="USER_INACTIVE"/></div> </c:when>
</c:when> <c:otherwise>
<c:otherwise> <div class="alert alert-danger"><spring:message code="LOGIN_ERROR"/></div>
<div class="alert alert-danger"><spring:message code="LOGIN_ERROR"/></div> </c:otherwise>
</c:otherwise> </c:choose>
</c:choose> </c:if>
</c:if> </div>
</div> </form>
</form> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div id="register" class="col-md-10"> <div id="register" class="col-md-12">
<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"/>
@ -69,19 +78,21 @@
</c:if> </c:if>
<c:if test="${requestScope['security.openid.enabled']}"> <c:if test="${requestScope['security.openid.enabled']}">
<p> <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> </p>
</c:if> </c:if>
</div> </div>
</div> </div>
<c:if test="${isHsql== 'true'}"> <c:if test="${isHsql== 'false'}">
<div class="row"> <div class="row">
<div class="alert alert-info col-md-offset12"> <div class="alert alert-info col-md-offset12">
<span class="label label-danger"><spring:message code="WARNING"/></span> <spring:message <span class="label label-danger"><spring:message code="WARNING"/></span> <spring:message
code="NO_PRODUCTION_DATABASE_CONFIGURED"/>&nbsp;<a 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>
</div> </div>
</c:if> </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:param name="removeSignin" value="${requestScope.removeSignin}"/>
</jsp:include> </jsp:include>
<div class="bodyContainer"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-2"></div> <div class="col-md-offset-1 col-md-10">
<div class="pageBodyContent col-md-8"> <div class="jumbotron" style="margin:40px 0 100px 0;padding: 10px 60px;">
<div class="row"> <tiles:insertAttribute name="body"/>
<tiles:insertAttribute name="body"/> </div>
</div>
</div> </div>
<c:if test="${requestScope['google.ads.enabled']}"> <c:if test="${requestScope['google.ads.enabled']}">
<div class="row" style="text-align: center;margin: 5px"> <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> </script>
<div> <h1>
<div class="fform"> <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"> <form:form method="post" commandName="resetPassword" class="form-horizontal">
<fieldset> <label for="email" class="col-md-2 control-label"><spring:message code="EMAIL"/>: </label>
<label for="email" class="col-md-2 control-label"><spring:message code="EMAIL"/>: </label> <div class="col-md-5">
<div class="col-md-5"> <input id="email" type="email" required="required" name="email" class="form-control"/>
<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>
</div> </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"> <div id="register">
<b> <b>

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

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