From 2b89fdccca7480c833df9d9394d579b0cc53e2f7 Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date: Sun, 9 Feb 2014 04:19:39 -0300
Subject: [PATCH] Fix registration, login

---
 wise-webapp/src/main/webapp/jsp/footer.jsp    |  4 +-
 wise-webapp/src/main/webapp/jsp/template.jsp  |  2 +
 .../main/webapp/jsp/userForgotPassword.jsp    | 10 ++-
 .../src/main/webapp/jsp/userRegistration.jsp  | 76 ++++++++++++-------
 4 files changed, 57 insertions(+), 35 deletions(-)

diff --git a/wise-webapp/src/main/webapp/jsp/footer.jsp b/wise-webapp/src/main/webapp/jsp/footer.jsp
index ec13e1eb..c63fbef0 100644
--- a/wise-webapp/src/main/webapp/jsp/footer.jsp
+++ b/wise-webapp/src/main/webapp/jsp/footer.jsp
@@ -1,6 +1,6 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@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=703b9822"></script>
 
@@ -27,7 +27,7 @@
      });
     </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>
         <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>
diff --git a/wise-webapp/src/main/webapp/jsp/template.jsp b/wise-webapp/src/main/webapp/jsp/template.jsp
index ac6e721c..dbd6841c 100644
--- a/wise-webapp/src/main/webapp/jsp/template.jsp
+++ b/wise-webapp/src/main/webapp/jsp/template.jsp
@@ -54,7 +54,9 @@
         <div class="row">
             <div class="col-md-2"></div>
             <div class="pageBodyContent col-md-8">
+               <div class="row">
                 <tiles:insertAttribute name="body"/>
+               </div>
             </div>
             <c:if test="${requestScope['google.ads.enabled']}">
                 <div class="row" style="text-align: center;margin: 5px">
diff --git a/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp b/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp
index d8721c6d..f163f096 100755
--- a/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp
+++ b/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp
@@ -17,17 +17,19 @@
 
         <p><spring:message code="FORGOT_PASSWORD_MESSAGE"/></p>
 
-        <form:form method="post" commandName="resetPassword">
+        <form:form method="post" commandName="resetPassword"  class="form-horizontal">
             <fieldset>
-                <label for="email"><spring:message code="EMAIL"/></label>
-                <input id="email" type="email" required="required" name="email"/>
-
+                <label for="email" class="col-sm-2 control-label"><spring:message code="EMAIL"/>: </label>
+                <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"
                        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>
 
diff --git a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
index 96158380..2df41da4 100644
--- a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
+++ b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
@@ -1,40 +1,58 @@
 <%@page pageEncoding="UTF-8" %>
 <%@include file="/jsp/init.jsp" %>
 
-<div class="fform">
+<div class="fform" >
 
     <h1><spring:message code="USER_REGISTRATION"/></h1>
 
     <p><spring:message code="REGISTRATION_TITLE_MSG"/></p>
-    <form:form method="post" commandName="user">
+    <form:form method="post" commandName="user" class="form-horizontal">
     <fieldset>
-        <label for="email"><spring:message code="EMAIL"/></label>
-            <form:input path="email" id="email" type="email" required="required"/>
-            <form:errors path="email" cssClass="errorMsg"/>
-
-        <label for="firstname"><spring:message code="FIRSTNAME"/></label>
-            <form:input path="firstname" id="firstname" required="required"/>
-            <form:errors path="firstname" cssClass="errorMsg"/>
-
-        <label for="lastname"><spring:message code="LASTNAME"/></label>
-            <form:input path="lastname" id="lastname" required="required"/>
-            <form:errors path="lastname" cssClass="errorMsg"/>
-
-        <label for="password"><spring:message code="PASSWORD"/></label>
-            <form:password path="password" id="password" required="required"/>
-            <form:errors path="password" cssClass="errorMsg"/>
-
-        <label for="retypePassword"><spring:message code="RETYPE_PASSWORD"/></label>
-            <form:password path="retypePassword" id="retypePassword"/>
-            <form:errors path="retypePassword" cssClass="errorMsg"/>
-
-        <c:if test="${requestScope.captchaEnabled}">
-            ${requestScope.captchaHtml}
-        <p>
-            <form:errors path="captcha" cssClass="errorMsg"/>
-        </p>
-        </c:if>
-
+        <div class="form-group">
+            <label for="email" class="col-sm-2 control-label"><spring:message code="EMAIL"/>: </label>
+            <div class="col-sm-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-sm-2 control-label"><spring:message code="FIRSTNAME"/>: </label>
+            <div class="col-sm-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-sm-2 control-label"><spring:message code="LASTNAME"/>: </label>
+            <div class="col-sm-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-sm-2 control-label"><spring:message code="PASSWORD"/>: </label>
+            <div class="col-sm-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-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>
             <p>
                 <spring:message code="TERM_OF_THE_SERVICE"/>