vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-22 14:17:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrate regitration forms to bootstrap

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2012-05-19 01:58:37 -03:00
parent 95d02a4d25
commit 65e9625867
6 changed files with 86 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties
View File

@ -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

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

@ -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
wise-webapp/src/main/webapp/jsp/footer.jsp
View File

@ -2,7 +2,7 @@
<div id="footer"> <div id="footer">
<div style="width:30%; float:left;">&nbsp;</div> <div style="width:30%; float:left;">&nbsp;</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;">

49
wise-webapp/src/main/webapp/jsp/forgotPassword.jsp
View File

@ -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> <form:errors path="email" cssClass="errorMsg"/>
<spring:message code="EMAIL"/>:
</td> <input type="submit" value="<spring:message code="SUBMIT"/>" class="btn btn-primary"/>
<td> <input type="button" value="<spring:message code="CANCEL"/>" class="btn"
<form:input path="email" id="email" tabindex="1"/> onclick="window.location='<c:url value="c/mymaps.htm"/>'"/>
<form:errors path="email" cssClass="errorMsg"/> </fieldset>
</td>
</tr>
<tr>
<td>&nbsp;</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"
onclick="window.location='<c:url value="mymaps.htm"/>'">
</td>
</tr>
</tbody>
</table>
</form:form> </form:form>
</div> </div>
</div> </div>

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

@ -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">&nbsp;&nbsp;&nbsp; <input type="submit" class="btn btn-primary" value="<spring:message code="SIGN_IN"/>"
data-toggle="button">&nbsp;&nbsp;&nbsp;
<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>

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

@ -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"> <form:errors path="email" cssClass="errorMsg"/>
<span class="fieldRequired">*</span>
<label for="email"><spring:message code="EMAIL"/>:</label> <label for="username"> <spring:message code="USERNAME"/></label>
</td> <form:input path="username" id="username" required="required"/>
<td> <form:errors path="username" cssClass="errorMsg"/>
<form:input path="email" id="email"/>
<form:errors path="email" cssClass="errorMsg"/>
</td> <label for="firstname"><spring:message code="FIRSTNAME"/></label>
</tr> <form:input path="firstname" id="firstname" required="required"/>
<tr> <form:errors path="firstname" cssClass="errorMsg"/>
<td class="formLabel">
<span class="fieldRequired">*</span> <label for="lastname"><spring:message code="LASTNAME"/></label>
<label for="username"> <spring:message code="USERNAME"/>:</label> <form:input path="lastname" id="lastname" required="required"/>
</td> <form:errors path="lastname" cssClass="errorMsg"/>
<td>
<form:input path="username" id="username"/> <label for="password"><spring:message code="PASSWORD"/></label>
<form:errors path="username" cssClass="errorMsg"/> <form:password path="password" id="password" required="required"/>
</td> <form:errors path="password" cssClass="errorMsg"/>
</tr>
<tr> <label for="retypePassword"><spring:message code="RETYPE_PASSWORD"/></label>
<td class="formLabel"> <form:password path="retypePassword" id="retypePassword"/>
<span class="fieldRequired">*</span> <form:errors path="retypePassword" cssClass="errorMsg"/>
<label for="firstname"><spring:message code="FIRSTNAME"/>:</label>
</td> <c:if test="${requestScope.captchaEnabled}">
<td> <form:errors path="captcha" cssClass="errorMsg"/>
<form:input path="firstname" id="firstname"/> ${requestScope.captchaHtml}
<form:errors path="firstname" cssClass="errorMsg"/> </c:if>
</td>
</tr> <div>
<tr> <p>
<td class="formLabel"> <spring:message code="TERM_OF_THE_SERVICE"/>
<span class="fieldRequired">*</span> <spring:message code="WISEMAPPING_ACCOUNT_MESSAGE"/> <a href="termsOfUse.htm"><spring:message
<label for="lastname"><spring:message code="LASTNAME"/>:</label> code="HERE"/></a>
</td> <spring:message code="REGISTRATION_CLICK_ADVICE"/>
<td> </p>
<form:input path="lastname" id="lastname"/> </div>
<form:errors path="lastname" cssClass="errorMsg"/>
</td> <input type="submit" value="<spring:message code="REGISTER" />" id="submitButton"
</tr> class="btn btn-primary">
<tr> <input type="button" value="<spring:message code="CANCEL"/>"
<td class="formLabel"> onclick="window.location='<c:url value="mymaps.htm"/>'" class="btn">
<span class="fieldRequired">*</span> </form:form>
<label for="password"><spring:message code="PASSWORD"/>:</label>
</td>
<td>
<form:password path="password" id="password"/>
<form:errors path="password" cssClass="errorMsg"/>
</td>
</tr>
<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:errors path="retypePassword" cssClass="errorMsg"/>
</td>
</tr>
<c:if test="${requestScope.captchaEnabled}">
<tr>
<td class="formLabel">
</td>
<td>
<form:errors path="captcha" cssClass="errorMsg"/>
${requestScope.captchaHtml}
</td>
</tr>
</c:if>
<tr>
<td class="formLabel">
<spring:message code="TERM_OF_THE_SERVICE"/>
</td>
<td>
<spring:message code="WISEMAPPING_ACCOUNT_MESSAGE"/>
<a href="termsOfUse.htm">
<spring:message code="HERE"/>
</a>.<br/>
</td>
</tr>
<tr>
<td class="formLabel">&nbsp;</td>
<td>
<spring:message code="REGISTRATION_CLICK_ADVICE"/>
</td>
</tr>
<tr>
<td>&nbsp;</td>
<td><input type="submit" value="<spring:message code="REGISTER"/>" id="submitButton"
class="btn-primary">
<input type="button" value="<spring:message code="CANCEL"/>"
onclick="window.location='<c:url value="mymaps.htm"/>'" class="btn-secondary">
</td>
</tr>
</tbody>
</table>
</form:form>
</div> </div>
</div> </div>