mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-11-05 07:03:24 +01:00
Migrate regitration forms to bootstrap
This commit is contained in:
parent
95d02a4d25
commit
65e9625867
@ -83,7 +83,7 @@ KEYBOARD_MSG=These are the keyboard shortcuts you can use in the editor!
|
|||||||
FIRST_STEPS=Editor First Steps
|
FIRST_STEPS=Editor First Steps
|
||||||
FIRST_STEPS_MSG=Make these first steps in 2 minutes, and start running in 5!
|
FIRST_STEPS_MSG=Make these first steps in 2 minutes, and start running in 5!
|
||||||
HOME=Home
|
HOME=Home
|
||||||
LOGIN_ERROR=The email address or password you provided does not match our records.
|
LOGIN_ERROR=The email address or password you entered is incorrect.
|
||||||
USER_INACTIVE=Sorry, your account has not been activated yet. You'll receive a notification email when it becomes active. Stay tuned!.
|
USER_INACTIVE=Sorry, your account has not been activated yet. You'll receive a notification email when it becomes active. Stay tuned!.
|
||||||
CREW=The Crew
|
CREW=The Crew
|
||||||
ALREADY_A_MEMBER=Already a member?
|
ALREADY_A_MEMBER=Already a member?
|
||||||
@ -100,7 +100,7 @@ PASSWORD_MISSMATCH=Your password entries did not match
|
|||||||
TYPE_CHARACTER_BELOW=Type the characters you see in the picture below.
|
TYPE_CHARACTER_BELOW=Type the characters you see in the picture below.
|
||||||
WISEMAPPING_ACCOUNT_MESSAGE=Please check the WiseMapping Account information you've entered above, and review the Terms of Service
|
WISEMAPPING_ACCOUNT_MESSAGE=Please check the WiseMapping Account information you've entered above, and review the Terms of Service
|
||||||
REGISTRATION_CLICK_ADVICE= By clicking on 'Register' below you are agreeing to the Terms of Service above and the Privacy Policy.
|
REGISTRATION_CLICK_ADVICE= By clicking on 'Register' below you are agreeing to the Terms of Service above and the Privacy Policy.
|
||||||
REGISTRATION_TITLE_MSG=Please, fill the fields and become a member of WiseMapping community.<br/>Registration is <b> Free</b> and takes just a moment.
|
REGISTRATION_TITLE_MSG=Please, fill the fields and become a member of WiseMapping community.Registration is <b> Free</b> and takes just a moment.
|
||||||
CAPTCHA_ERROR=Enter the letters as they are shown in the image above.
|
CAPTCHA_ERROR=Enter the letters as they are shown in the image above.
|
||||||
DETAIL_INFORMATION=Detail Information
|
DETAIL_INFORMATION=Detail Information
|
||||||
CREATOR=Creator
|
CREATOR=Creator
|
||||||
|
@ -32,23 +32,12 @@ div#mainBody {
|
|||||||
|
|
||||||
div#login {
|
div#login {
|
||||||
float: right;
|
float: right;
|
||||||
width: 250px;
|
width: 300px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#forgotPasswordContainer {
|
|
||||||
width: 500px;
|
|
||||||
padding: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* This is used to fix IE explorer bug rendering rounded corners*/
|
|
||||||
div#loginContent {
|
div#loginContent {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
min-height: 250px;
|
min-height: 340px;
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
div#userRegistration {
|
|
||||||
padding: 10px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
div#register {
|
div#register {
|
||||||
@ -219,10 +208,15 @@ div.installCFG h2 {
|
|||||||
div.fform {
|
div.fform {
|
||||||
background: #eeeeee;
|
background: #eeeeee;
|
||||||
border: 1px solid #cfcfcf;
|
border: 1px solid #cfcfcf;
|
||||||
padding: 5px 20px;
|
padding: 5px 25px;
|
||||||
-moz-border-radius: 8px;
|
-moz-border-radius: 8px;
|
||||||
-khtml-border-radius: 8px;
|
-khtml-border-radius: 8px;
|
||||||
-webkit-border-radius: 8px;
|
-webkit-border-radius: 8px;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
div.fform label {
|
||||||
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<div id="footer">
|
<div id="footer">
|
||||||
<div style="width:30%; float:left;"> </div>
|
<div style="width:30%; float:left;"> </div>
|
||||||
<div style="float:left; width:40%;">
|
<div style="float:left; width:40%;">
|
||||||
<p><a href="http://www.wisemapping.com"><spring:message code="COPYRIGHT"/></a></p>
|
<p><a href="http://www.wisemapping.org"><spring:message code="COPYRIGHT"/></a></p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div style="float:left; text-align:left;padding:5px;">
|
<div style="float:left; text-align:left;padding:5px;">
|
||||||
|
@ -1,48 +1,23 @@
|
|||||||
<%@ include file="/jsp/init.jsp" %>
|
<%@ include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
<script type="text/javascript">
|
|
||||||
if(typeof isOldIE != "undefined"){
|
|
||||||
window.onload = function() {
|
|
||||||
var simpleButtonGenerator = RUZEE.ShadedBorder.create({ corner:8, border:1 });
|
|
||||||
simpleButtonGenerator.render('forgotPasswordContainer');
|
|
||||||
|
|
||||||
$('submitButton').onclick = displayLoading;
|
<div>
|
||||||
};
|
<div class="fform">
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div id="forgotPasswordContent">
|
|
||||||
<div id="forgotPasswordContainer" class="sb">
|
|
||||||
<h1>
|
<h1>
|
||||||
<spring:message code="FORGOT_PASSWORD"/>
|
<spring:message code="FORGOT_PASSWORD"/>
|
||||||
</h1>
|
</h1>
|
||||||
|
<p><spring:message code="FORGOT_PASSWORD_MESSAGE"/></p>
|
||||||
|
|
||||||
<h2>
|
|
||||||
<spring:message code="FORGOT_PASSWORD_MESSAGE"/>
|
|
||||||
</h2>
|
|
||||||
<form:form method="post" commandName="forgotPassword">
|
<form:form method="post" commandName="forgotPassword">
|
||||||
<table>
|
<fieldset>
|
||||||
<tbody>
|
<label for="email"><spring:message code="EMAIL"/></label>
|
||||||
<tr>
|
<form:input path="email" id="email" tabindex="1" type="email" required="required"/>
|
||||||
<td>
|
|
||||||
<spring:message code="EMAIL"/>:
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<form:input path="email" id="email" tabindex="1"/>
|
|
||||||
<form:errors path="email" cssClass="errorMsg"/>
|
<form:errors path="email" cssClass="errorMsg"/>
|
||||||
</td>
|
|
||||||
</tr>
|
<input type="submit" value="<spring:message code="SUBMIT"/>" class="btn btn-primary"/>
|
||||||
<tr>
|
|
||||||
<td> </td>
|
|
||||||
<td>
|
|
||||||
<input type="submit" value="<spring:message code="SUBMIT"/>" class="btn btn-primary"
|
|
||||||
id="submitButton">
|
|
||||||
<input type="button" value="<spring:message code="CANCEL"/>" class="btn"
|
<input type="button" value="<spring:message code="CANCEL"/>" class="btn"
|
||||||
onclick="window.location='<c:url value="mymaps.htm"/>'">
|
onclick="window.location='<c:url value="c/mymaps.htm"/>'"/>
|
||||||
</td>
|
</fieldset>
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</form:form>
|
</form:form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -18,17 +18,6 @@
|
|||||||
<spring:message code="SIGN_IN"/>
|
<spring:message code="SIGN_IN"/>
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<c:if test="${not empty param.login_error}">
|
|
||||||
<c:choose>
|
|
||||||
<c:when test="${param.login_error == 3}">
|
|
||||||
<spring:message code="USER_INACTIVE"/>
|
|
||||||
</c:when>
|
|
||||||
<c:otherwise>
|
|
||||||
<spring:message code="LOGIN_ERROR"/>
|
|
||||||
</c:otherwise>
|
|
||||||
</c:choose>
|
|
||||||
</c:if>
|
|
||||||
|
|
||||||
<form action="<c:url value='/c/j_spring_security_check'/>" method="POST">
|
<form action="<c:url value='/c/j_spring_security_check'/>" method="POST">
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<label for="email">
|
<label for="email">
|
||||||
@ -38,8 +27,20 @@
|
|||||||
<label for="password"><spring:message code="PASSWORD"/></label>
|
<label for="password"><spring:message code="PASSWORD"/></label>
|
||||||
<input type='password' tabindex="2" id="password" name='j_password' required="required"/>
|
<input type='password' tabindex="2" id="password" name='j_password' required="required"/>
|
||||||
|
|
||||||
|
<c:if test="${not empty param.login_error}">
|
||||||
|
<c:choose>
|
||||||
|
<c:when test="${param.login_error == 3}">
|
||||||
|
<div class="alert alert-error"><spring:message code="USER_INACTIVE"/></div>
|
||||||
|
</c:when>
|
||||||
|
<c:otherwise>
|
||||||
|
<div class="alert alert-error"><spring:message code="LOGIN_ERROR"/></div>
|
||||||
|
</c:otherwise>
|
||||||
|
</c:choose>
|
||||||
|
</c:if>
|
||||||
|
|
||||||
<div class="form-inline">
|
<div class="form-inline">
|
||||||
<input type="submit" class="btn btn-primary" value="<spring:message code="SIGN_IN"/>" data-toggle="button">
|
<input type="submit" class="btn btn-primary" value="<spring:message code="SIGN_IN"/>"
|
||||||
|
data-toggle="button">
|
||||||
<input type="checkbox" id="rememberme" name="_spring_security_remember_me"/>
|
<input type="checkbox" id="rememberme" name="_spring_security_remember_me"/>
|
||||||
<label for="rememberme"><spring:message code="REMEMBER_ME"/></label>
|
<label for="rememberme"><spring:message code="REMEMBER_ME"/></label>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,115 +1,57 @@
|
|||||||
<%@ include file="/jsp/init.jsp" %>
|
<%@ include file="/jsp/init.jsp" %>
|
||||||
|
|
||||||
|
|
||||||
<div id="userRegistrationContent">
|
<div>
|
||||||
<div id="userRegistration" class="sb">
|
<div class="fform">
|
||||||
<h1>
|
|
||||||
<spring:message code="USER_REGISTRATION"/>
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<h2>
|
<h1><spring:message code="USER_REGISTRATION"/></h1>
|
||||||
<spring:message code="REGISTRATION_TITLE_MSG"/> <spring:message code="FIELD_REQUIRED_MSG"/>
|
|
||||||
</h2>
|
<p><spring:message code="REGISTRATION_TITLE_MSG"/></p>
|
||||||
<form:form method="post" commandName="user">
|
<form:form method="post" commandName="user">
|
||||||
<table>
|
<fieldset>
|
||||||
<tbody>
|
<label for="email"><spring:message code="EMAIL"/></label>
|
||||||
<tr>
|
<form:input path="email" id="email" type="email" required="required"/>
|
||||||
<td class="formLabel">
|
|
||||||
<span class="fieldRequired">*</span>
|
|
||||||
<label for="email"><spring:message code="EMAIL"/>:</label>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<form:input path="email" id="email"/>
|
|
||||||
<form:errors path="email" cssClass="errorMsg"/>
|
<form:errors path="email" cssClass="errorMsg"/>
|
||||||
</td>
|
|
||||||
</tr>
|
<label for="username"> <spring:message code="USERNAME"/></label>
|
||||||
<tr>
|
<form:input path="username" id="username" required="required"/>
|
||||||
<td class="formLabel">
|
|
||||||
<span class="fieldRequired">*</span>
|
|
||||||
<label for="username"> <spring:message code="USERNAME"/>:</label>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<form:input path="username" id="username"/>
|
|
||||||
<form:errors path="username" cssClass="errorMsg"/>
|
<form:errors path="username" cssClass="errorMsg"/>
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
<label for="firstname"><spring:message code="FIRSTNAME"/></label>
|
||||||
<td class="formLabel">
|
<form:input path="firstname" id="firstname" required="required"/>
|
||||||
<span class="fieldRequired">*</span>
|
|
||||||
<label for="firstname"><spring:message code="FIRSTNAME"/>:</label>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<form:input path="firstname" id="firstname"/>
|
|
||||||
<form:errors path="firstname" cssClass="errorMsg"/>
|
<form:errors path="firstname" cssClass="errorMsg"/>
|
||||||
</td>
|
|
||||||
</tr>
|
<label for="lastname"><spring:message code="LASTNAME"/></label>
|
||||||
<tr>
|
<form:input path="lastname" id="lastname" required="required"/>
|
||||||
<td class="formLabel">
|
|
||||||
<span class="fieldRequired">*</span>
|
|
||||||
<label for="lastname"><spring:message code="LASTNAME"/>:</label>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<form:input path="lastname" id="lastname"/>
|
|
||||||
<form:errors path="lastname" cssClass="errorMsg"/>
|
<form:errors path="lastname" cssClass="errorMsg"/>
|
||||||
</td>
|
|
||||||
</tr>
|
<label for="password"><spring:message code="PASSWORD"/></label>
|
||||||
<tr>
|
<form:password path="password" id="password" required="required"/>
|
||||||
<td class="formLabel">
|
|
||||||
<span class="fieldRequired">*</span>
|
|
||||||
<label for="password"><spring:message code="PASSWORD"/>:</label>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<form:password path="password" id="password"/>
|
|
||||||
<form:errors path="password" cssClass="errorMsg"/>
|
<form:errors path="password" cssClass="errorMsg"/>
|
||||||
</td>
|
|
||||||
</tr>
|
<label for="retypePassword"><spring:message code="RETYPE_PASSWORD"/></label>
|
||||||
<tr>
|
|
||||||
<td class="formLabel">
|
|
||||||
<span class="fieldRequired">*</span>
|
|
||||||
<label for="retypePassword"><spring:message code="RETYPE_PASSWORD"/>:</label>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<form:password path="retypePassword" id="retypePassword"/>
|
<form:password path="retypePassword" id="retypePassword"/>
|
||||||
<form:errors path="retypePassword" cssClass="errorMsg"/>
|
<form:errors path="retypePassword" cssClass="errorMsg"/>
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<c:if test="${requestScope.captchaEnabled}">
|
<c:if test="${requestScope.captchaEnabled}">
|
||||||
<tr>
|
|
||||||
<td class="formLabel">
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<form:errors path="captcha" cssClass="errorMsg"/>
|
<form:errors path="captcha" cssClass="errorMsg"/>
|
||||||
${requestScope.captchaHtml}
|
${requestScope.captchaHtml}
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</c:if>
|
</c:if>
|
||||||
<tr>
|
|
||||||
<td class="formLabel">
|
<div>
|
||||||
|
<p>
|
||||||
<spring:message code="TERM_OF_THE_SERVICE"/>
|
<spring:message code="TERM_OF_THE_SERVICE"/>
|
||||||
</td>
|
<spring:message code="WISEMAPPING_ACCOUNT_MESSAGE"/> <a href="termsOfUse.htm"><spring:message
|
||||||
<td>
|
code="HERE"/></a>
|
||||||
<spring:message code="WISEMAPPING_ACCOUNT_MESSAGE"/>
|
|
||||||
<a href="termsOfUse.htm">
|
|
||||||
<spring:message code="HERE"/>
|
|
||||||
</a>.<br/>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="formLabel"> </td>
|
|
||||||
<td>
|
|
||||||
<spring:message code="REGISTRATION_CLICK_ADVICE"/>
|
<spring:message code="REGISTRATION_CLICK_ADVICE"/>
|
||||||
</td>
|
</p>
|
||||||
</tr>
|
</div>
|
||||||
<tr>
|
|
||||||
<td> </td>
|
<input type="submit" value="<spring:message code="REGISTER" />" id="submitButton"
|
||||||
<td><input type="submit" value="<spring:message code="REGISTER"/>" id="submitButton"
|
class="btn btn-primary">
|
||||||
class="btn-primary">
|
|
||||||
<input type="button" value="<spring:message code="CANCEL"/>"
|
<input type="button" value="<spring:message code="CANCEL"/>"
|
||||||
onclick="window.location='<c:url value="mymaps.htm"/>'" class="btn-secondary">
|
onclick="window.location='<c:url value="mymaps.htm"/>'" class="btn">
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</form:form>
|
</form:form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user