From 7ab29414f85f95995500cab9800ae5002cf85229 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 27 Sep 2007 21:16:23 +0000
Subject: [PATCH] BUGFIX: Changed language-dropdown to normal dropdown-field
 (wasn't selecting the right languages) FEATURE: Added "profile"-popup with
 Member_ProfileForm (see r42730)

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

diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js
index aa55d739..d7be14d0 100644
--- a/javascript/LeftAndMain.js
+++ b/javascript/LeftAndMain.js
@@ -99,9 +99,17 @@ Behaviour.register({
 			w.focus();
 			return false;
 		}
+	},
+	
+	'#EditMemberProfile': {
+		onclick: function(e) {
+			var el = Event.element(e);
+			GB_show('Edit Profile', el.attributes.href.value, ComplexTableField.prototype.popupHeight, ComplexTableField.prototype.popupWidth);
+			Event.stop(e);
+		}
 	}
 
-})
+});
 
 
 
diff --git a/templates/LeftAndMain.ss b/templates/LeftAndMain.ss
index 150f0d0f..8473fe16 100644
--- a/templates/LeftAndMain.ss
+++ b/templates/LeftAndMain.ss
@@ -39,7 +39,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') %> $FirstName $Surname - <a href="Security/logout"><% _t('LOGOUT','log out') %></a>
+			<% _t('LOGGEDINAS','Logged in as') %> $FirstName $Surname - <a href="{$BaseHref}admin/myprofile" id="EditMemberProfile"><% _t('EDITPROFILE') %></a> - <a href="Security/logout"><% _t('LOGOUT','log out') %></a>
 		<% end_control %>
 		</div>