litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Finalized Freemarker version of main site admin page.

Browse source
This commit is contained in:
rjy7 2010-08-31 18:33:51 +00:00
parent a79d4067a6
commit 849ea3a201
6 changed files with 35 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

15
webapp/config/web.xml
View file

@ -342,7 +342,7 @@
<servlet> <servlet>
<servlet-name>SiteAdminController</servlet-name> <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>
<servlet-mapping> <servlet-mapping>
<servlet-name>SiteAdminController</servlet-name> <servlet-name>SiteAdminController</servlet-name>
@ -353,19 +353,6 @@
<url-pattern>/siteAdmin.jsp</url-pattern> <url-pattern>/siteAdmin.jsp</url-pattern>
</servlet-mapping> </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>
<servlet-name>ImageUploadController</servlet-name> <servlet-name>ImageUploadController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController</servlet-class>

12
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FreemarkerSiteAdminController.java
View file

@ -63,7 +63,7 @@ public class FreemarkerSiteAdminController extends FreemarkerHttpServlet {
body.put("ontologyEditor", getOntologyEditorData(vreq, urlBuilder)); body.put("ontologyEditor", getOntologyEditorData(vreq, urlBuilder));
if (securityLevel >= LoginFormBean.DBA) { 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. // Only for DataStar. Should handle without needing a DataStar-specific version of this controller.
//body.put("customReports", getCustomReportsData(vreq)); //body.put("customReports", getCustomReportsData(vreq));
@ -180,9 +180,17 @@ public class FreemarkerSiteAdminController extends FreemarkerHttpServlet {
return map; 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, 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; return map;
} }

2
webapp/web/templates/edit/specific/upload_rdf.jsp
View file

@ -5,6 +5,8 @@
<div class="staticPageBackground"> <div class="staticPageBackground">
<h2>Add or Remove RDF Data</h2>
<form action="uploadRDF" method="post" enctype="multipart/form-data" > <form action="uploadRDF" method="post" enctype="multipart/form-data" >
<c:if test="${!empty param.errMsg}"> <c:if test="${!empty param.errMsg}">

16
webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-advancedDataTools.ftl
View file

@ -1,3 +1,17 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Template for Site Administration Advanced Data Tools --> <#-- 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>

1
webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-main.ftl
View file

@ -7,6 +7,7 @@
</div> </div>
<div id="adminDashboard"> <div id="adminDashboard">
<p>fm</p>
<#include "login-main.ftl"> <#include "login-main.ftl">
<#include "siteAdmin-dataInput.ftl"> <#include "siteAdmin-dataInput.ftl">
<#include "siteAdmin-siteConfiguration.ftl"> <#include "siteAdmin-siteConfiguration.ftl">

4
webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
View file

@ -8,10 +8,12 @@
<h3>Ontology Editor</h3> <h3>Ontology Editor</h3>
<#if ontologyEditor.pellet??> <#if ontologyEditor.pellet??>
<div class="notice">
<p>${ontologyEditor.pellet.error}</p> <p>${ontologyEditor.pellet.error}</p>
<#if ontologyEditor.pellet.explanation??> <#if ontologyEditor.pellet.explanation??>
<p>${ontologyEditor.pellet.explanation}</p> <p>Cause: ${ontologyEditor.pellet.explanation}</p>
</#if> </#if>
</div>
</#if> </#if>
<ul> <ul>