vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-09-12 07:10:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix registration, login

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2014-02-09 04:19:39 -03:00
parent 6624abb9ed
commit 2b89fdccca
4 changed files with 57 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wise-webapp/src/main/webapp/jsp/footer.jsp
View File

@ -1,6 +1,6 @@
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<div id="footerContainer"> <div id="footerContainer" class="row">
<script type="text/javascript" src="https://wisemapping.atlassian.net/s/d41d8cd98f00b204e9800998ecf8427e/en_US-f1g0rh-1988229788/6211/26/1.4.5/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?collectorId=a47981d6"></script> <script type="text/javascript" src="https://wisemapping.atlassian.net/s/d41d8cd98f00b204e9800998ecf8427e/en_US-f1g0rh-1988229788/6211/26/1.4.5/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?collectorId=a47981d6"></script>
<script type="text/javascript" src="https://wisemapping.atlassian.net/s/d41d8cd98f00b204e9800998ecf8427e/en_US-f1g0rh-1988229788/6211/26/1.4.5/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?collectorId=703b9822"></script> <script type="text/javascript" src="https://wisemapping.atlassian.net/s/d41d8cd98f00b204e9800998ecf8427e/en_US-f1g0rh-1988229788/6211/26/1.4.5/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?collectorId=703b9822"></script>
@ -27,7 +27,7 @@
}); });
</script> </script>
<div class="col-md-1 col-md-offset-3"> <div class="col-md-1 col-md-offset-2">
<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.wisemapping.com" data-text="Check out this site" data-via="wisemapping" data-related="wisemapping">Tweet</a> <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.wisemapping.com" data-text="Check out this site" data-via="wisemapping" data-related="wisemapping">Tweet</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
</div> </div>

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

@ -54,7 +54,9 @@
<div class="row"> <div class="row">
<div class="col-md-2"></div> <div class="col-md-2"></div>
<div class="pageBodyContent col-md-8"> <div class="pageBodyContent col-md-8">
<div class="row">
<tiles:insertAttribute name="body"/> <tiles:insertAttribute name="body"/>
</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">

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

@ -17,17 +17,19 @@
<p><spring:message code="FORGOT_PASSWORD_MESSAGE"/></p> <p><spring:message code="FORGOT_PASSWORD_MESSAGE"/></p>
<form:form method="post" commandName="resetPassword"> <form:form method="post" commandName="resetPassword" class="form-horizontal">
<fieldset> <fieldset>
<label for="email"><spring:message code="EMAIL"/></label> <label for="email" class="col-sm-2 control-label"><spring:message code="EMAIL"/>: </label>
<input id="email" type="email" required="required" name="email"/> <div class="col-sm-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" <input type="submit" value="<spring:message code="SEND_ME_A_NEW_PASSWORD"/>" class="btn btn-primary"
data-loading-text="<spring:message code="SENDING"/>"/> data-loading-text="<spring:message code="SENDING"/>"/>
<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="c/maps/"/>'"/> onclick="window.location='<c:url value="c/maps/"/>'"/>
</fieldset> </fieldset>
</form:form> </form:form>
</br>
</div> </div>
</div> </div>

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

@ -1,40 +1,58 @@
<%@page pageEncoding="UTF-8" %> <%@page pageEncoding="UTF-8" %>
<%@include file="/jsp/init.jsp" %> <%@include file="/jsp/init.jsp" %>
<div class="fform"> <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> <p><spring:message code="REGISTRATION_TITLE_MSG"/></p>
<form:form method="post" commandName="user"> <form:form method="post" commandName="user" class="form-horizontal">
<fieldset> <fieldset>
<label for="email"><spring:message code="EMAIL"/></label> <div class="form-group">
<form:input path="email" id="email" type="email" required="required"/> <label for="email" class="col-sm-2 control-label"><spring:message code="EMAIL"/>: </label>
<form:errors path="email" cssClass="errorMsg"/> <div class="col-sm-5">
<form:input path="email" id="email" type="email" required="required" class="form-control"/>
<label for="firstname"><spring:message code="FIRSTNAME"/></label> <form:errors path="email" cssClass="errorMsg"/>
<form:input path="firstname" id="firstname" required="required"/> </div>
<form:errors path="firstname" cssClass="errorMsg"/> </div>
<div class="form-group">
<label for="lastname"><spring:message code="LASTNAME"/></label> <label for="firstname" class="col-sm-2 control-label"><spring:message code="FIRSTNAME"/>: </label>
<form:input path="lastname" id="lastname" required="required"/> <div class="col-sm-5">
<form:errors path="lastname" cssClass="errorMsg"/> <form:input path="firstname" id="firstname" required="required" class="form-control"/>
<form:errors path="firstname" cssClass="errorMsg"/>
<label for="password"><spring:message code="PASSWORD"/></label> </div>
<form:password path="password" id="password" required="required"/> </div>
<form:errors path="password" cssClass="errorMsg"/> <div class="form-group">
<label for="lastname" class="col-sm-2 control-label"><spring:message code="LASTNAME"/>: </label>
<label for="retypePassword"><spring:message code="RETYPE_PASSWORD"/></label> <div class="col-sm-5">
<form:password path="retypePassword" id="retypePassword"/> <form:input path="lastname" id="lastname" required="required" class="form-control"/>
<form:errors path="retypePassword" cssClass="errorMsg"/> <form:errors path="lastname" cssClass="errorMsg"/>
</div>
<c:if test="${requestScope.captchaEnabled}"> </div>
${requestScope.captchaHtml} <div class="form-group">
<p> <label for="password" class="col-sm-2 control-label"><spring:message code="PASSWORD"/>: </label>
<form:errors path="captcha" cssClass="errorMsg"/> <div class="col-sm-5">
</p> <form:password path="password" id="password" required="required" class="form-control"/>
</c:if> <form:errors path="password" cssClass="errorMsg"/>
</div>
</div>
<div class="form-group">
<label for="retypePassword" class="col-sm-2 control-label"><spring:message code="RETYPE_PASSWORD"/>: </label>
<div class="col-sm-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-sm-12">
<c:if test="${requestScope.captchaEnabled}">
${requestScope.captchaHtml}
<p>
<form:errors path="captcha" cssClass="errorMsg"/>
</p>
</c:if>
</div>
</div>
<div> <div>
<p> <p>
<spring:message code="TERM_OF_THE_SERVICE"/> <spring:message code="TERM_OF_THE_SERVICE"/>