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

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.

Browse source
This commit is contained in:
rjy7 2010-02-04 16:13:03 +00:00
parent a874f4b88a
commit 82343f63a3
2 changed files with 7 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/web/about.jsp
View file

@ -1,7 +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$ --%>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
<div id="content"> <div id="content">
<h2>${title}</h2> <h2>${title}</h2>

31
webapp/web/templates/page/headContent.jsp
View file

@ -9,44 +9,27 @@
<%@ page import="org.apache.commons.logging.Log" %> <%@ page import="org.apache.commons.logging.Log" %>
<%@ page import="org.apache.commons.logging.LogFactory" %> <%@ 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); VitroRequest vreq = new VitroRequest(request);
Portal portal = vreq.getPortal(); Portal portal = vreq.getPortal();
String themeDir = portal != null ? portal.getThemeDir() : Portal.DEFAULT_THEME_DIR_FROM_CONTEXT; String themeDir = portal != null ? portal.getThemeDir() : Portal.DEFAULT_THEME_DIR_FROM_CONTEXT;
themeDir = request.getContextPath() + '/' + themeDir; themeDir = vreq.getContextPath() + '/' + themeDir;
%> %>
<!-- headContent.jsp --> <!-- headContent.jsp -->
<link rel="stylesheet" type="text/css" href="<%=themeDir%>css/screen.css" media="screen"/> <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"/> <link rel="stylesheet" type="text/css" href="<%=themeDir%>css/print.css" media="print"/>
<%-- <c:url var="jqueryPath" value="/js/jquery.js"/> <%-- This should be a non-theme-specific stylesheet --%>
<script type="text/javascript" src="${jqueryPath}"></script> --%>
<link rel="stylesheet" type="text/css" href="<%=themeDir%>css/edit.css"/> <link rel="stylesheet" type="text/css" href="<%=themeDir%>css/edit.css"/>
<title><c:out value="${requestScope.title}"/></title> <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> <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 --> <!-- end headContent.jsp -->