# HG changeset patch # User Mads Kiilerich # Date 2013-01-23 19:26:34 # Node ID f01540c62f8a3d6b6a6529ce8f4923653c5ff49c # Parent 06cdedbc6ef9b8b3df4658079b646ce147dde7de top menu: show user menu as a menu option like others, now also with login name A minor regression: the message count is not clickable ... but it was hard to hit, and somewhat confusing that different parts of the icon meant different things. The new html/css will probably need some review and cross platform testing. diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css --- a/rhodecode/public/css/style.css +++ b/rhodecode/public/css/style.css @@ -453,6 +453,8 @@ div:hover > a.permalink { border-left: none; border-right: 1px solid #2e5c89; padding: 8px 6px 4px; + min-width: 16px; + min-height: 16px; } #header #header-inner #quick li span.icon_short { @@ -2090,7 +2092,7 @@ a.metatag[tag="license"]:hover { } #quick_login{ min-height: 80px; - margin: 37px 0 0 -251px; + margin: 37px 0 0 -280px; padding: 4px; position: absolute; width: 278px; @@ -4528,30 +4530,18 @@ form.comment-inline-form { float: left; } -.notifications{ - border-radius: 4px 4px 4px 4px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - float: right; - margin: 20px 0px 0px 0px; - position: absolute; - text-align: center; - width: 26px; - z-index: 1000; -} -.notifications a{ +.notifications { + padding: 2px 7px !important; + margin: 7px -4px -7px 4px !important; + text-align: center; color:#888 !important; - display: block; font-size: 10px; background-color: #DEDEDE !important; - border-radius: 2px !important; - -webkit-border-radius: 2px !important; - -moz-border-radius: 2px !important; -} -.notifications a:hover{ - text-decoration: none !important; - background-color: #EEEFFF !important; -} + border-radius: 4px !important; + -webkit-border-radius: 4px !important; + -moz-border-radius: 4px !important; +} + .notification-header{ padding-top:6px; } diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html --- a/rhodecode/templates/base/base.html +++ b/rhodecode/templates/base/base.html @@ -61,17 +61,24 @@ <%def name="usermenu()"> +
  • + + + %if c.rhodecode_user.username != 'default' and c.unread_notifications != -1: + ${c.unread_notifications} + %endif + + + %if c.rhodecode_user.username != 'default': + ${c.rhodecode_user.username} + %else: + ${_('Not logged in')} + %endif + + +
  • +
    -
    - - %if c.rhodecode_user.username != 'default' and c.unread_notifications != 0: - - %endif -