Moved vivo-basic theme jsps out of themes into productMods, to make them less easily accessible to theme customizers.

This commit is contained in:
rjy7 2010-05-17 19:30:26 +00:00
parent a6722233aa
commit 015ee4c448
6 changed files with 43 additions and 61 deletions

View file

@ -1,5 +1,7 @@
<%-- $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$ --%>
<%-- DO NOT MODIFY THIS FILE. IT IS NOT USED IN THEME CUSTOMIZATION. --%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.FreeMarkerHttpServlet" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.FreeMarkerHttpServlet" %>
<% <%
// If the request was for a jsp rather than a servlet, we didn't get these yet. // If the request was for a jsp rather than a servlet, we didn't get these yet.

View file

@ -1,5 +1,7 @@
<%-- $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$ --%>
<%-- DO NOT MODIFY THIS FILE. IT IS NOT USED IN THEME CUSTOMIZATION. --%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.FreeMarkerHttpServlet" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.FreeMarkerHttpServlet" %>
<% <%
// If the request was for a jsp rather than a servlet, we didn't get these yet. // If the request was for a jsp rather than a servlet, we didn't get these yet.
@ -10,3 +12,4 @@
%> %>
${ftl_identity} ${ftl_identity}

View file

@ -1,5 +1,7 @@
<%-- $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$ --%>
<%-- DO NOT MODIFY THIS FILE. IT IS NOT USED IN THEME CUSTOMIZATION. --%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.web.BreadCrumbsUtil" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.web.BreadCrumbsUtil" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.FreeMarkerHttpServlet" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.FreeMarkerHttpServlet" %>
<% <%

View file

@ -23,7 +23,7 @@
<li><a title="log in to manage this site" href="${urls.login}">Log in</a></li>, <li><a title="log in to manage this site" href="${urls.login}">Log in</a></li>,
</#if> </#if>
<li><a href="${urls.about}$">About</a></li>, <li><a href="${urls.about}">About</a></li>,
<#if urls.contact??> <#if urls.contact??>
<li><a href="${urls.contact}">Contact Us</a></li> <li><a href="${urls.contact}">Contact Us</a></li>
</#if> </#if>

View file

@ -0,0 +1,34 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#include "/components/doctype.html">
<#include "/components/head.ftl">
<body>
<div id="wrap" class="container">
<div id="header">
<#include "/components/identity.ftl">
<#-- Note to UI team: do not change this div without also making the corresponding change in menu.jsp -->
<div id="navAndSearch" class="block">
<#include "/components/menu.ftl">
<#include "/components/search.ftl">
</div> <!-- navAndSearch -->
<#-- <#include "/components/breadcrumbs.ftl"> -->
</div> <!-- header -->
<hr class="hidden" />
<div id="contentwrap">
<div id="content" <#if contentClass??> class="${contentClass}" </#if>>
${body}
</div> <!-- content -->
</div> <!-- contentwrap -->
<#include "/components/footer.ftl">
</div> <!-- wrap -->
</body>
</html>

View file

@ -1,59 +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}'/>
<c:set var='imageDir' value='images' />
<div id="dashboard"<c:if test="${showCuratorEdits}"> class="loggedIn"</c:if>>
<c:if test="${!empty entity.imageThumb}">
<c:if test="${!empty entity.imageFile}">
<c:url var="imageUrl" value="${imageDir}/${entity.imageFile}" />
<a class="image" href="${imageUrl}">
</c:if>
<c:url var="imageSrc" value='${imageDir}/${entity.imageThumb}'/>
<img class="headshot" src="<c:out value="${imageSrc}"/>" title="click to view larger image in new window" alt="" width="150"/>
<c:if test="${!empty entity.imageFile}"></a></c:if>
<c:if test="${!empty entity.citation}"><div class="citation">${entity.citation}</div></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>