From 5bb4b7794f519f0229af1ca71ec2e86a36c17602 Mon Sep 17 00:00:00 2001 From: nac26 Date: Mon, 4 Oct 2010 23:39:05 +0000 Subject: [PATCH] Merge r1445 from rel-1.1-maint branch. Moving footer.jsp, identity.jsp, and menu.jsp to vitro core (were temporarily in vivo/productMods) so they are not tied to vivo-basic and can be used by any theme. --- productMods/templates/page/basicPage.jsp | 76 --------------------- productMods/templates/page/jsp/footer.jsp | 16 ----- productMods/templates/page/jsp/identity.jsp | 11 --- productMods/templates/page/jsp/menu.jsp | 22 ------ themes/vivo-basic/css/institution.css | 2 +- 5 files changed, 1 insertion(+), 126 deletions(-) delete mode 100644 productMods/templates/page/basicPage.jsp delete mode 100644 productMods/templates/page/jsp/footer.jsp delete mode 100644 productMods/templates/page/jsp/identity.jsp delete mode 100644 productMods/templates/page/jsp/menu.jsp diff --git a/productMods/templates/page/basicPage.jsp b/productMods/templates/page/basicPage.jsp deleted file mode 100644 index aa7d0cdc..00000000 --- a/productMods/templates/page/basicPage.jsp +++ /dev/null @@ -1,76 +0,0 @@ -<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> - -<%@ page import="edu.cornell.mannlib.vitro.webapp.web.*" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> -<%@ page errorPage="/error.jsp"%> -<%@ page contentType="text/html; charset=UTF-8"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %> - -<% /*********************************************** - Display a single Page in the most basic fashion. - The html is generated followed by the banners and menu. - After that the result of the jsp in the attribute bodyJsp is inserted. - Finally comes the footer. - - request.attributes: - "bodyJsp" - jsp of the body of this page. - "title" - title of page - "css" - optional additional css for page - "scripts" - optional name of file containing