mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-08-20 04:30:42 +02:00
- Footer is more positioned in the bottom
This commit is contained in:
parent
022e3d982a
commit
4c988d4ae2
@ -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">
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
@ -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 {
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
||||
|
||||
|
@ -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"/>
|
||||
|
@ -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']}">
|
||||
|
@ -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>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user