From 92e4b4fc5bf203ce523f355108d1caed9f1538eb Mon Sep 17 00:00:00 2001
From: Naomi Guyer <naomi@silverstripe.com>
Date: Tue, 23 Oct 2012 09:55:08 +1300
Subject: [PATCH] Remove sub navigation for "Files" (fixes 7956)

Backport from master. Fixes display issues with expanded,
unselected submenus ... by removing them.
They're strictly not necessary since both "list" and "add"
modes can be reached through the default AssetAdmin UI.
---
 admin/templates/Includes/LeftAndMain_Menu.ss | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/admin/templates/Includes/LeftAndMain_Menu.ss b/admin/templates/Includes/LeftAndMain_Menu.ss
index 469bb40a9..3fa8cef9b 100644
--- a/admin/templates/Includes/LeftAndMain_Menu.ss
+++ b/admin/templates/Includes/LeftAndMain_Menu.ss
@@ -27,22 +27,7 @@
 				<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"><% _t('AssetAdmin.EditOrgMenu', '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"><% _t('AssetAdmin.ADDFILES', 'Add files') %></span>
-							</a>
-						</li>
-					</ul>
-				<% end_if %>
+				</a>			
 			</li>
 		<% end_loop %>
 		</ul>