diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/SiteAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/SiteAdminController.java index c1d645d60..4c8afc202 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/SiteAdminController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/SiteAdminController.java @@ -1,5 +1,5 @@ -/* $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; import java.util.HashMap; @@ -80,7 +80,7 @@ public class SiteAdminController extends BaseEditController { RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); request.setAttribute("bodyJsp","/siteAdmin/siteAdminMain.jsp"); - request.setAttribute("scripts","/siteAdmin/siteAdminScripts.jsp"); + request.setAttribute("scripts","/siteAdmin/siteAdminHeadContent.jsp"); request.setAttribute("title",((Portal)request.getAttribute("portalBean")).getAppName() + " Site Administration"); request.setAttribute("epoKey",epo.getKey()); try { diff --git a/webapp/web/siteAdmin/loginForm.jsp b/webapp/web/siteAdmin/loginForm.jsp index c5754a7ea..d824b2f55 100644 --- a/webapp/web/siteAdmin/loginForm.jsp +++ b/webapp/web/siteAdmin/loginForm.jsp @@ -9,7 +9,4 @@ String themeDir = new VitroRequest(request).getPortal().getThemeDir().replaceAll("/$", ""); %> - - -<%= new LoginTemplateHelper(request).showLoginPage(request) %> - +<%= new LoginTemplateHelper(request).showLoginPage(request) %> \ No newline at end of file diff --git a/webapp/web/siteAdmin/siteAdminHeadContent.jsp b/webapp/web/siteAdmin/siteAdminHeadContent.jsp new file mode 100644 index 000000000..ab2700bad --- /dev/null +++ b/webapp/web/siteAdmin/siteAdminHeadContent.jsp @@ -0,0 +1,15 @@ +<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> + +<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.User" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> + + + + + + + + + + \ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/login/login-forcedPasswordChange.ftl b/webapp/web/templates/freemarker/body/login/login-forcedPasswordChange.ftl index d8aa5de77..b83d18fb2 100644 --- a/webapp/web/templates/freemarker/body/login/login-forcedPasswordChange.ftl +++ b/webapp/web/templates/freemarker/body/login/login-forcedPasswordChange.ftl @@ -2,8 +2,6 @@ <#-- Log in template for accessing site admin --> -${stylesheets.addFromTheme("/login.css")} -${stylesheets.addFromTheme("/formedit.css")}

Create Your New Password