From 8bfdda82b7363ea6fbe64ae8b8ef8416b4d00756 Mon Sep 17 00:00:00 2001
From: Ezequiel Bergamaschi <ezequielbergamaschi@gmail.com>
Date: Mon, 18 Aug 2014 21:54:41 -0300
Subject: [PATCH] Revert "Revert "new header""

This reverts commit 3d6df8a143c54d2201e381048abc56ac8bcfa0c8.
---
 .../src/main/webapp/css/pageHeaders.css       |  2 +-
 wise-webapp/src/main/webapp/jsp/header.jsp    | 69 ++++++++++++-------
 2 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/wise-webapp/src/main/webapp/css/pageHeaders.css b/wise-webapp/src/main/webapp/css/pageHeaders.css
index 94ab0341..6af04beb 100644
--- a/wise-webapp/src/main/webapp/css/pageHeaders.css
+++ b/wise-webapp/src/main/webapp/css/pageHeaders.css
@@ -112,7 +112,7 @@ div#headerButtons activelink a, div#headerButtons activelink a:hover {
 
 div#headerActions {
     padding-right: 8px;
-    padding-top: 4px;
+    padding-top: 2px;
     position: absolute;
     right: 0;
     z-index: 50;
diff --git a/wise-webapp/src/main/webapp/jsp/header.jsp b/wise-webapp/src/main/webapp/jsp/header.jsp
index 5cdaeb7b..acd3d58c 100644
--- a/wise-webapp/src/main/webapp/jsp/header.jsp
+++ b/wise-webapp/src/main/webapp/jsp/header.jsp
@@ -13,6 +13,25 @@
     }
 %>
 
+<style>
+    .btn-header {
+        background-color: #F7C931;
+        border-color: #575757;
+        color: #000000;
+    }
+    .btn-header:hover {
+        background-color: #eee;
+    }
+    .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 class="modal-dialog">
     <div class="modal-content">
@@ -33,15 +52,23 @@
     <div id="headerToolbar">
         <c:choose>
             <c:when test="${principal != null}">
-                <div id="headerActions">
+
+                <div class='WelcomeHeader' >
                     <spring:message code="WELCOME"/>, ${principal.firstname}
-                    | <span><a href="c/maps/"><spring:message
-                        code="MY_WISEMAPS"/></a></span>
-                    | <span><a id="userSettingsBtn" href="#"
-                               title="<spring:message code="ACCOUNT_DETAIL"/>"><spring:message
-                        code="ACCOUNT"/></a></span>
-                    | <span><a href="c/logout"
-                               title="<spring:message code="LOGOUT"/>"><spring:message code="LOGOUT"/></a></span>
+                </div>
+
+                <div class="btn-group" id="headerActions">
+
+                    <button type="button" onclick="location.href='c/maps/'" class="btn btn-sm btn-header"><spring:message code="MY_WISEMAPS"/></button>
+
+                    <button type="button" onclick="accountInfo()" title="<spring:message code="ACCOUNT_DETAIL"/>" class="btn btn-sm btn-header">
+                        <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>
             </c:when>
             <c:when test="${!param.removeSignin && !requestScope.removeSignin}">
@@ -69,22 +96,18 @@
 
 
 <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>