vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-12-24 20:23:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Revert "new header"""

Browse Source 
This reverts commit 9844fb156e.

Conflicts:

	wise-webapp/src/main/webapp/jsp/header.jsp
This commit is contained in:
Ezequiel Bergamaschi 2014-09-12 17:07:22 -03:00
parent ae1e8a2625
commit 00e0959855
2 changed files with 24 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wise-webapp/src/main/webapp/css/pageHeaders.css
View File

@ -112,7 +112,7 @@ div#headerButtons activelink a, div#headerButtons activelink a:hover {
div#headerActions { div#headerActions {
padding-right: 8px; padding-right: 8px;
padding-top: 2px; padding-top: 4px;
position: absolute; position: absolute;
right: 0; right: 0;
z-index: 50; z-index: 50;

69
wise-webapp/src/main/webapp/jsp/header.jsp
View File

@ -13,25 +13,6 @@
} }
%> %>
<style>
.btn-header {
background-color: #F7C931;
border-color: #575757;
color: #000000;
}
.btn-header:hover {
background-color: #C8E2DF;
}
.WelcomeHeader {
position: relative;
float: left;
padding: 5px 10px;
font-size: 14px;
line-height: 1.5;
border: 1px solid transparent;
}
</style>
<div id="settings-dialog-modal" class="modal fade"> <div id="settings-dialog-modal" class="modal fade">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
@ -52,23 +33,15 @@
<div id="headerToolbar"> <div id="headerToolbar">
<c:choose> <c:choose>
<c:when test="${principal != null}"> <c:when test="${principal != null}">
<div id="headerActions">
<div class='WelcomeHeader' >
<spring:message code="WELCOME"/>, ${principal.firstname} <spring:message code="WELCOME"/>, ${principal.firstname}
</div> | <span><a href="c/maps/"><spring:message
code="MY_WISEMAPS"/></a></span>
<div class="btn-group" id="headerActions"> | <span><a id="userSettingsBtn" href="#"
title="<spring:message code="ACCOUNT_DETAIL"/>"><spring:message
<button type="button" onclick="location.href='c/maps/'" class="btn btn-sm btn-header"><spring:message code="MY_WISEMAPS"/></button> code="ACCOUNT"/></a></span>
| <span><a href="c/logout"
<button type="button" onclick="accountInfo()" title="<spring:message code="ACCOUNT_DETAIL"/>" class="btn btn-sm btn-header"> title="<spring:message code="LOGOUT"/>"><spring:message code="LOGOUT"/></a></span>
<spring:message code="ACCOUNT"/>
</button>
<button onclick="location.href='c/logout'" title="<spring:message code="LOGOUT"/>" type="button" class="btn btn-sm btn-header">
<spring:message code="LOGOUT"/>
</button>
</div> </div>
</c:when> </c:when>
<c:when test="${!param.removeSignin && !requestScope.removeSignin}"> <c:when test="${!param.removeSignin && !requestScope.removeSignin}">
@ -96,18 +69,22 @@
<script type="text/javascript"> <script type="text/javascript">
var userSettingsLink = $('#userSettingsBtn');
if (userSettingsLink) {
userSettingsLink.click(
function (event) {
$('#settings-dialog-modal .modal-body').load("c/account/settings",
function () {
$('#settings-dialog-modal .btn-cancel').unbind('click').click(function () {
$('#settings-dialog-modal').modal("hide");
window.location.reload();
});
}
);
$('#settings-dialog-modal').modal();
event.preventDefault();
function accountInfo(event) { });
$('#settings-dialog-modal .modal-body').load("c/account/settings",
function () {
$('#settings-dialog-modal .btn-cancel').unbind('click').click(function () {
$('#settings-dialog-modal').modal("hide");
window.location.reload();
});
}
);
$('#settings-dialog-modal').modal();
event.preventDefault();
} }
</script> </script>