From 3c447a321815b2f1e30eb4dd7820149506eeb74d Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Tue, 5 Feb 2013 12:29:46 +1300
Subject: [PATCH] Updating LeftAndMain_Menu template override with latest
 changes

---
 templates/LeftAndMain_Menu.ss | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/templates/LeftAndMain_Menu.ss b/templates/LeftAndMain_Menu.ss
index b6aee2a..168dd90 100644
--- a/templates/LeftAndMain_Menu.ss
+++ b/templates/LeftAndMain_Menu.ss
@@ -1,22 +1,22 @@
 <div class="cms-menu cms-panel cms-panel-layout west" id="cms-menu" data-layout-type="border">
 	<div class="cms-logo-header north">
 		<div class="cms-logo">
-			<a href="http://www.silverstripe.org/" target="_blank" title="SilverStripe (Version - $CMSVersion)">
-				SilverStripe <% if CMSVersion %><abbr class="version">$CMSVersion</abbr><% end_if %>
+			<a href="$ApplicationLink" target="_blank" title="$ApplicationName (Version - $CMSVersion)">
+				$ApplicationName <% if CMSVersion %><abbr class="version">$CMSVersion</abbr><% end_if %>
 			</a>
 			<span><% if SiteConfig %>$SiteConfig.Title<% else %>$ApplicationName<% end_if %></span>
 		</div>
 	
 		<div class="cms-login-status">
-			<a href="Security/logout" class="logout-link" title="<% _t('LOGOUT','Log out') %>"><% _t('LOGOUT','Log out') %></a>
-			<% control CurrentMember %>
+			<a href="Security/logout" class="logout-link" title="<% _t('LeftAndMain_Menu.ss.LOGOUT','Log out') %>"><% _t('LeftAndMain_Menu.ss.LOGOUT','Log out') %></a>
+			<% with CurrentMember %>
 				<span>
-					<% _t('Hello','Hi') %>
+					<% _t('LeftAndMain_Menu.ss.Hello','Hi') %>
 					<a href="{$AbsoluteBaseURL}admin/myprofile" class="profile-link ss-ui-dialog-link" data-popupclass="edit-profile-popup">
 						<% if FirstName && Surname %>$FirstName $Surname<% else_if FirstName %>$FirstName<% else %>$Email<% end_if %>
 					</a>
 				</span>
-			<% end_control %>
+			<% end_with %>
 		</div>
 
 		<div class="cms-login-status subsites">
@@ -26,29 +26,14 @@
 		
 	<div class="cms-panel-content center">
 		<ul class="cms-menu-list">
-		<% control MainMenu %>
-			<li class="$LinkingMode $FirstLast <% if LinkingMode == 'link' %><% else %>opened<% end_if %>" id="Menu-$Code">
+		<% loop MainMenu %>
+			<li class="$LinkingMode $FirstLast <% if LinkingMode == 'link' %><% else %>opened<% end_if %>" id="Menu-$Code" title="$Title.ATT">
 				<a href="$Link" <% if Code == 'Help' %>target="_blank"<% end_if%>>
 					<span class="icon icon-16 icon-{$Code.LowerCase}">&nbsp;</span>
 					<span class="text">$Title</span>
 				</a>
-			
-				<% if Code == 'AssetAdmin' %>
-					<ul>
-						<li class="first <% if Top.class == 'AssetAdmin' %>current<% end_if %>" id="Menu-AssetAdmin">
-							<a href="admin/assets/">
-								<span class="text">Edit &amp; organize</span>
-							</a>
-						</li>
-						<li class="last <% if Top.class == 'CMSFileAddController' %>current<% end_if %>" id="Menu-CMSFileAddController">
-							<a href="admin/assets/add">
-								<span class="text">Add files</span>
-							</a>
-						</li>
-					</ul>
-				<% end_if %>
 			</li>
-		<% end_control %>
+		<% end_loop %>
 		</ul>
 	</div>