merging 4225 to the trunk

This commit is contained in:
tworrall 2012-07-10 18:55:33 +00:00
parent e38f5cc8c7
commit 4ac0aabae1

View file

@ -11,9 +11,14 @@
<ul id="header-nav" role="list">
<li role="listitem"><a href="${urls.index}" title="index">Index</a></li>
<#if user.loggedIn>
<#-- COMMENTING OUT THE EDIT PAGE LINK FOR RELEASE 1.5. WE NEED TO IMPLEMENT THIS IN A MORE
USER FRIENDLY WAY. PERHAPS INCLUDE A LINK ON THE PAGES THEMSELVES AND DISPLAY IF THE
USER IS A SITE ADMIN. tlw72
<#if (page??) && (page?is_hash || page?is_hash_ex) && (page.URLToEditPage??) >
<li role="listitem"><a href="${page.URLToEditPage}" title="edit page">Edit Page</a></li>
</#if>
-->
<#if user.hasSiteAdminAccess>
<li role="listitem"><a href="${urls.siteAdmin}" title="site admin">Site Admin</a></li>
</#if>