From b6bff63b108faf6f0ff1b6be21ed52ce41561e11 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Sun, 11 Nov 2007 02:43:23 +0000
Subject: [PATCH] Styling, and tweak to show logged in user even if first name
 doesn't exist

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44572 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 css/layout.css           | 14 ++++++--------
 templates/LeftAndMain.ss |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

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 @@
 			<a href="http://www.silverstripe.com" title="<% _t('SSWEB','Silverstripe Website') %>">SilverStripe CMS</a>&nbsp;-&nbsp;
 			<abbr style="border-style: none" title="<% _t('APPVERSIONTEXT1',"This is the") %> $ApplicationName <% _t('APPVERSIONTEXT2',"version that you are currently running, technically it's the CVS branch") %>">$CMSVersion</abbr> &nbsp; &nbsp; &nbsp; 
 			<% control CurrentMember %>
-			<% _t('LOGGEDINAS','Logged in as') %> <strong>$FirstName $Surname</strong> | <a href="{$BaseHref}admin/myprofile" id="EditMemberProfile"><% _t('EDITPROFILE','Profile') %></a> | <a href="Security/logout" id="LogoutLink"><% _t('LOGOUT','log out') %></a>
+			<% _t('LOGGEDINAS','Logged in as') %> <strong><% if FirstName && Surname %>$FirstName $Surname<% else_if FirstName %>$FirstName<% else %>$Email<% end_if %></strong> | <a href="{$BaseHref}admin/myprofile" id="EditMemberProfile"><% _t('EDITPROFILE','Profile') %></a> | <a href="Security/logout" id="LogoutLink"><% _t('LOGOUT','log out') %></a>
 		<% end_control %>
 		</div>