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

Moved Freemarker SiteAdminController

Browse source
This commit is contained in:
rjy7 2010-08-31 19:37:23 +00:00
parent f01c2f9c0f
commit 3e06d2849e
3 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
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.FreemarkerSiteAdminController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.SiteAdminController</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>SiteAdminController</servlet-name> <servlet-name>SiteAdminController</servlet-name>

13
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FreemarkerSiteAdminController.java → webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java
View file

@ -1,6 +1,6 @@
/* $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$ */
package edu.cornell.mannlib.vitro.webapp.controller.edit; package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
@ -15,21 +15,16 @@ import edu.cornell.mannlib.vedit.beans.LoginFormBean;
import edu.cornell.mannlib.vedit.util.FormUtils; import edu.cornell.mannlib.vedit.util.FormUtils;
import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route;
import edu.cornell.mannlib.vitro.webapp.controller.login.LoginTemplateHelper; import edu.cornell.mannlib.vitro.webapp.controller.login.LoginTemplateHelper;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
import edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener; import edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener;
import freemarker.template.Configuration; import freemarker.template.Configuration;
public class FreemarkerSiteAdminController extends FreemarkerHttpServlet { public class SiteAdminController extends FreemarkerHttpServlet {
private static final Log log = LogFactory.getLog(FreemarkerSiteAdminController.class); private static final long serialVersionUID = 1L;
private static final Log log = LogFactory.getLog(SiteAdminController.class);
public String getTitle(String siteName) { public String getTitle(String siteName) {
return siteName + " Site Administration"; return siteName + " Site Administration";
} }

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

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