[JENKINS-23492] Fixed auth/login links in top navbar

jenkinsci · Jul 14, 2014 · a277b73 · a277b73
1 parent 65d3799
commit a277b73
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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 {