Merge remote branch 'origin/master' into translation-staging

This commit is contained in:
TeamCity 2012-10-23 21:05:50 +13:00
commit a97ba7168d

View File

@ -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>