Mercurial > kallithea
changeset 3206:d4bb8de7382f beta
top menu: show user menu when hovering instead of using js - like other menus
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 23 Jan 2013 20:26:34 +0100 |
parents | f01540c62f8a |
children | b9de46161c96 |
files | rhodecode/public/css/style.css rhodecode/templates/base/base.html rhodecode/templates/base/root.html |
diffstat | 3 files changed, 8 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/public/css/style.css Wed Jan 23 20:26:34 2013 +0100 +++ b/rhodecode/public/css/style.css Wed Jan 23 20:26:34 2013 +0100 @@ -2092,9 +2092,9 @@ } #quick_login{ min-height: 80px; - margin: 37px 0 0 -280px; padding: 4px; position: absolute; + right: 0; width: 278px; background-color: #003B76; background-repeat: repeat-x; @@ -3665,6 +3665,7 @@ float: left; } +#header #header-inner #quick li #quick_login, #header #header-inner #quick li:hover ul ul, #header #header-inner #quick li:hover ul ul ul, #header #header-inner #quick li:hover ul ul ul ul, @@ -3673,6 +3674,7 @@ display: none; } +#header #header-inner #quick li:hover #quick_login, #header #header-inner #quick li:hover ul,#header #header-inner #quick li li:hover ul,#header #header-inner #quick li li li:hover ul,#header #header-inner #quick li li li li:hover ul,#content #left #menu ul.opened,#content #left #menu li ul.expanded { display: block;
--- a/rhodecode/templates/base/base.html Wed Jan 23 20:26:34 2013 +0100 +++ b/rhodecode/templates/base/base.html Wed Jan 23 20:26:34 2013 +0100 @@ -61,6 +61,7 @@ </%def> <%def name="usermenu()"> + ## USER MENU <li> <a class="menu_link" id="quick_login_link"> <span class="icon" style="background-image:url(${h.gravatar_url(c.rhodecode_user.email,16)}); background-repeat:no-repeat; background-position:center; "> @@ -76,10 +77,9 @@ %endif </span> </a> - </li> <div class="user-menu"> - <div id="quick_login" style="display:none"> + <div id="quick_login"> %if c.rhodecode_user.username == 'default': <h4>${_('Login to your account')}</h4> ${h.form(h.url('login_home',came_from=h.url.current()))} @@ -134,7 +134,9 @@ </div> %endif </div> - </div> + </div> + + </li> </%def> <%def name="menu(current=None)">
--- a/rhodecode/templates/base/root.html Wed Jan 23 20:26:34 2013 +0100 +++ b/rhodecode/templates/base/root.html Wed Jan 23 20:26:34 2013 +0100 @@ -80,24 +80,6 @@ tooltip_activate(); show_more_event(); show_changeset_tooltip(); - - YUE.on('quick_login_link','click',function(e){ - // make sure we don't redirect - YUE.preventDefault(e); - - if(YUD.hasClass('quick_login_link','enabled')){ - YUD.setStyle('quick_login','display','none'); - YUD.removeClass('quick_login_link','enabled'); - } - else{ - YUD.setStyle('quick_login','display',''); - YUD.addClass('quick_login_link','enabled'); - var usr = YUD.get('username'); - if(usr){ - usr.focus(); - } - } - }); }) </script> </%def>