diff --git a/css/layout.css b/css/layout.css
index b7de97e1..02802052 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -270,16 +270,13 @@ body.stillLoading select {
#bottom #logInStatus {
float: right;
}
- #bottom #logInStatus a,
- #bottom #logInStatus a:hover {
+ #bottom a {
color: #fff;
background: none;
}
- #bottom #logInStatus a {
- text-decoration: underline;
- }
- #bottom #logInStatus a:hover {
+ #bottom a:hover {
text-decoration: none;
+ color: #ccc;
}
#bottom #logInStatus #LogoutLink {
background: url(../images/logout.gif) no-repeat right top;
@@ -309,10 +306,11 @@ body.stillLoading select {
padding-left: 2px;
color: #fff;
}
-#bottom .bottomTabs a.current {
- cursor: auto;
+#bottom .bottomTabs .current {
+ color: #ccc;
}
#bottom .bottomTabs a:hover {
+ color: #ccc;
text-decoration: none;
}
diff --git a/templates/LeftAndMain.ss b/templates/LeftAndMain.ss
index 48fc8171..b8ce3d74 100644
--- a/templates/LeftAndMain.ss
+++ b/templates/LeftAndMain.ss
@@ -47,7 +47,7 @@
SilverStripe CMS -
$ApplicationName <% _t('APPVERSIONTEXT2',"version that you are currently running, technically it's the CVS branch") %>">$CMSVersion
<% control CurrentMember %>
- <% _t('LOGGEDINAS','Logged in as') %> $FirstName $Surname | <% _t('EDITPROFILE','Profile') %> | <% _t('LOGOUT','log out') %>
+ <% _t('LOGGEDINAS','Logged in as') %> <% if FirstName && Surname %>$FirstName $Surname<% else_if FirstName %>$FirstName<% else %>$Email<% end_if %> | <% _t('EDITPROFILE','Profile') %> | <% _t('LOGOUT','log out') %>
<% end_control %>