From 849ea3a2011db041df7a0ba2e044b9cf66174087 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 31 Aug 2010 18:33:51 +0000
Subject: [PATCH] Finalized Freemarker version of main site admin page.

---
 webapp/config/web.xml                            | 15 +--------------
 .../edit/FreemarkerSiteAdminController.java      | 12 ++++++++++--
 .../web/templates/edit/specific/upload_rdf.jsp   |  2 ++
 .../siteAdmin/siteAdmin-advancedDataTools.ftl    | 16 +++++++++++++++-
 .../freemarker/body/siteAdmin/siteAdmin-main.ftl |  1 +
 .../body/siteAdmin/siteAdmin-ontologyEditor.ftl  | 10 ++++++----
 6 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/webapp/config/web.xml b/webapp/config/web.xml
index f828f78b1..4ec23ddca 100644
--- a/webapp/config/web.xml
+++ b/webapp/config/web.xml
@@ -342,7 +342,7 @@
 
   <servlet>
     <servlet-name>SiteAdminController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.SiteAdminController</servlet-class>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.FreemarkerSiteAdminController</servlet-class>
   </servlet>
   <servlet-mapping>
     <servlet-name>SiteAdminController</servlet-name>
@@ -352,19 +352,6 @@
     <servlet-name>SiteAdminController</servlet-name>
     <url-pattern>/siteAdmin.jsp</url-pattern>
   </servlet-mapping>
-  
-  <servlet>
-    <servlet-name>FmSiteAdminController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.FreemarkerSiteAdminController</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>FmSiteAdminController</servlet-name>
-    <url-pattern>/fm-siteAdmin</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>FmSiteAdminController</servlet-name>
-    <url-pattern>/fm-siteAdmin.jsp</url-pattern>
-  </servlet-mapping>
 
   <servlet>
     <servlet-name>ImageUploadController</servlet-name>
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FreemarkerSiteAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FreemarkerSiteAdminController.java
index 877fdb394..1f8eaf1a7 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FreemarkerSiteAdminController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FreemarkerSiteAdminController.java
@@ -63,7 +63,7 @@ public class FreemarkerSiteAdminController extends FreemarkerHttpServlet {
                     body.put("ontologyEditor", getOntologyEditorData(vreq, urlBuilder));
                     
                     if (securityLevel >= LoginFormBean.DBA) {
-                        body.put("dataTools", getDataToolsData(vreq));
+                        body.put("dataTools", getDataToolsData(vreq, urlBuilder));
                         
                         // Only for DataStar. Should handle without needing a DataStar-specific version of this controller.
                         //body.put("customReports", getCustomReportsData(vreq));
@@ -180,9 +180,17 @@ public class FreemarkerSiteAdminController extends FreemarkerHttpServlet {
         return map;
     }
 
-    private Map<String, Object> getDataToolsData(VitroRequest vreq) {
+    private Map<String, Object> getDataToolsData(VitroRequest vreq, UrlBuilder urlBuilder) {
 
         Map<String, Object> map = new HashMap<String, Object>();
+        
+        Map<String, String> urls = new HashMap<String, String>();
+        urls.put("ingest", urlBuilder.getUrl("/ingest"));
+        urls.put("rdfData", urlBuilder.getPortalUrl("/uploadRDFForm"));
+        urls.put("rdfExport", urlBuilder.getPortalUrl("/export"));
+        urls.put("sparqlQuery", urlBuilder.getUrl("/admin/sparqlquery"));        
+        map.put("urls", urls);
+        
         return map;
     }
 
diff --git a/webapp/web/templates/edit/specific/upload_rdf.jsp b/webapp/web/templates/edit/specific/upload_rdf.jsp
index 0666fd680..60be0e433 100644
--- a/webapp/web/templates/edit/specific/upload_rdf.jsp
+++ b/webapp/web/templates/edit/specific/upload_rdf.jsp
@@ -5,6 +5,8 @@
 
 <div class="staticPageBackground">
 
+<h2>Add or Remove RDF Data</h2>
+
 <form action="uploadRDF" method="post"  enctype="multipart/form-data" >
 
 <c:if test="${!empty param.errMsg}">       
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-advancedDataTools.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-advancedDataTools.ftl
index 97f2d1114..102899452 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-advancedDataTools.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-advancedDataTools.ftl
@@ -1,3 +1,17 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<#-- Template for Site Administration Advanced Data Tools -->
\ No newline at end of file
+<#-- Template for Site Administration advanced data tools panel -->
+
+<#if dataTools??>
+    <div class="pageBodyGroup">
+    
+        <h3>Advanced Data Tools</h3>
+        
+        <ul>
+            <li><a href="${dataTools.urls.ingest}">Ingest tools</a></li>   
+            <li><a href="${dataTools.urls.rdfData}">Add/Remove RDF data</a></li>
+            <li><a href="${dataTools.urls.rdfExport}">RDF export</a></li>
+            <li><a href="${dataTools.urls.sparqlQuery}">SPARQL query</a></li>        
+        </ul>
+    </div>
+</#if>
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-main.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-main.ftl
index f696e83c4..e24c92ad1 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-main.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-main.ftl
@@ -7,6 +7,7 @@
 </div>
 
 <div id="adminDashboard">
+<p>fm</p>
     <#include "login-main.ftl">
     <#include "siteAdmin-dataInput.ftl">
     <#include "siteAdmin-siteConfiguration.ftl">
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
index c4a4bcdc7..506a4326f 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
@@ -8,10 +8,12 @@
         <h3>Ontology Editor</h3>
         
         <#if ontologyEditor.pellet??>
-            <p>${ontologyEditor.pellet.error}</p>
-            <#if ontologyEditor.pellet.explanation??>
-                <p>${ontologyEditor.pellet.explanation}</p>
-            </#if>
+            <div class="notice">
+                <p>${ontologyEditor.pellet.error}</p>
+                <#if ontologyEditor.pellet.explanation??>
+                    <p>Cause: ${ontologyEditor.pellet.explanation}</p>
+                </#if>
+            </div>
         </#if>
         
         <ul>