From 82343f63a382a4c00a4b2a049976e5617c575f76 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 4 Feb 2010 16:13:03 +0000
Subject: [PATCH] Removed unneeded taglib directive from about.js. Removed vivo
 cornell clone headContent.js because it should be the same as the vitro core
 file. Cleaned up the latter.

---
 webapp/web/about.jsp                      |  2 --
 webapp/web/templates/page/headContent.jsp | 31 +++++------------------
 2 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/webapp/web/about.jsp b/webapp/web/about.jsp
index f5179398c..63a3f0264 100644
--- a/webapp/web/about.jsp
+++ b/webapp/web/about.jsp
@@ -1,7 +1,5 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
 <div id="content">
 
     <h2>${title}</h2>
diff --git a/webapp/web/templates/page/headContent.jsp b/webapp/web/templates/page/headContent.jsp
index ec30baab1..f99b1e20e 100644
--- a/webapp/web/templates/page/headContent.jsp
+++ b/webapp/web/templates/page/headContent.jsp
@@ -9,44 +9,27 @@
 <%@ page import="org.apache.commons.logging.Log" %>
 <%@ page import="org.apache.commons.logging.LogFactory" %>
 <%! 
-public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.templates.page.headContent.jsp");
+  public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.templates.page.headContent.jsp");
 %>
 <%
   VitroRequest vreq = new VitroRequest(request);  
   Portal portal = vreq.getPortal();
   
   String themeDir = portal != null ? portal.getThemeDir() : Portal.DEFAULT_THEME_DIR_FROM_CONTEXT;
-  themeDir = request.getContextPath() + '/' + themeDir; 
-  
+  themeDir = vreq.getContextPath() + '/' + themeDir;   
 %>
+
 <!-- headContent.jsp -->
+
 <link rel="stylesheet" type="text/css" href="<%=themeDir%>css/screen.css" media="screen"/>
 <link rel="stylesheet" type="text/css" href="<%=themeDir%>css/print.css" media="print"/>
 
-<%-- <c:url var="jqueryPath" value="/js/jquery.js"/>
-<script type="text/javascript" src="${jqueryPath}"></script> --%>
-
+<%-- This should be a non-theme-specific stylesheet --%>
 <link rel="stylesheet" type="text/css" href="<%=themeDir%>css/edit.css"/>
+
 <title><c:out value="${requestScope.title}"/></title>
-<%
-// nac26 080424: the following line should only be uncommented for PHILLIPS (vivo.cornell.edu) to ensure we're only tracking stats on the live site
-// <script type="text/javascript" src="http://vivostats.mannlib.cornell.edu/?js"></script>
-%>
+
 <c:if test="${!empty scripts}"><jsp:include page="${scripts}"/></c:if>
 
-<%-- 
-mw542 021009: Brian C said this was ignoring the catch tags throwing exceptions. we should find a better way to include css/js anyway
-
-<c:set var="customJsp"><c:out value="${requestScope.bodyJsp}" default="/debug.jsp"/></c:set>
-<c:set var="customHeadJsp">
-    <c:if test="${fn:substringAfter(customJsp,'.jsp') == ''}">${fn:substringBefore(customJsp,'.jsp')}${"Head.jsp"}</c:if>
-</c:set>
-<c:if test="${customJsp != '/debug.jsp' && customHeadJsp != ''}">
-    <c:catch var="fileCheck">
-        <c:import url="${customHeadJsp}"/>
-    </c:catch>
-</c:if> 
---%>
-
 <!-- end headContent.jsp -->
      
\ No newline at end of file