From 4ac0aabae1c4934fd7dbba7922e02e51bec69f73 Mon Sep 17 00:00:00 2001
From: tworrall <tworrall@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 10 Jul 2012 18:55:33 +0000
Subject: [PATCH] merging 4225 to the trunk

---
 themes/wilma/templates/identity.ftl | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/themes/wilma/templates/identity.ftl b/themes/wilma/templates/identity.ftl
index a768e190..70ae1f51 100644
--- a/themes/wilma/templates/identity.ftl
+++ b/themes/wilma/templates/identity.ftl
@@ -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>
-                <#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>
+                <#-- 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>