From a277b73497edf8a0068a41b5a100d0c856782ce4 Mon Sep 17 00:00:00 2001
From: tfennelly <tom.fennelly@gmail.com>
Date: Mon, 14 Jul 2014 12:43:57 +0100
Subject: [PATCH] [JENKINS-23492] Fixed auth/login links in top navbar

---
 .../src/main/resources/lib/layout/breadcrumbs.css |   3 +++
 core/src/main/resources/lib/layout/breadcrumbs.js |   8 ++++++++
 core/src/main/resources/lib/layout/layout.jelly   |   2 +-
 .../resources/lib/layout/menu_down_arrow2.png     | Bin 0 -> 227 bytes
 war/src/main/webapp/css/style.css                 |   7 ++++---
 5 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 core/src/main/resources/lib/layout/menu_down_arrow2.png

diff --git a/core/src/main/resources/lib/layout/breadcrumbs.css b/core/src/main/resources/lib/layout/breadcrumbs.css
index ac30ca9dc3..5dcc7624eb 100644
--- a/core/src/main/resources/lib/layout/breadcrumbs.css
+++ b/core/src/main/resources/lib/layout/breadcrumbs.css
@@ -83,6 +83,9 @@
   cursor: pointer;
   z-index: 2000;
 }
+#menuSelector.inverse {
+  background-image: url(menu_down_arrow2.png);
+}
 
 A.model-link.inside, #breadcrumbs A.inside {/* additional 'inside' class allows pre-allocation of the context menu space */
   padding-right: 16px;
diff --git a/core/src/main/resources/lib/layout/breadcrumbs.js b/core/src/main/resources/lib/layout/breadcrumbs.js
index 7efa633811..a36686a0c6 100644
--- a/core/src/main/resources/lib/layout/breadcrumbs.js
+++ b/core/src/main/resources/lib/layout/breadcrumbs.js
@@ -103,8 +103,16 @@ var breadcrumbs = (function() {
          */
         menuSelector.show = function(target) {
             var xy = Dom.getXY(target);
+
             if ($(target).hasClassName("inside"))
                 xy[0] -= this.offsetWidth;  // show the menu selector inside the text
+
+            if ($(target).hasClassName("inverse")) {
+                menuSelector.addClassName("inverse");
+            } else {
+                menuSelector.removeClassName("inverse");
+            }
+
             xy[0] += target.offsetWidth;
             xy[1] += target.offsetHeight/2 - this.offsetHeight/2;
             Dom.setXY(this, xy);
diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly
index fca6bec9a1..9e5ff26340 100644
--- a/core/src/main/resources/lib/layout/layout.jelly
+++ b/core/src/main/resources/lib/layout/layout.jelly
@@ -170,7 +170,7 @@ ${h.initPageVariables(context)}
                 </j:otherwise>
               </j:choose>
               <span style="white-space:nowrap">
-                <a href="${rootURL}/user/${user.id}" class="model-link inside"><b>${userName}</b></a>
+                <a href="${rootURL}/user/${user.id}" class="model-link inside inverse"><b>${userName}</b></a>
                 <j:if test="${app.securityRealm.canLogOut()}">
                   |
                   <a href="${rootURL}/logout"><b>${%logout}</b></a>
diff --git a/core/src/main/resources/lib/layout/menu_down_arrow2.png b/core/src/main/resources/lib/layout/menu_down_arrow2.png
new file mode 100644
index 0000000000000000000000000000000000000000..572afe828a019cdbc4bda82048261e62266df7d2
GIT binary patch
literal 227
zcmeAS@N?(olHy`uVBq!ia0vp^{6H+g!VDy>D=f@`lxToYh--dP?v^cEwr$(Cef#zu
zJ9g~cxpUX9U3~lV4+9l2mIV0)GdMiEkp|)<dAqwXbg;^L06Clm9+AZi4BWyX%*Zfn
zjs#GUy~NYkmHi$&AGff{FF`dappa~4NJNQqer|4RUI~!Pz~Eeznpl#WqEMb$lA+-4
z=^K!um&y(lm-BRS4B@z*oS-1gv3e<2gXEcYD+3k=Fl#hVZOma{nAF1f?D&R1%RokW
My85}Sb4q9e01rPvp#T5?

literal 0
HcmV?d00001

diff --git a/war/src/main/webapp/css/style.css b/war/src/main/webapp/css/style.css
index 1ac587ac81..4e0a919b38 100644
--- a/war/src/main/webapp/css/style.css
+++ b/war/src/main/webapp/css/style.css
@@ -184,13 +184,14 @@ dt {
 }
 
 #header .login {
+  position: relative;
+  top: 8px;
   color: white;
   margin-right: 10px;
 }
 
-#header .login a {
-  position: relative;
-  top: 10px;
+#header .login a, #header .login a:visited {
+  color: white;
 }
 
 a:link {
-- 
GitLab