mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
MINOR Moved profile and welcome message to CMSTopMenu instead of bottom bar
This commit is contained in:
parent
982b9bda99
commit
f6f658f803
@ -1,5 +1,15 @@
|
|||||||
<div class="logo">
|
<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>
|
</div>
|
||||||
<ul id="MainMenu">
|
<ul id="MainMenu">
|
||||||
<% control MainMenu %>
|
<% control MainMenu %>
|
||||||
|
@ -37,17 +37,6 @@
|
|||||||
|
|
||||||
<div class="ss-cms-bottom-bar">
|
<div class="ss-cms-bottom-bar">
|
||||||
<div class="holder">
|
<div class="holder">
|
||||||
<div id="logInStatus">
|
|
||||||
<a href="$ApplicationLink" title="<% _t('SSWEB','Silverstripe Website') %>">$ApplicationName</a>
|
|
||||||
<% if CMSVersion %>-
|
|
||||||
<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 %>
|
|
||||||
|
|
||||||
<% 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">
|
<div id="switchView" class="bottomTabs">
|
||||||
<% if ShowSwitchView %>
|
<% if ShowSwitchView %>
|
||||||
<div class="blank"> <% _t('VIEWPAGEIN','Page view:') %> </div>
|
<div class="blank"> <% _t('VIEWPAGEIN','Page view:') %> </div>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user