diff --git a/core/src/main/resources/lib/layout/breadcrumbs.css b/core/src/main/resources/lib/layout/breadcrumbs.css index ac30ca9dc37e99e190e19e357b169156e5bde664..5dcc7624ebcdebd9b703db8de25beca507b8d2fe 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 7efa6338116e65f8b2b6d25711491b0ed970a253..a36686a0c62b69aca98e6560aff1f1149765db5f 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 fca6bec9a1f5080bed01a96e69d44a9d3b58e7b6..9e5ff26340f6661d43e28f63eeb0b24acaa70fd3 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)} - ${userName} + ${userName} | ${%logout} 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 Binary files /dev/null and b/core/src/main/resources/lib/layout/menu_down_arrow2.png differ diff --git a/war/src/main/webapp/css/style.css b/war/src/main/webapp/css/style.css index 1ac587ac81f0178dafdf40aff418f34653eff939..4e0a919b38a76f3acd9b5be459427d877fcbdba9 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 {