MINOR Moved profile and welcome message to CMSTopMenu instead of bottom bar

This commit is contained in:
Ingo Schommer 2011-03-31 22:21:13 +13:00
parent 982b9bda99
commit f6f658f803
2 changed files with 11 additions and 12 deletions

View File

@ -1,5 +1,15 @@
<div class="logo">
<a href="http://www.silverstripe.org/" target="_blank">SilverStripe</a><br />
<a href="http://www.silverstripe.org/" target="_blank">
SilverStripe <% if CMSVersion %><abbr class="version">$CMSVersion</abbr><% end_if %>
</a>
</div>
<div class="login-status">
<% control CurrentMember %>
<% _t('LOGGEDINAS','Logged in as') %>
<strong><% if FirstName && Surname %>$FirstName $Surname<% else_if FirstName %>$FirstName<% else %>$Email<% end_if %></strong>
<a href="{$AbsoluteBaseURL}admin/myprofile" class="profile-link"><% _t('EDITPROFILE','Profile') %></a>
<a href="Security/logout" class="logout-link"><% _t('LOGOUT','Log out') %></a>
<% end_control %>
</div>
<ul id="MainMenu">
<% control MainMenu %>

View File

@ -37,17 +37,6 @@
<div class="ss-cms-bottom-bar">
<div class="holder">
<div id="logInStatus">
<a href="$ApplicationLink" title="<% _t('SSWEB','Silverstripe Website') %>">$ApplicationName</a>
<% if CMSVersion %>-&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>
<% end_if %>
&nbsp;&nbsp;
<% control CurrentMember %>
<% _t('LOGGEDINAS','Logged in as') %> <strong><% if FirstName && Surname %>$FirstName $Surname<% else_if FirstName %>$FirstName<% else %>$Email<% end_if %></strong> | <a href="{$AbsoluteBaseURL}admin/myprofile" id="EditMemberProfile"><% _t('EDITPROFILE','Profile') %></a> | <a href="Security/logout" id="LogoutLink"><% _t('LOGOUT','Log out') %></a>
<% end_control %>
</div>
<div id="switchView" class="bottomTabs">
<% if ShowSwitchView %>
<div class="blank"> <% _t('VIEWPAGEIN','Page view:') %> </div>