litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2588: Added ${user.firstName} to user menu, and reduced space between links in header nav.

Browse source
This commit is contained in:
manolobevia 2011-06-14 20:30:33 +00:00
parent a1f956b38b
commit 162bb92005
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
themes/wilma/css/wilma.css
View file

@ -420,8 +420,8 @@ ul#header-nav {
ul#header-nav li { ul#header-nav li {
float: left; float: left;
display: block; display: block;
padding-left: 20px; padding-left: 10px;
padding-right: 20px; padding-right: 10px;
border-right: 1px solid #7c7d7f; border-right: 1px solid #7c7d7f;
font-size: .7em; font-size: .7em;
color: #fff; color: #fff;
@ -430,7 +430,7 @@ ul#header-nav li.last {
border-right: none; border-right: none;
} }
ul#header-nav li:last-child { ul#header-nav li:last-child {
padding-left: 10px; padding-left: 1px;
padding-right: 0; padding-right: 0;
border-right: none; border-right: none;
} }
@ -442,10 +442,13 @@ ul#header-nav a:visited {
text-decoration: none text-decoration: none
} }
ul#header-nav a:hover, ul#header-nav a:hover,
ul#header-nav a:active { ul#header-nav a:active {
text-decoration: none; text-decoration: none;
color: #999; color: #999;
} }
ul#header-nav a.log-out {
padding-left: 10px;
}
/* SEARCH ------> */ /* SEARCH ------> */
#search { #search {
position: absolute; position: absolute;
@ -1573,11 +1576,10 @@ form.customForm p.note{
/* EDIT ACCOUNT ------> */ /* EDIT ACCOUNT ------> */
#edit-account p.note { #edit-account p.note {
margin-top: 3px; margin-top: 3px;
width: 400px;
} }
/* MY ACCOUNT ------> */ /* MY ACCOUNT ------> */
#my-account p.note { #my-account p.note {
margin-top: 0;
padding-top: 0;
padding-bottom: 10px; padding-bottom: 10px;
} }
/* RESET PASSWORD ------> */ /* RESET PASSWORD ------> */
@ -1612,7 +1614,6 @@ ul.dropdown li#user-menu:hover {
color: #000 !important; color: #000 !important;
position: relative; position: relative;
background: #fff url(../images/arrow-down-account.gif) right 9px no-repeat; background: #fff url(../images/arrow-down-account.gif) right 9px no-repeat;
padding-right: 10px;
border-bottom: 1px solid #cdcfcf; border-bottom: 1px solid #cdcfcf;
} }
ul.dropdown li.hover a, ul.dropdown li.hover a,

4
themes/wilma/templates/identity.ftl
View file

@ -16,7 +16,7 @@
</#if> </#if>
<li> <li>
<ul class="dropdown"> <ul class="dropdown">
<li id="user-menu"><a href="#">${user.loginName}</a> <li id="user-menu"><a href="#">${user.firstName}</a>
<ul class="sub_menu"> <ul class="sub_menu">
<li role="listitem" class="inactive">My profile</li> <li role="listitem" class="inactive">My profile</li>
<li role="listitem"><a href="${urls.myAccount}">My account</a></li> <li role="listitem"><a href="${urls.myAccount}">My account</a></li>
@ -29,7 +29,7 @@
${scripts.add('<script type="text/javascript" src="${urls.base}/js/userMenu/userMenuUtils.js"></script>')} ${scripts.add('<script type="text/javascript" src="${urls.base}/js/userMenu/userMenuUtils.js"></script>')}
<#else> <#else>
<li role="listitem"><a title="log in to manage this site" href="${urls.login}">Log in</a></li> <li role="listitem"><a class="log-out" title="log in to manage this site" href="${urls.login}">Log in</a></li>
</#if> </#if>
</ul> </ul>