From 22575dc3e20bb24961751951d8d8d71062cfdea5 Mon Sep 17 00:00:00 2001
From: bdc34 <bdc34@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 16 Dec 2010 20:11:29 +0000
Subject: [PATCH] Adding N3 menu editing to the site admin page.

---
 webapp/config/web.xml                                       | 2 +-
 .../webapp/controller/freemarker/SiteAdminController.java   | 4 ++++
 webapp/web/templates/freemarker/body/menuN3Edit.ftl         | 2 +-
 .../body/siteAdmin/siteAdmin-siteConfiguration.ftl          | 6 +++++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/webapp/config/web.xml b/webapp/config/web.xml
index 959473ae0..c2c199abd 100644
--- a/webapp/config/web.xml
+++ b/webapp/config/web.xml
@@ -326,7 +326,7 @@
   </servlet>
   <servlet-mapping>
     <servlet-name>MenuN3EditController</servlet-name>
-    <url-pattern>/MenuN3EditController</url-pattern>
+    <url-pattern>/menuN3Editor</url-pattern>
   </servlet-mapping>
 
 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java
index 24f2c75af..4fdf38612 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java
@@ -119,6 +119,10 @@ public class SiteAdminController extends FreemarkerHttpServlet {
         }
  
         urls.put("siteInfo", urlBuilder.getPortalUrl("/editForm", new ParamMap("controller", "Portal", "id", String.valueOf(urlBuilder.getPortalId()))));  
+
+        if (LoginStatusBean.getBean(vreq).isLoggedInAtLeast(LoginStatusBean.DBA)) {
+            urls.put("menuN3Editor", urlBuilder.getPortalUrl("/menuN3Editor"));            
+        }
         
         map.put("urls", urls);
         
diff --git a/webapp/web/templates/freemarker/body/menuN3Edit.ftl b/webapp/web/templates/freemarker/body/menuN3Edit.ftl
index a5b449bfc..a27b177e3 100644
--- a/webapp/web/templates/freemarker/body/menuN3Edit.ftl
+++ b/webapp/web/templates/freemarker/body/menuN3Edit.ftl
@@ -15,7 +15,7 @@
     </#if>
     
     <#if menuN3??>
-    <form class="" action="${urls.base}/MenuN3EditController" method="post">
+    <form class="" action="${urls.base}/${currentPage}" method="post">
       <label for="navigatioN3"></label>
       <textarea name="navigationN3" id="textarea" cols="45" rows="40">
       ${menuN3}
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
index 7b7d0b542..0d91fe902 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
@@ -20,7 +20,11 @@
             <#if siteConfig.urls.users??>
                 <li><a href="${siteConfig.urls.users}">User accounts</a></li>  
             </#if>
-        
+                
+            <#if siteConfig.urls.menuN3Editor??>
+                <li><a href="${siteConfig.urls.menuN3Editor}">Menu N3 editor</a></li>  
+            </#if>
+            
         </ul>
     </div>
 </#if>
\ No newline at end of file