From 4c988d4ae29a216f9945422b29641ca68cf30eae Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date: Wed, 12 Sep 2012 23:29:57 -0300
Subject: [PATCH] - Footer is more positioned in the bottom

---
 wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml | 4 +---
 wise-webapp/src/main/webapp/css/mindmapList.less         | 8 ++++----
 wise-webapp/src/main/webapp/css/pageHeaders.css          | 5 +++++
 wise-webapp/src/main/webapp/jsp/footer.jsp               | 2 +-
 wise-webapp/src/main/webapp/jsp/header.jsp               | 3 +--
 wise-webapp/src/main/webapp/jsp/login.jsp                | 4 ++--
 wise-webapp/src/main/webapp/jsp/mindmapList.jsp          | 3 ++-
 wise-webapp/src/main/webapp/jsp/template.jsp             | 6 +++++-
 8 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml b/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml
index 858ccfef..636b6243 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml
@@ -56,25 +56,23 @@
     <definition name="securityError" extends="errorTemplate">
         <put-attribute name="title" value="NO_ENOUGH_PERMISSIONS"/>
         <put-attribute name="details" value="NO_ENOUGH_PERMISSIONS_DETAILS"/>
-        <put-attribute name="logError" value="false"/>
     </definition>
 
     <definition name="forgotPasswordError" extends="errorTemplate">
         <put-attribute name="title" value="INVALID_EMAIL_ERROR"/>
         <put-attribute name="body" value="/jsp/userForgotPasswordError.jsp"/>
-        <put-attribute name="logError" value="false"/>
     </definition>
 
     <definition name="forgotPasswordSuccess" extends="errorTemplate">
         <put-attribute name="title" value="FORGOT_PASSWORD"/>
         <put-attribute name="body" value="/jsp/userForgotPasswordSuccess.jsp"/>
-        <put-attribute name="logError" value="false"/>
     </definition>
 
     <!-- Main Pages -->
     <definition name="login" extends="pageTemplate">
         <put-attribute name="title" value="LOGIN"/>
         <put-attribute name="body" value="/jsp/login.jsp"/>
+        <put-attribute name="removeSignin" value="true"/>
     </definition>
 
     <definition name="termsOfUse" extends="pageTemplate">
diff --git a/wise-webapp/src/main/webapp/css/mindmapList.less b/wise-webapp/src/main/webapp/css/mindmapList.less
index 158a1919..e153bb90 100644
--- a/wise-webapp/src/main/webapp/css/mindmapList.less
+++ b/wise-webapp/src/main/webapp/css/mindmapList.less
@@ -43,9 +43,9 @@
 
 #map-table {
     width: 100% !important;
-    display: inline-block;
-    float: right;
-    border-top: 1px solid black
+    border-top: 1px solid black;
+    overflow-y: auto;
+    height: 480px;
 }
 
 input#selectAll {
@@ -198,4 +198,4 @@ span.starredOn:hover {
 
 abbr[title] {
     cursor: default;
-}
\ No newline at end of file
+}
diff --git a/wise-webapp/src/main/webapp/css/pageHeaders.css b/wise-webapp/src/main/webapp/css/pageHeaders.css
index f02197c7..7a9a9131 100644
--- a/wise-webapp/src/main/webapp/css/pageHeaders.css
+++ b/wise-webapp/src/main/webapp/css/pageHeaders.css
@@ -102,6 +102,11 @@ 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;
 }
 
 div#paypal {
diff --git a/wise-webapp/src/main/webapp/jsp/footer.jsp b/wise-webapp/src/main/webapp/jsp/footer.jsp
index c7dabe73..9d583a02 100644
--- a/wise-webapp/src/main/webapp/jsp/footer.jsp
+++ b/wise-webapp/src/main/webapp/jsp/footer.jsp
@@ -1,7 +1,7 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
-<div class="row" id="footer">
+<div id="footer">
     <div class="span1 offset3">
         <a href="https://twitter.com/share" class="twitter-share-button" data-via="wisemapping"
            data-related="wisemapping">Tweet</a>
diff --git a/wise-webapp/src/main/webapp/jsp/header.jsp b/wise-webapp/src/main/webapp/jsp/header.jsp
index 0564d167..54838122 100644
--- a/wise-webapp/src/main/webapp/jsp/header.jsp
+++ b/wise-webapp/src/main/webapp/jsp/header.jsp
@@ -40,7 +40,7 @@
                                title="<spring:message code="LOGOUT"/>"><spring:message code="LOGOUT"/></a></span>
                 </div>
             </c:when>
-            <c:when test="${param.removeSignin!=true}">
+            <c:when test="${!param.removeSignin && !requestScope.removeSignin}">
                 <div id="headerActions">
                     <spring:message code="ALREADY_A_MEMBER"/>
                     <span><a href="c/login" title="<spring:message code="SIGN_IN"/>">
@@ -82,4 +82,3 @@
 
 </script>
 
-
diff --git a/wise-webapp/src/main/webapp/jsp/login.jsp b/wise-webapp/src/main/webapp/jsp/login.jsp
index 00af28d1..99df43bf 100644
--- a/wise-webapp/src/main/webapp/jsp/login.jsp
+++ b/wise-webapp/src/main/webapp/jsp/login.jsp
@@ -11,7 +11,7 @@
     });
 </script>
 
-<div id="row-fluid">
+<div id="row">
     <div class="span1"></div>
     <div class="span5" style="margin-top: 20px">
         <h1><spring:message code="WELCOME_TO_WISEMAPPING"/></h1>
@@ -55,7 +55,7 @@
     </div>
 </div>
 
-<div class="row-fluid">
+<div class="row">
     <div id="register" class="span12">
         <b><spring:message code="NOT_READY_A_USER"/></b>
         <spring:message code="NOT_READY_A_USER_MESSAGE"/>
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
index 18a450b4..d51da72a 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
@@ -208,8 +208,9 @@
         </div>
         <div id="map-table">
             <table class="table" id="mindmapListTable"></table>
-            <div id="tableFooter" class="form-inline"></div>
         </div>
+        <div id="tableFooter" class="form-inline"></div>
+
     </div>
     <div class="span1" style="padding-top:25px">
         <c:if test="${requestScope['google.ads.enabled']}">
diff --git a/wise-webapp/src/main/webapp/jsp/template.jsp b/wise-webapp/src/main/webapp/jsp/template.jsp
index a6772a13..2fea26aa 100644
--- a/wise-webapp/src/main/webapp/jsp/template.jsp
+++ b/wise-webapp/src/main/webapp/jsp/template.jsp
@@ -6,6 +6,7 @@
 <%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
 <tiles:importAttribute name="title" scope="request"/>
 <tiles:importAttribute name="details" scope="request"/>
+<tiles:importAttribute name="removeSignin" scope="request" ignore="true"/>
 
 <html>
 <head>
@@ -32,7 +33,9 @@
 </head>
 <body>
 
-<jsp:include page="header.jsp"/>
+<jsp:include page="header.jsp">
+    <jsp:param name="removeSignin" value="${requestScope.removeSignin}"/>
+</jsp:include>
 
 <div class="pageBody row-fluid">
     <div class="span2"></div>
@@ -44,3 +47,4 @@
 <jsp:include page="footer.jsp"/>
 </body>
 </html>
+