NIHVIVO-1554 Remove vitro theme jsps and other unused vitro jsps. Fix vitro web.xml so the application can run.
This commit is contained in:
parent
93be621220
commit
13ff7686ef
16 changed files with 18 additions and 911 deletions
|
@ -138,7 +138,7 @@
|
||||||
</listener-class>
|
</listener-class>
|
||||||
</listener> -->
|
</listener> -->
|
||||||
|
|
||||||
<!-- -->
|
<!--
|
||||||
<listener>
|
<listener>
|
||||||
<listener-class> edu.cornell.mannlib.vitro.webapp.auth.policy.setup.InformationResourceEditingPolicySetup</listener-class>
|
<listener-class> edu.cornell.mannlib.vitro.webapp.auth.policy.setup.InformationResourceEditingPolicySetup</listener-class>
|
||||||
</listener> -->
|
</listener> -->
|
||||||
|
@ -952,7 +952,7 @@
|
||||||
|
|
||||||
<servlet>
|
<servlet>
|
||||||
<servlet-name>SearchController</servlet-name>
|
<servlet-name>SearchController</servlet-name>
|
||||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.FreemarkerPagedSearchController</servlet-class>
|
<servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.PagedSearchController</servlet-class>
|
||||||
</servlet>
|
</servlet>
|
||||||
<servlet-mapping>
|
<servlet-mapping>
|
||||||
<servlet-name>SearchController</servlet-name>
|
<servlet-name>SearchController</servlet-name>
|
||||||
|
@ -1050,25 +1050,6 @@
|
||||||
<servlet-name>TabController</servlet-name>
|
<servlet-name>TabController</servlet-name>
|
||||||
<url-pattern>/index.jsp</url-pattern>
|
<url-pattern>/index.jsp</url-pattern>
|
||||||
</servlet-mapping>
|
</servlet-mapping>
|
||||||
|
|
||||||
<!-- <servlet>
|
|
||||||
<servlet-name>EntityPropertyListController</servlet-name>
|
|
||||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.EntityPropertyListController</servlet-class>
|
|
||||||
</servlet>
|
|
||||||
<servlet-mapping>
|
|
||||||
<servlet-name>EntityPropertyListController</servlet-name>
|
|
||||||
<url-pattern>/entityPropList</url-pattern>
|
|
||||||
</servlet-mapping>
|
|
||||||
-->
|
|
||||||
|
|
||||||
<servlet>
|
|
||||||
<servlet-name>EntityMergedPropertyListController</servlet-name>
|
|
||||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.EntityMergedPropertyListController</servlet-class>
|
|
||||||
</servlet>
|
|
||||||
<servlet-mapping>
|
|
||||||
<servlet-name>EntityMergedPropertyListController</servlet-name>
|
|
||||||
<url-pattern>/entityMergedPropList</url-pattern>
|
|
||||||
</servlet-mapping>
|
|
||||||
|
|
||||||
<servlet>
|
<servlet>
|
||||||
<servlet-name>DashboardPropertyListController</servlet-name>
|
<servlet-name>DashboardPropertyListController</servlet-name>
|
||||||
|
@ -1129,6 +1110,11 @@
|
||||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.OntologyController</servlet-class>
|
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.OntologyController</servlet-class>
|
||||||
</servlet>
|
</servlet>
|
||||||
|
|
||||||
|
<servlet>
|
||||||
|
<servlet-name>individual</servlet-name>
|
||||||
|
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualController</servlet-class>
|
||||||
|
</servlet>
|
||||||
|
|
||||||
<servlet>
|
<servlet>
|
||||||
<servlet-name>updateEntityFlags</servlet-name>
|
<servlet-name>updateEntityFlags</servlet-name>
|
||||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.UpdateEntityFlagServlet</servlet-class>
|
<servlet-class>edu.cornell.mannlib.vitro.webapp.UpdateEntityFlagServlet</servlet-class>
|
||||||
|
@ -1508,7 +1494,3 @@
|
||||||
|
|
||||||
</web-app>
|
</web-app>
|
||||||
|
|
||||||
<mime-mapping>
|
|
||||||
<extension>ico</extension>
|
|
||||||
<mime-type>image/x-icon</mime-type>
|
|
||||||
</mime-mapping>
|
|
||||||
|
|
|
@ -86,10 +86,10 @@ import freemarker.template.Configuration;
|
||||||
* Rewritten to use Freemarker: rjy7
|
* Rewritten to use Freemarker: rjy7
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class FreemarkerPagedSearchController extends FreemarkerHttpServlet implements Searcher {
|
public class PagedSearchController extends FreemarkerHttpServlet implements Searcher {
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
private static final Log log = LogFactory.getLog(FreemarkerPagedSearchController.class.getName());
|
private static final Log log = LogFactory.getLog(PagedSearchController.class.getName());
|
||||||
private static final String XML_REQUEST_PARAM = "xml";
|
private static final String XML_REQUEST_PARAM = "xml";
|
||||||
|
|
||||||
private IndexSearcher searcher = null;
|
private IndexSearcher searcher = null;
|
|
@ -1,11 +0,0 @@
|
||||||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
|
||||||
<%-- This the non-freemarker AboutController iis still used by datastar. That
|
|
||||||
controller uses this jsp. --%>
|
|
||||||
|
|
||||||
<div id="content">
|
|
||||||
|
|
||||||
<h2>${title}</h2>
|
|
||||||
<div class="pageGroupBody" id="aboutText">${aboutText}</div>
|
|
||||||
<div class="pageGroupBody" id="acknowledgementText">${acknowledgeText}</div>
|
|
||||||
|
|
||||||
</div> <!-- content -->
|
|
|
@ -1,76 +0,0 @@
|
||||||
<%-- $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" class="staticPageBackground">
|
|
||||||
|
|
||||||
<div class="feedbackForm">
|
|
||||||
|
|
||||||
<h2>${siteName} Feedback and Comments Form</h2>
|
|
||||||
|
|
||||||
<p>
|
|
||||||
<c:choose>
|
|
||||||
<c:when test='${portalType eq "CALSResearch"}'>
|
|
||||||
Thank you for your interest in the Cornell University College of Agriculture and Life Sciences Research Portal.
|
|
||||||
</c:when>
|
|
||||||
<c:when test='${portalType eq "VIVO"}'>
|
|
||||||
Thank you for your interest in VIVO.
|
|
||||||
</c:when>
|
|
||||||
<c:otherwise>
|
|
||||||
Thank you for your interest in the ${siteName} portal.
|
|
||||||
</c:otherwise>
|
|
||||||
</c:choose>
|
|
||||||
<p>
|
|
||||||
|
|
||||||
<c:if test='${portalType != "clone"}'>
|
|
||||||
<!-- <p>If you are looking for information on:</p>
|
|
||||||
<ul>
|
|
||||||
<li>Undergraduate admissions: contact <a href="http://admissions.cornell.edu/">http://admissions.cornell.edu/</a></li>
|
|
||||||
<li>Undergraduate financial aid: contact <a href="http://finaid.cornell.edu/">http://finaid.cornell.edu/</a></li>
|
|
||||||
<li>Graduate admissions and information: contact <a href="http://www.gradschool.cornell.edu/">http://www.gradschool.cornell.edu/</a></li>
|
|
||||||
<li>International Students and Scholars Office: contact <a href="http://www.isso.cornell.edu/">http://www.isso.cornell.edu/</a></li>
|
|
||||||
<li>Faculty, staff and student directory: contact <a href="http://www.cornell.edu/search?tab=people">http://www.cornell.edu/search/?tab=people</a></li>
|
|
||||||
<li>General information about Cornell University: <a href="http://www.cornell.edu/">http://www.cornell.edu/</a></li>
|
|
||||||
</ul> -->
|
|
||||||
</c:if>
|
|
||||||
|
|
||||||
|
|
||||||
<p>
|
|
||||||
If you have a question regarding the content of this site, please submit the form below.
|
|
||||||
<c:if test='${(siteName eq "CALSResearch" || siteName eq "CALSImpact")}'>
|
|
||||||
The reference librarians at Albert R. Mann Library will be in touch with you soon.
|
|
||||||
</c:if>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<hr/>
|
|
||||||
|
|
||||||
<form name = "contact_form" action="sendmail" method="post" onsubmit="return ValidateForm('contact_form');">
|
|
||||||
<input type="hidden" name="home" value="${portalId}"/>
|
|
||||||
<input type="hidden" name="RequiredFields" value="webusername,webuseremail,s34gfd88p9x1"/>
|
|
||||||
<input type="hidden" name="RequiredFieldsNames" value="Name,Email address,Comments"/>
|
|
||||||
<input type="hidden" name="EmailFields" value="webuseremail"/>
|
|
||||||
<input type="hidden" name="EmailFieldsNames" value="emailaddress"/>
|
|
||||||
<input type="hidden" name="DeliveryType" value="comment"/>
|
|
||||||
|
|
||||||
<label for="webusername">Full Name:</label>
|
|
||||||
<p><input style="width:33%;" type="text" name="webusername" maxlength="255"/></p>
|
|
||||||
<label for="webuseremail">Email Address:</label>
|
|
||||||
<p><input style="width:25%;" type="text" name="webuseremail" maxlength="255"/></p>
|
|
||||||
|
|
||||||
<p class="normal"><i>${siteName} is a service that depends on regular updates and feedback.
|
|
||||||
Please help us out by providing any necessary corrections and suggestions for additional content (people, departments, courses, research services, etc.)
|
|
||||||
that you would like to see represented.</i></p>
|
|
||||||
<h3>Enter your comments, questions, or suggestions in the box below.</h3>
|
|
||||||
|
|
||||||
<textarea name="s34gfd88p9x1" rows="10" cols="90"></textarea>
|
|
||||||
<div>
|
|
||||||
<input type="submit" class="submit" value="Send Mail" />
|
|
||||||
<input type="reset" class="delete" value="Clear Form" />
|
|
||||||
</div
|
|
||||||
|
|
||||||
<p style="font-weight: bold; margin-top: 1em">Thank you!</p>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
</div><!--feedbackForm-->
|
|
||||||
|
|
||||||
</div><!--content, staticPageBackground-->
|
|
|
@ -1,39 +0,0 @@
|
||||||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
|
||||||
|
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
|
||||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
|
|
||||||
<%@ page language="java" %>
|
|
||||||
<%@ page import="java.util.*" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal" %>
|
|
||||||
|
|
||||||
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
|
|
||||||
|
|
||||||
<%
|
|
||||||
VitroRequest vreq = new VitroRequest(request);
|
|
||||||
String errorString=request.getParameter("ERR");
|
|
||||||
if (errorString == null || errorString.equals("")) {
|
|
||||||
errorString = (String)request.getAttribute("ERR");
|
|
||||||
}
|
|
||||||
%>
|
|
||||||
|
|
||||||
<c:set var="portal" value="${requestScope.portalBean}"/>
|
|
||||||
<c:set var="themeDir"><c:out value="${portalBean.themeDir}"/></c:set>
|
|
||||||
|
|
||||||
<%-- Need to get the context --%>
|
|
||||||
<c:url var="themeDir" value="/${themeDir}"/>
|
|
||||||
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td align="center" colspan="3">
|
|
||||||
<img src="${themeDir}site_icons/bomb.gif" alt="failed email"/><br/>
|
|
||||||
<% if ( errorString != null && !errorString.equals("")) {%>
|
|
||||||
<p class="normal">We report the following error in processing your request:<br/>
|
|
||||||
<b><%=errorString%></b>
|
|
||||||
</p>
|
|
||||||
<% } %>
|
|
||||||
<p class="normal">Return to the <a href="index.jsp">home page</a>.</p>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
|
@ -1,13 +1,10 @@
|
||||||
<#-- $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$ -->
|
||||||
|
|
||||||
<#-- Standard template to display a message generated from any controller. Keeps this out of individual templates. -->
|
|
||||||
|
|
||||||
|
|
||||||
<#if link??>
|
<#if link??>
|
||||||
<form method="post" action="RecomputeInferences">
|
<form method="post" action="RecomputeInferences">
|
||||||
<input type="submit" value="Recompute Inferences" name="submit"/>
|
<input type="submit" value="Recompute Inferences" name="submit"/>
|
||||||
<input type="hidden" value="Recompute" name="signal">
|
<input type="hidden" value="Recompute" name="signal">
|
||||||
</form>
|
</form>
|
||||||
</#if>
|
</#if>
|
||||||
<#if message??>
|
<#if message??>
|
||||||
<p>${message}</p>
|
<p>${message}</p>
|
||||||
|
|
|
@ -1,14 +1,11 @@
|
||||||
<#-- $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$ -->
|
||||||
|
|
||||||
<#-- Standard template to display a message generated from any controller. Keeps this out of individual templates. -->
|
|
||||||
|
|
||||||
|
|
||||||
<#if link??>
|
<#if link??>
|
||||||
<form method="post" action="sdbsetup">
|
<form method="post" action="sdbsetup">
|
||||||
<p>${sdbstatus}</p>
|
<p>${sdbstatus}</p>
|
||||||
<input type="submit" value="Run SDB Setup" name="submit"/>
|
<input type="submit" value="Run SDB Setup" name="submit"/>
|
||||||
<input type="hidden" value="setup" name="setupsignal">
|
<input type="hidden" value="setup" name="setupsignal">
|
||||||
</form>
|
</form>
|
||||||
</#if>
|
</#if>
|
||||||
<#if message??>
|
<#if message??>
|
||||||
<p>${message}</p>
|
<p>${message}</p>
|
||||||
|
|
|
@ -1,55 +0,0 @@
|
||||||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
|
||||||
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Individual" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.VClass" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditConfiguration" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditSubmission" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %>
|
|
||||||
<%@ page import="java.util.List" %>
|
|
||||||
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
|
|
||||||
<%@ page errorPage="/error.jsp"%>
|
|
||||||
|
|
||||||
<c:if test="${sessionScope.loginHandler != null &&
|
|
||||||
sessionScope.loginHandler.loginStatus == 'authenticated' &&
|
|
||||||
sessionScope.loginHandler.loginRole >= sessionScope.loginHandler.editor}">
|
|
||||||
<c:set var="showCuratorEdits" value="true"/>
|
|
||||||
</c:if>
|
|
||||||
<c:set var='entity' value='${requestScope.entity}'/><%/* just moving this into page scope for easy use */ %>
|
|
||||||
<c:set var='dashboardPropsListJsp' value='/dashboardPropList'/>
|
|
||||||
<c:set var='portal' value='${currentPortalId}'/>
|
|
||||||
<c:set var='portalBean' value='${currentPortal}'/>
|
|
||||||
<div id="dashboard"<c:if test="${showCuratorEdits}"> class="loggedIn"</c:if>>
|
|
||||||
<c:if test="${!empty entity.thumbUrl}">
|
|
||||||
<c:if test="${!empty entity.imageUrl}">
|
|
||||||
<a class="image" href="${pageContext.request.contextPath}${entity.imageUrl}">
|
|
||||||
</c:if>
|
|
||||||
<img class="headshot" src="${pageContext.request.contextPath}${entity.thumbUrl}" title="click to view larger image in new window" alt="" width="150"/>
|
|
||||||
<c:if test="${!empty entity.imageUrl}"></a></c:if>
|
|
||||||
</c:if>
|
|
||||||
|
|
||||||
<ul class="profileLinks">
|
|
||||||
<c:if test="${!empty entity.anchor}">
|
|
||||||
<c:choose>
|
|
||||||
<c:when test="${!empty entity.url}">
|
|
||||||
<c:url var="entityUrl" value="${entity.url}" />
|
|
||||||
<li><a class="externalLink" href="<c:out value="${entityUrl}"/>">${entity.anchor}</a></li>
|
|
||||||
</c:when>
|
|
||||||
<c:otherwise><li>${entity.anchor}</li></c:otherwise>
|
|
||||||
</c:choose>
|
|
||||||
</c:if>
|
|
||||||
|
|
||||||
<c:if test="${!empty entity.linksList }">
|
|
||||||
<c:forEach items="${entity.linksList}" var='link'>
|
|
||||||
<c:url var="linkUrl" value="${link.url}" />
|
|
||||||
<li><a class="externalLink" href="<c:out value="${linkUrl}"/>">${link.anchor}</a></li>
|
|
||||||
</c:forEach>
|
|
||||||
</c:if>
|
|
||||||
</ul>
|
|
||||||
<c:if test="${showCuratorEdits}">
|
|
||||||
<c:import url="${dashboardPropsListJsp}">
|
|
||||||
<%-- unless a value is provided, properties not assigned to a group will not appear on the dashboard --%>
|
|
||||||
<c:param name="unassignedPropsGroupName" value=""/>
|
|
||||||
</c:import>
|
|
||||||
</c:if>
|
|
||||||
</div>
|
|
|
@ -1,55 +0,0 @@
|
||||||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
|
||||||
|
|
||||||
<%@ page language="java"%>
|
|
||||||
<%@ page import="java.util.Calendar" %>
|
|
||||||
<%@ page import="org.apache.commons.logging.Log" %>
|
|
||||||
<%@ page import="org.apache.commons.logging.LogFactory" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest"%>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.web.*"%>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean" %>
|
|
||||||
|
|
||||||
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %><%/* this odd thing points to something in web.xml */ %>
|
|
||||||
<%
|
|
||||||
final Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.web.themes.default.footer.jsp");
|
|
||||||
|
|
||||||
VitroRequest vreq = new VitroRequest(request);
|
|
||||||
|
|
||||||
Portal portal = vreq.getPortal();
|
|
||||||
if (portal==null) {
|
|
||||||
log.error("portal from vreq.getPortal() null in themes/default/footer.jsp");
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean isEditor = LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.EDITOR);
|
|
||||||
%>
|
|
||||||
<c:set var="currentYear" value="<%= Calendar.getInstance().get(Calendar.YEAR) %>" />
|
|
||||||
<div class='footer'><div class='footerLinks'>
|
|
||||||
<% String rootBreadCrumb = BreadCrumbsUtil.getRootBreadCrumb(vreq,"",portal);
|
|
||||||
if (rootBreadCrumb != null && rootBreadCrumb.length()>0) { %>
|
|
||||||
<%=rootBreadCrumb%> |
|
|
||||||
<% } %>
|
|
||||||
<a href="browsecontroller?home=<%=portal.getPortalId()%>">Index</a>
|
|
||||||
| <a href="comments?home=<%=portal.getPortalId()%>">Contact Us</a>
|
|
||||||
<% if (isEditor) { %>
|
|
||||||
| admin [
|
|
||||||
<a href="http://validator.w3.org/check?uri=referer">validate xhtml</a>
|
|
||||||
<a href="http://jigsaw.w3.org/css-validator/check/referer">validate css</a>
|
|
||||||
]
|
|
||||||
<% } %>
|
|
||||||
</div>
|
|
||||||
<% if (portal.getCopyrightAnchor() != null && portal.getCopyrightAnchor().length()>0) { %>
|
|
||||||
<div class='copyright'>
|
|
||||||
©${currentYear}
|
|
||||||
<% if (portal.getCopyrightURL() != null && portal.getCopyrightURL().length()>0) { %>
|
|
||||||
<a href="<%=portal.getCopyrightURL()%>">
|
|
||||||
<% } %>
|
|
||||||
<%=portal.getCopyrightAnchor()%>
|
|
||||||
<% if (portal.getCopyrightURL() != null && portal.getCopyrightURL().length()>0) { %>
|
|
||||||
</a>.
|
|
||||||
<% } %>
|
|
||||||
</div>
|
|
||||||
<div class='copyright'>
|
|
||||||
All Rights Reserved. <a href="termsOfUse?home=<%=portal.getPortalId()%>">Terms of Use</a>
|
|
||||||
</div>
|
|
||||||
<% } %>
|
|
||||||
</div>
|
|
|
@ -1,114 +0,0 @@
|
||||||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
|
||||||
|
|
||||||
<%@ page language="java" %>
|
|
||||||
<%@ page errorPage="error.jsp"%>
|
|
||||||
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean" %>
|
|
||||||
|
|
||||||
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%><%/* this odd thing points to something in web.xml */ %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.web.PortalWebUtil" %>
|
|
||||||
|
|
||||||
<%
|
|
||||||
// application variables not stored in application bean
|
|
||||||
final int CALS_IMPACT = 6;
|
|
||||||
final int CALS_SEARCHBOX_SIZE = 25;
|
|
||||||
final int VIVO_SEARCHBOX_SIZE = 20;
|
|
||||||
|
|
||||||
LoginStatusBean loginBean = LoginStatusBean.getBean(request);
|
|
||||||
boolean isEditor = loginBean.isLoggedInAtLeast(LoginStatusBean.EDITOR);
|
|
||||||
String loginName = loginBean.getUsername();
|
|
||||||
|
|
||||||
VitroRequest vreq = new VitroRequest(request);
|
|
||||||
ApplicationBean appBean = vreq.getAppBean();
|
|
||||||
Portal portal = vreq.getPortal();
|
|
||||||
PortalWebUtil.populateSearchOptions(portal, appBean, vreq.getWebappDaoFactory().getPortalDao());
|
|
||||||
PortalWebUtil.populateNavigationChoices(portal, request, appBean, vreq.getWebappDaoFactory().getPortalDao());
|
|
||||||
|
|
||||||
String fixedTabStr = (fixedTabStr = request.getParameter("fixed")) == null ? null : fixedTabStr.equals("") ? null : fixedTabStr;
|
|
||||||
final String DEFAULT_SEARCH_METHOD = "fulltext";
|
|
||||||
|
|
||||||
%>
|
|
||||||
<c:set var="portal" value="${requestScope.portalBean}"/>
|
|
||||||
<c:set var="appBean" value="${requestScope.appBean}"/>
|
|
||||||
|
|
||||||
<div id="header">
|
|
||||||
|
|
||||||
<c:set var='themeDir' >
|
|
||||||
<c:out value='${portal.themeDir}' />
|
|
||||||
</c:set>
|
|
||||||
|
|
||||||
<table id="head"><tr>
|
|
||||||
<td id="LogotypeArea">
|
|
||||||
<table><tr>
|
|
||||||
<td>
|
|
||||||
|
|
||||||
<%
|
|
||||||
String homeURL = (portal.getRootBreadCrumbURL()!=null && portal.getRootBreadCrumbURL().length()>0) ?
|
|
||||||
portal.getRootBreadCrumbURL() : request.getContextPath()+"/";
|
|
||||||
%>
|
|
||||||
|
|
||||||
<a href="<%=homeURL%>">
|
|
||||||
|
|
||||||
<img class="closecrop" src="${themeDir}site_icons/<%=appBean.getRootLogotypeImage()%>"
|
|
||||||
width="<%=appBean.getRootLogotypeWidth()%>"
|
|
||||||
height="<%=appBean.getRootLogotypeHeight()%>"
|
|
||||||
alt="<%=appBean.getRootLogotypeTitle()%>"/></a>
|
|
||||||
|
|
||||||
|
|
||||||
</td><td>
|
|
||||||
<a href="<%=homeURL%>">
|
|
||||||
<img class="closecrop" src="${themeDir}site_icons/<%=portal.getLogotypeImage()%>"
|
|
||||||
width="<%=portal.getLogotypeWidth()%>" height="<%=portal.getLogotypeHeight()%>"
|
|
||||||
alt="<%=portal.getAppName()%>"/></a>
|
|
||||||
</td>
|
|
||||||
</tr></table>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<td id="SearchArea" <%if ((portal.getBannerImage() == null || portal.getBannerImage().equals(""))){%>align="right"<% } %>>
|
|
||||||
<% if (fixedTabStr != null && fixedTabStr.equalsIgnoreCase("Search")) { %>
|
|
||||||
<% } else { %>
|
|
||||||
<table align="center"><tr><td>
|
|
||||||
<div class="searchForm">
|
|
||||||
<c:url var="searchURL" value="/search"/>
|
|
||||||
<form action="${searchURL}" >
|
|
||||||
<table><tr>
|
|
||||||
<td>
|
|
||||||
<label for="search">Search </label>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<% if (isEditor && appBean.isFlag1Active()) { %>
|
|
||||||
<select id="select" name="flag1" class="form-item" >
|
|
||||||
<option value="nofiltering" selected="selected">entire database (<%=loginName%>)</option>
|
|
||||||
<option value="<%=portal.getPortalId()%>"><%=portal.getShortHand()%></option>
|
|
||||||
</select>
|
|
||||||
<% } else {%>
|
|
||||||
<input type="hidden" name="flag1" value="<%=portal.getPortalId()%>" />
|
|
||||||
<% } %>
|
|
||||||
<input type="text" name="querytext" id="search" class="search-form-item" value="<c:out value="${requestScope.querytext}"/>"
|
|
||||||
size="<%=VIVO_SEARCHBOX_SIZE%>" />
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<input class="search-form-button" name="submit" type="submit" value="Go" />
|
|
||||||
</td>
|
|
||||||
</tr></table>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</td></tr></table>
|
|
||||||
<% } // not a fixed tab %>
|
|
||||||
</td>
|
|
||||||
<% if (!(portal.getBannerImage() == null || portal.getBannerImage().equals("")))
|
|
||||||
{
|
|
||||||
%>
|
|
||||||
<td id="BannerArea" align="right">
|
|
||||||
<img src="${portal.themeDir}site_icons/<%=portal.getBannerImage()%>" alt="<%=portal.getShortHand()%>"/>
|
|
||||||
</td>
|
|
||||||
<% } %>
|
|
||||||
|
|
||||||
</tr></table>
|
|
||||||
|
|
||||||
</div><!--header-->
|
|
||||||
|
|
|
@ -1,115 +0,0 @@
|
||||||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
|
||||||
|
|
||||||
<%@ page import="org.apache.commons.logging.Log" %>
|
|
||||||
<%@ page import="org.apache.commons.logging.LogFactory" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.web.TabMenu" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.web.BreadCrumbsUtil" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean" %>
|
|
||||||
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
|
|
||||||
|
|
||||||
<%
|
|
||||||
/***********************************************
|
|
||||||
Make the Tab menu div, nothing else.
|
|
||||||
|
|
||||||
bdc34 2006-01-03 created
|
|
||||||
**********************************************/
|
|
||||||
|
|
||||||
LoginStatusBean loginBean = LoginStatusBean.getBean(request);
|
|
||||||
boolean isLoggedIn = loginBean.isLoggedIn();
|
|
||||||
String loginName = loginBean.getUsername();
|
|
||||||
|
|
||||||
final Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.web.menu.jsp");
|
|
||||||
|
|
||||||
VitroRequest vreq = new VitroRequest(request);
|
|
||||||
Portal portal = vreq.getPortal();
|
|
||||||
|
|
||||||
int portalId = -1;
|
|
||||||
if (portal==null) {
|
|
||||||
log.error("Attribute 'portalBean' missing or null; portalId defaulted to 1");
|
|
||||||
portalId=1;
|
|
||||||
} else {
|
|
||||||
portalId=portal.getPortalId();
|
|
||||||
}
|
|
||||||
String fixedTabStr=(fixedTabStr=request.getParameter("fixed"))==null?null:fixedTabStr.equals("")?null:fixedTabStr;
|
|
||||||
%>
|
|
||||||
<c:set var="currentPortal" value="<%=portal.getPortalId()%>"/>
|
|
||||||
<!-- ************** START menu.jsp **** -->
|
|
||||||
|
|
||||||
<div id="menu">
|
|
||||||
<div id="primaryAndOther">
|
|
||||||
<%=TabMenu.getPrimaryTabMenu(vreq)%>
|
|
||||||
<ul id="otherMenu">
|
|
||||||
|
|
||||||
<%-- A user is logged in --%>
|
|
||||||
<% if (isLoggedIn) { %>
|
|
||||||
|
|
||||||
<c:url var="logoutHref" value="<%= Controllers.LOGOUT %>">
|
|
||||||
<c:param name="home" value="${currentPortal}" />
|
|
||||||
</c:url>
|
|
||||||
|
|
||||||
<c:url var="siteAdminHref" value="<%= Controllers.SITE_ADMIN %>">
|
|
||||||
<c:param name="home" value="${currentPortal}" />
|
|
||||||
</c:url>
|
|
||||||
|
|
||||||
<li class="border">
|
|
||||||
Logged in as <strong><%= loginName %></strong> (<a href="${logoutHref}">Log out</a>)
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li class="border"><a href="${siteAdminHref}" >Site Admin</a></li>
|
|
||||||
|
|
||||||
<%-- A user is not logged in --%>
|
|
||||||
<% } else { %>
|
|
||||||
|
|
||||||
<c:url var="loginHref" value="<%= Controllers.LOGIN %>">
|
|
||||||
<c:param name="home" value="${currentPortal}"/>
|
|
||||||
<c:param name="login" value="block"/>
|
|
||||||
</c:url>
|
|
||||||
|
|
||||||
<li class="border"><a title="log in to manage this site" href="${loginHref}">Log in</a></li>
|
|
||||||
<% }
|
|
||||||
|
|
||||||
if ("browse".equalsIgnoreCase(fixedTabStr)) {%>
|
|
||||||
<li class="activeTab"><a href="<c:url value="/browsecontroller"/>" title="list all contents by type">Index</a></li>
|
|
||||||
<% } else {%>
|
|
||||||
<li><a href="<c:url value="/browsecontroller"><c:param name="home" value="${portalBean.portalId}"/></c:url>" title="list all contents by type">Index</a></li>
|
|
||||||
<% }
|
|
||||||
|
|
||||||
if ("about".equalsIgnoreCase(fixedTabStr)) {%>
|
|
||||||
<c:url var="aboutHref" value="<%= Controllers.ABOUT %>">
|
|
||||||
<c:param name="home" value="${currentPortal}"/>
|
|
||||||
<c:param name="login" value="none"/>
|
|
||||||
</c:url>
|
|
||||||
<c:set var="aboutHref">
|
|
||||||
<c:out value="${aboutHref}" escapeXml="true"/>
|
|
||||||
</c:set>
|
|
||||||
<li><a class="activeTab" href="${aboutHref}" title="more about this web site">About</a></li>
|
|
||||||
<% } else {%>
|
|
||||||
<c:url var="aboutHref" value="<%= Controllers.ABOUT %>">
|
|
||||||
<c:param name="home" value="${currentPortal}"/>
|
|
||||||
<c:param name="login" value="none"/>
|
|
||||||
</c:url>
|
|
||||||
<c:set var="aboutHref">
|
|
||||||
<c:out value="${aboutHref}" escapeXml="true"/>
|
|
||||||
</c:set>
|
|
||||||
<li><a href="${aboutHref}" title="more about this web site">About</a></li>
|
|
||||||
<% }
|
|
||||||
|
|
||||||
if ("comments".equalsIgnoreCase(fixedTabStr)) { %>
|
|
||||||
<li class="activeTab"><a href="<c:url value="/comments"><c:param name="home" value="${portalBean.portalId }"/></c:url>">Contact Us</a></li>
|
|
||||||
<% } else {%>
|
|
||||||
<li><a href="<c:url value="/comments"><c:param name="home" value="${portalBean.portalId }"/></c:url>">Contact Us</a></li>
|
|
||||||
<% }%>
|
|
||||||
</ul>
|
|
||||||
</div><!--END 'primaryAndOther'-->
|
|
||||||
<% if( fixedTabStr == null ) {%>
|
|
||||||
<div id="secondaryTabMenu">
|
|
||||||
<%=TabMenu.getSecondaryTabMenu(vreq)%>
|
|
||||||
</div><!--END 'secondaryTabMenu'-->
|
|
||||||
<% }%>
|
|
||||||
</div><!-- END 'menu' -->
|
|
||||||
<div id="breadcrumbs"><%=BreadCrumbsUtil.getBreadCrumbsDiv(request)%></div>
|
|
||||||
<!-- ************************ END menu.jsp ************************ -->
|
|
|
@ -1,55 +0,0 @@
|
||||||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
|
||||||
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Individual" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.VClass" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditConfiguration" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditSubmission" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %>
|
|
||||||
<%@ page import="java.util.List" %>
|
|
||||||
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
|
|
||||||
<%@ page errorPage="/error.jsp"%>
|
|
||||||
|
|
||||||
<c:if test="${sessionScope.loginHandler != null &&
|
|
||||||
sessionScope.loginHandler.loginStatus == 'authenticated' &&
|
|
||||||
sessionScope.loginHandler.loginRole >= sessionScope.loginHandler.editor}">
|
|
||||||
<c:set var="showCuratorEdits" value="true"/>
|
|
||||||
</c:if>
|
|
||||||
<c:set var='entity' value='${requestScope.entity}'/><%/* just moving this into page scope for easy use */ %>
|
|
||||||
<c:set var='dashboardPropsListJsp' value='/dashboardPropList'/>
|
|
||||||
<c:set var='portal' value='${currentPortalId}'/>
|
|
||||||
<c:set var='portalBean' value='${currentPortal}'/>
|
|
||||||
<div id="dashboard"<c:if test="${showCuratorEdits}"> class="loggedIn"</c:if>>
|
|
||||||
<c:if test="${!empty entity.thumbUrl}">
|
|
||||||
<c:if test="${!empty entity.imageUrl}">
|
|
||||||
<a class="image" href="${pageContext.request.contextPath}${entity.imageUrl}">
|
|
||||||
</c:if>
|
|
||||||
<img class="headshot" src="${pageContext.request.contextPath}${entity.thumbUrl}" title="click to view larger image in new window" alt="" width="150"/>
|
|
||||||
<c:if test="${!empty entity.imageUrl}"></a></c:if>
|
|
||||||
</c:if>
|
|
||||||
|
|
||||||
<ul class="profileLinks">
|
|
||||||
<c:if test="${!empty entity.anchor}">
|
|
||||||
<c:choose>
|
|
||||||
<c:when test="${!empty entity.url}">
|
|
||||||
<c:url var="entityUrl" value="${entity.url}" />
|
|
||||||
<li><a class="externalLink" href="<c:out value="${entityUrl}"/>">${entity.anchor}</a></li>
|
|
||||||
</c:when>
|
|
||||||
<c:otherwise><li>${entity.anchor}</li></c:otherwise>
|
|
||||||
</c:choose>
|
|
||||||
</c:if>
|
|
||||||
|
|
||||||
<c:if test="${!empty entity.linksList }">
|
|
||||||
<c:forEach items="${entity.linksList}" var='link'>
|
|
||||||
<c:url var="linkUrl" value="${link.url}" />
|
|
||||||
<li><a class="externalLink" href="<c:out value="${linkUrl}"/>">${link.anchor}</a></li>
|
|
||||||
</c:forEach>
|
|
||||||
</c:if>
|
|
||||||
</ul>
|
|
||||||
<c:if test="${showCuratorEdits}">
|
|
||||||
<c:import url="${dashboardPropsListJsp}">
|
|
||||||
<%-- unless a value is provided, properties not assigned to a group will not appear on the dashboard --%>
|
|
||||||
<c:param name="unassignedPropsGroupName" value=""/>
|
|
||||||
</c:import>
|
|
||||||
</c:if>
|
|
||||||
</div>
|
|
|
@ -1,76 +0,0 @@
|
||||||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
|
||||||
|
|
||||||
<%@ page language="java"%>
|
|
||||||
|
|
||||||
<%@ page import="java.util.Calendar" %>
|
|
||||||
<%@ page import="org.apache.commons.logging.Log" %>
|
|
||||||
<%@ page import="org.apache.commons.logging.LogFactory" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest"%>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.web.*"%>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
|
|
||||||
|
|
||||||
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %><%/* this odd thing points to something in web.xml */ %>
|
|
||||||
|
|
||||||
<%
|
|
||||||
final Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.web.themes.enhanced.footer.jsp");
|
|
||||||
|
|
||||||
VitroRequest vreq = new VitroRequest(request);
|
|
||||||
|
|
||||||
Portal portal = vreq.getPortal();
|
|
||||||
if (portal==null) {
|
|
||||||
log.error("portal from vreq.getPortal() null in themes/enhanced/footer.jsp");
|
|
||||||
}
|
|
||||||
%>
|
|
||||||
<c:set var="currentYear" value="<%= Calendar.getInstance().get(Calendar.YEAR) %>" />
|
|
||||||
<c:set var='context' value="<%=vreq.getContextPath()%>" />
|
|
||||||
<c:set var='themePath'>
|
|
||||||
<c:if test="${!empty context && context != ''}">/${context}</c:if>/<%=portal.getThemeDir() %>
|
|
||||||
</c:set>
|
|
||||||
<c:set var='themeDir'><c:out value='${themePath}' /></c:set>
|
|
||||||
<c:set var="currentPortal" value="<%=portal.getPortalId()%>"/>
|
|
||||||
|
|
||||||
<div id='footer'>
|
|
||||||
|
|
||||||
<% if (!(portal.getBannerImage() == null || portal.getBannerImage().equals("")))
|
|
||||||
{ %>
|
|
||||||
<img class="footerLogo" src="${themeDir}site_icons/<%=portal.getBannerImage()%>" alt="<%=portal.getShortHand()%>"/>
|
|
||||||
<% } %>
|
|
||||||
|
|
||||||
<div class='footerLinks'>
|
|
||||||
<ul class="otherNav">
|
|
||||||
<c:url var="aboutHref" value="<%= Controllers.ABOUT %>">
|
|
||||||
<c:param name="home" value="${currentPortal}"/>
|
|
||||||
</c:url>
|
|
||||||
<c:set var="aboutHref">
|
|
||||||
<c:out value="${aboutHref}" escapeXml="true"/>
|
|
||||||
</c:set>
|
|
||||||
|
|
||||||
<li><a href="${aboutHref}" title="more about this web site">About</a></li>
|
|
||||||
|
|
||||||
<c:url var="contactHref" value="/comments">
|
|
||||||
<c:param name="home" value="${currentPortal}"/>
|
|
||||||
</c:url>
|
|
||||||
<c:set var="contactHref">
|
|
||||||
<c:out value="${contactHref}" escapeXml="true"/>
|
|
||||||
</c:set>
|
|
||||||
<li class="last"><a href="${contactHref}" title="feedback form">Contact Us</a></li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
<% if (portal.getCopyrightAnchor() != null && portal.getCopyrightAnchor().length()>0) { %>
|
|
||||||
<div class='copyright'>
|
|
||||||
©${currentYear}
|
|
||||||
<% if (portal.getCopyrightURL() != null && portal.getCopyrightURL().length()>0) { %>
|
|
||||||
<a href="<%=portal.getCopyrightURL()%>">
|
|
||||||
<% } %>
|
|
||||||
<%=portal.getCopyrightAnchor()%>
|
|
||||||
<% if (portal.getCopyrightURL() != null && portal.getCopyrightURL().length()>0) { %>
|
|
||||||
</a>
|
|
||||||
<% } %>
|
|
||||||
</div>
|
|
||||||
<div class='copyright'>
|
|
||||||
All Rights Reserved. <a href="termsOfUse?home=<%=portal.getPortalId()%>">Terms of Use</a>
|
|
||||||
</div>
|
|
||||||
<% } %>
|
|
||||||
</div>
|
|
|
@ -1,110 +0,0 @@
|
||||||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
|
||||||
|
|
||||||
<%@ page language="java" %>
|
|
||||||
<%@ page errorPage="error.jsp"%>
|
|
||||||
<%@ page import="org.apache.commons.logging.Log" %>
|
|
||||||
<%@ page import="org.apache.commons.logging.LogFactory" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.web.TabMenu" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.web.BreadCrumbsUtil" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean" %>
|
|
||||||
|
|
||||||
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
|
|
||||||
|
|
||||||
<%
|
|
||||||
LoginStatusBean loginBean = LoginStatusBean.getBean(request);
|
|
||||||
boolean isLoggedIn = loginBean.isLoggedIn();
|
|
||||||
String loginName = loginBean.getUsername();
|
|
||||||
|
|
||||||
// VITRO FILE
|
|
||||||
final Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.web.menu.jsp");
|
|
||||||
|
|
||||||
VitroRequest vreq = new VitroRequest(request);
|
|
||||||
Portal portal = vreq.getPortal();
|
|
||||||
|
|
||||||
int portalId = -1;
|
|
||||||
if (portal==null) {
|
|
||||||
log.error("Attribute 'portalBean' missing or null; portalId defaulted to 1");
|
|
||||||
portalId=1;
|
|
||||||
} else {
|
|
||||||
portalId=portal.getPortalId();
|
|
||||||
}
|
|
||||||
String fixedTabStr=(fixedTabStr=request.getParameter("fixed"))==null?null:fixedTabStr.equals("")?null:fixedTabStr;
|
|
||||||
|
|
||||||
%>
|
|
||||||
<c:set var='context' value="<%=vreq.getContextPath()%>" />
|
|
||||||
<c:set var='themePath'>
|
|
||||||
<c:if test="${!empty context && context != ''}">/${context}</c:if>/<%=portal.getThemeDir()%>
|
|
||||||
</c:set>
|
|
||||||
<c:set var='themeDir'><c:out value='${themePath}'/></c:set>
|
|
||||||
<c:set var="currentPortal" value="<%=portal.getPortalId()%>"/>
|
|
||||||
|
|
||||||
<%
|
|
||||||
String homeURL = (portal.getRootBreadCrumbURL()!=null && portal.getRootBreadCrumbURL().length()>0) ?
|
|
||||||
portal.getRootBreadCrumbURL() : request.getContextPath()+"/";
|
|
||||||
%>
|
|
||||||
|
|
||||||
<%-- <h1><%=vreq.getContextPath()%></h1> --%>
|
|
||||||
|
|
||||||
<div id="identity">
|
|
||||||
|
|
||||||
<%-- <a href="<%=homeURL%>"><img class="closecrop" src="${themeDir}site_icons/<%=appBean.getRootLogotypeImage()%>" width="<%=appBean.getRootLogotypeWidth()%>" height="<%=appBean.getRootLogotypeHeight()%>" alt="<%=appBean.getRootLogotypeTitle()%>"/></a> --%>
|
|
||||||
<h1>
|
|
||||||
<a href="<%=homeURL%>">
|
|
||||||
<%-- <img class="closecrop" src="${themeDir}site_icons/<%=portal.getLogotypeImage()%>" width="<%=portal.getLogotypeWidth()%>" height="<%=portal.getLogotypeHeight()%>" alt="<%=portal.getAppName()%>"/> --%>
|
|
||||||
<%-- <img src="${themeDir}site_icons/<%=portal.getLogotypeImage()%>" alt="<%=portal.getAppName()%>"/> --%>
|
|
||||||
<% if (!(portal.getLogotypeImage() == null || portal.getLogotypeImage().equals("")))
|
|
||||||
{ %>
|
|
||||||
<img src="${themeDir}site_icons/<%=portal.getLogotypeImage()%>" alt="<%=portal.getAppName()%>"/>
|
|
||||||
<% } else {
|
|
||||||
out.print(portal.getAppName());
|
|
||||||
} %>
|
|
||||||
|
|
||||||
</a>
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<ul id="otherMenu">
|
|
||||||
|
|
||||||
<%-- A user is logged in --%>
|
|
||||||
<% if (isLoggedIn) { %>
|
|
||||||
|
|
||||||
<c:url var="logoutHref" value="<%= Controllers.LOGOUT %>">
|
|
||||||
<c:param name="home" value="${currentPortal}" />
|
|
||||||
</c:url>
|
|
||||||
|
|
||||||
<c:url var="siteAdminHref" value="<%= Controllers.SITE_ADMIN %>">
|
|
||||||
<c:param name="home" value="${currentPortal}" />
|
|
||||||
</c:url>
|
|
||||||
|
|
||||||
<li class="border">
|
|
||||||
Logged in as <strong><%= loginName %></strong> (<a href="${logoutHref}">Log out</a>)
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li class="border"><a href="${siteAdminHref}" >Site Admin</a></li>
|
|
||||||
|
|
||||||
<%-- A user is not logged in --%>
|
|
||||||
<% } else { %>
|
|
||||||
|
|
||||||
<c:url var="loginHref" value="<%= Controllers.LOGIN %>">
|
|
||||||
<c:param name="home" value="${currentPortal}"/>
|
|
||||||
<c:param name="login" value="block"/>
|
|
||||||
</c:url>
|
|
||||||
|
|
||||||
<li class="border"><a title="log in to manage this site" href="${loginHref}">Log in</a></li>
|
|
||||||
<% } %>
|
|
||||||
|
|
||||||
<c:url var="aboutHref" value="<%= Controllers.ABOUT %>">
|
|
||||||
<c:param name="home" value="${currentPortal}"/>
|
|
||||||
</c:url>
|
|
||||||
<c:set var="aboutHref">
|
|
||||||
<c:out value="${aboutHref}" escapeXml="true"/>
|
|
||||||
</c:set>
|
|
||||||
|
|
||||||
<li class="border"><a href="${aboutHref}" title="more about this web site">About</a></li>
|
|
||||||
<li><a href='<c:url value="/comments"><c:param name="home" value="${currentPortal}"/></c:url>'>Contact Us</a></li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
</div><!-- end identity -->
|
|
|
@ -1,136 +0,0 @@
|
||||||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
|
||||||
|
|
||||||
<%@ page import="org.apache.commons.logging.Log" %>
|
|
||||||
<%@ page import="org.apache.commons.logging.LogFactory" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.web.TabMenu" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.web.BreadCrumbsUtil" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.web.TabWebUtil" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.web.PortalWebUtil" %>
|
|
||||||
<%@ page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean" %>
|
|
||||||
<%@ page import="java.util.List"%>
|
|
||||||
|
|
||||||
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
|
|
||||||
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
|
|
||||||
|
|
||||||
<%
|
|
||||||
/***********************************************
|
|
||||||
Make the Tab menu list and search block
|
|
||||||
|
|
||||||
mw542 2009-04-24 moved search from identity.jsp, updated with new code from bdc34
|
|
||||||
bdc34 2006-01-03 created
|
|
||||||
**********************************************/
|
|
||||||
final Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.web.menu.jsp");
|
|
||||||
|
|
||||||
Portal portal = (Portal)request.getAttribute("portalBean");
|
|
||||||
int portalId = -1;
|
|
||||||
if (portal==null) {
|
|
||||||
portalId=1;
|
|
||||||
} else {
|
|
||||||
portalId=portal.getPortalId();
|
|
||||||
}
|
|
||||||
|
|
||||||
VitroRequest vreq = new VitroRequest(request);
|
|
||||||
|
|
||||||
List primaryTabs = vreq.getWebappDaoFactory().getTabDao().getPrimaryTabs(portalId);
|
|
||||||
request.setAttribute("primaryTabs", primaryTabs);
|
|
||||||
|
|
||||||
int tabId = TabWebUtil.getTabIdFromRequest(vreq);
|
|
||||||
int rootId = TabWebUtil.getRootTabId(vreq);
|
|
||||||
List tabLevels = vreq.getWebappDaoFactory().getTabDao().getTabHierarchy(tabId,rootId);
|
|
||||||
request.setAttribute("tabLevels", tabLevels);
|
|
||||||
|
|
||||||
String uri = (String)request.getAttribute("javax.servlet.forward.request_uri");
|
|
||||||
if(uri != null){
|
|
||||||
request.setAttribute("indexClass", uri.indexOf("browsecontroller") > 0 ? "class=\"activeTab\"" : "");
|
|
||||||
|
|
||||||
if ( uri.indexOf("about") > 0) {
|
|
||||||
request.setAttribute("aboutClass","class=\"activeTab\"");
|
|
||||||
}
|
|
||||||
if ( uri.indexOf("comments") > 0) {
|
|
||||||
request.setAttribute("commentsClass","class=\"activeTab\"");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// application variables not stored in application bean
|
|
||||||
final String DEFAULT_SEARCH_METHOD = "fulltext";
|
|
||||||
final int VIVO_SEARCHBOX_SIZE = 20;
|
|
||||||
|
|
||||||
ApplicationBean appBean = vreq.getAppBean();
|
|
||||||
PortalWebUtil.populateSearchOptions(portal, appBean, vreq.getWebappDaoFactory().getPortalDao());
|
|
||||||
PortalWebUtil.populateNavigationChoices(portal, request, appBean, vreq.getWebappDaoFactory().getPortalDao());
|
|
||||||
|
|
||||||
LoginStatusBean loginBean = LoginStatusBean.getBean(request);
|
|
||||||
boolean isEditor = loginBean.isLoggedInAtLeast(LoginStatusBean.EDITOR);
|
|
||||||
String loginName = loginBean.getUsername();
|
|
||||||
%>
|
|
||||||
|
|
||||||
<c:url var="themePath" value="/${themeDir}" />
|
|
||||||
<c:url var="searchURL" value="/search"/>
|
|
||||||
<c:set var="currentPortal" value="<%=portal.getPortalId()%>"/>
|
|
||||||
<c:set var="rootTab" value="<%=rootId%>"/>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ************** START menu.jsp ************** -->
|
|
||||||
<div id="navAndSearch" class="block">
|
|
||||||
<div id="primaryAndOther">
|
|
||||||
<ul id="primary">
|
|
||||||
<c:forEach items="${primaryTabs}" var="tab">
|
|
||||||
<li>
|
|
||||||
<c:remove var="activeClass"/>
|
|
||||||
<c:if test="${param.primary==tab.tabId}">
|
|
||||||
<c:set var="activeClass"> class="activeTab" </c:set>
|
|
||||||
</c:if>
|
|
||||||
<c:forEach items="${tabLevels}" var="subTab">
|
|
||||||
<c:if test="${subTab==tab.tabId && subTab != rootTab}">
|
|
||||||
<c:set var="activeClass"> class="activeTab" </c:set>
|
|
||||||
</c:if>
|
|
||||||
</c:forEach>
|
|
||||||
|
|
||||||
<c:url var="tabHref" value="/index.jsp"><c:param name="primary" value="${tab.tabId}"/></c:url>
|
|
||||||
<a ${activeClass} href="${tabHref}">
|
|
||||||
<c:out value="${tab.title}"/></a>
|
|
||||||
</li>
|
|
||||||
</c:forEach>
|
|
||||||
<li>
|
|
||||||
<a ${indexClass} href="<c:url value="/browsecontroller"/>"
|
|
||||||
title="list all contents by type">
|
|
||||||
Index</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
</div><!--END 'primaryAndOther'-->
|
|
||||||
|
|
||||||
<%-- TabMenu.getSecondaryTabMenu(vreq) --%>
|
|
||||||
|
|
||||||
|
|
||||||
<%------------- Search Form -------------%>
|
|
||||||
<div id="searchBlock">
|
|
||||||
<form id="searchForm" action="${searchURL}" >
|
|
||||||
<label for="search">Search </label>
|
|
||||||
<% if (isEditor && appBean.isFlag1Active()) { %>
|
|
||||||
<select id="search-form-modifier" name="flag1" class="form-item" >
|
|
||||||
<option value="nofiltering" selected="selected">entire database (<%=loginName%>)</option>
|
|
||||||
<option value="${currentPortal}"><%=portal.getShortHand()%></option>
|
|
||||||
</select>
|
|
||||||
<% } else {%>
|
|
||||||
<input type="hidden" name="flag1" value="${currentPortal}" />
|
|
||||||
<% } %>
|
|
||||||
<input type="text" name="querytext" id="search" class="search-form-item" value="<c:out value="${requestScope.querytext}"/>" size="<%=VIVO_SEARCHBOX_SIZE%>" />
|
|
||||||
<input class="search-form-submit" name="submit" type="submit" value="Search" />
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<%-- this div is needed for clearing floats --%>
|
|
||||||
<%-- <div class="clear"></div> --%>
|
|
||||||
|
|
||||||
</div><!-- END 'navigation' -->
|
|
||||||
<div id="breadcrumbs" class="small"><%=BreadCrumbsUtil.getBreadCrumbsDiv(request)%></div>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ************************ END menu.jsp ************************ -->
|
|
||||||
|
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
|
||||||
|
|
||||||
<div id="content">
|
|
||||||
<div class="staticPageBackground">
|
|
||||||
<h3>Terms of Use</h3>
|
|
||||||
<h3 class="celltopcentered">Disclaimers</h3>
|
|
||||||
<p class="normal">This ${rootBreadCrumbAnchorOrAppName} website contains material--text information, publication
|
|
||||||
citations, links, and images--provided by ${copyrightAnchor} and by various
|
|
||||||
third parties, both individuals and organizations, commercial and otherwise. The use of this material
|
|
||||||
is protected by copyright and unless the terms of use are clearly stated with respect to individual items,
|
|
||||||
users must seek permission from the copyright owner for all uses that are not allowed by fair use and
|
|
||||||
other provisions of the United States Copyright Act.</p>
|
|
||||||
<h3>Disclaimer of Liability:</h3>
|
|
||||||
<p class="normal">${copyrightAnchor} makes no warranty, expressed or implied, including the warranties of merchantability
|
|
||||||
and fitness for a particular purpose, or assumes any legal liability or responsibility for the accuracy,
|
|
||||||
completeness, currency or usefulness of any material displayed or distributed through the
|
|
||||||
${appName} website or represents that its use would not infringe privately owned rights.
|
|
||||||
${copyrightAnchor} disclaims all warranties with regard to the information provided. Any reliance upon such information
|
|
||||||
is at your own risk. In no event will ${copyrightAnchor} be liable to you for any damages or losses whatsoever resulting
|
|
||||||
from or caused by the ${appName} website or its contents.</p>
|
|
||||||
<h3>Disclaimer of Endorsement:</h3>
|
|
||||||
<p class="normal">Reference herein to any specific commercial product, process, or service by trade name,
|
|
||||||
trademark, manufacturer, or otherwise, does not necessarily constitute or imply its endorsement or recommendation
|
|
||||||
by ${copyrightAnchor}. The views and opinions of authors expressed herein do not necessarily state or reflect those of
|
|
||||||
${copyrightAnchor} and shall not be used for advertising or product endorsement purposes.</p>
|
|
||||||
</div> <!-- staticPageBackground -->
|
|
||||||
</div> <!-- content -->
|
|
Loading…
Add table
Reference in a new issue