From f1c9c95ed58c9d8ea620e9bcee8c64a530ccad92 Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date: Sat, 15 Sep 2012 12:59:56 -0300
Subject: [PATCH] - Fix layout

---
 .../src/main/webapp/css/pageHeaders.css       |  3 -
 .../src/main/webapp/css/pageTemplate.css      |  5 +-
 .../src/main/webapp/jsp/userRegistration.jsp  | 81 +++++++++----------
 3 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/wise-webapp/src/main/webapp/css/pageHeaders.css b/wise-webapp/src/main/webapp/css/pageHeaders.css
index 7a9a9131..641973c7 100644
--- a/wise-webapp/src/main/webapp/css/pageHeaders.css
+++ b/wise-webapp/src/main/webapp/css/pageHeaders.css
@@ -102,9 +102,6 @@ div#headerButtons activelink a, div#headerButtons activelink a:hover {
 #footer {
     border-top: 1px black solid;
     padding-top: 15px;
-    position: absolute;
-    bottom: 0;
-    left: 0;
     width: 100%;
     background: #ffffff;
 }
diff --git a/wise-webapp/src/main/webapp/css/pageTemplate.css b/wise-webapp/src/main/webapp/css/pageTemplate.css
index cbab0c77..38b53706 100644
--- a/wise-webapp/src/main/webapp/css/pageTemplate.css
+++ b/wise-webapp/src/main/webapp/css/pageTemplate.css
@@ -3,6 +3,9 @@
 
 @import "pageHeaders.css";
 
+html, body {
+    height: 100%;
+}
 
 div#register {
     margin: 40px auto;
@@ -30,7 +33,7 @@ div.pageBodyContent ol li {
 
 
 div.pageBody {
-    min-height: 500px;
+    min-height: 80%;
 }
 
 div.pageBodyContent {
diff --git a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
index 78caabac..96158380 100644
--- a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
+++ b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
@@ -1,57 +1,56 @@
 <%@page pageEncoding="UTF-8" %>
 <%@include file="/jsp/init.jsp" %>
 
-<div>
-    <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>
-        <form:form method="post" commandName="user">
-        <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"/>
+    <p><spring:message code="REGISTRATION_TITLE_MSG"/></p>
+    <form:form method="post" commandName="user">
+    <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="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="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="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"/>
+        <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}
+        <c:if test="${requestScope.captchaEnabled}">
+            ${requestScope.captchaHtml}
+        <p>
+            <form:errors path="captcha" cssClass="errorMsg"/>
+        </p>
+        </c:if>
+
+        <div>
             <p>
-                <form:errors path="captcha" cssClass="errorMsg"/>
+                <spring:message code="TERM_OF_THE_SERVICE"/>
+                <spring:message code="WISEMAPPING_ACCOUNT_MESSAGE"/> <a href="c/termsOfUse"
+                                                                        target="_blank"><spring:message
+                    code="HERE"/></a>.
+                <spring:message code="REGISTRATION_CLICK_ADVICE"/>
             </p>
-            </c:if>
+        </div>
 
-            <div>
-                <p>
-                    <spring:message code="TERM_OF_THE_SERVICE"/>
-                    <spring:message code="WISEMAPPING_ACCOUNT_MESSAGE"/> <a href="c/termsOfUse" target="_blank"><spring:message
-                        code="HERE"/></a>.
-                    <spring:message code="REGISTRATION_CLICK_ADVICE"/>
-                </p>
-            </div>
-
-            <input type="submit" value="<spring:message code="REGISTER"/>"
-                   data-loading-text="<spring:message code="REGISTER"/> ..." id="submitButton"
-                   class="btn btn-primary">
-            <input type="button" value="<spring:message code="CANCEL"/>"
-                   onclick="window.location='c/<c:url value="maps/"/>'" class="btn">
-            </form:form>
-    </div>
+        <input type="submit" value="<spring:message code="REGISTER"/>"
+               data-loading-text="<spring:message code="REGISTER"/> ..." id="submitButton"
+               class="btn btn-primary">
+        <input type="button" value="<spring:message code="CANCEL"/>"
+               onclick="window.location='c/<c:url value="maps/"/>'" class="btn">
+        </form:form>
 </div>