diff --git a/themes/vivo-basic/jsp/footer.jsp b/productMods/themes/vivo-basic/jsp/footer.jsp similarity index 86% rename from themes/vivo-basic/jsp/footer.jsp rename to productMods/themes/vivo-basic/jsp/footer.jsp index 0c25ccd7..ce11092a 100644 --- a/themes/vivo-basic/jsp/footer.jsp +++ b/productMods/themes/vivo-basic/jsp/footer.jsp @@ -1,5 +1,7 @@ <%-- $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" %> <% // If the request was for a jsp rather than a servlet, we didn't get these yet. @@ -11,4 +13,4 @@ } %> -${ftl_footer} \ No newline at end of file +${ftl_footer} diff --git a/themes/vivo-basic/jsp/identity.jsp b/productMods/themes/vivo-basic/jsp/identity.jsp similarity index 86% rename from themes/vivo-basic/jsp/identity.jsp rename to productMods/themes/vivo-basic/jsp/identity.jsp index 37550b2b..2990bc2c 100644 --- a/themes/vivo-basic/jsp/identity.jsp +++ b/productMods/themes/vivo-basic/jsp/identity.jsp @@ -1,5 +1,7 @@ <%-- $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" %> <% // If the request was for a jsp rather than a servlet, we didn't get these yet. @@ -10,3 +12,4 @@ %> ${ftl_identity} + diff --git a/themes/vivo-basic/jsp/menu.jsp b/productMods/themes/vivo-basic/jsp/menu.jsp similarity index 91% rename from themes/vivo-basic/jsp/menu.jsp rename to productMods/themes/vivo-basic/jsp/menu.jsp index a76ce52c..df7dd87e 100644 --- a/themes/vivo-basic/jsp/menu.jsp +++ b/productMods/themes/vivo-basic/jsp/menu.jsp @@ -1,5 +1,7 @@ <%-- $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.controller.FreeMarkerHttpServlet" %> <% diff --git a/themes/vivo-basic/ftl/components/identity.ftl b/themes/vivo-basic/ftl/components/identity.ftl index dfb8c0a0..d8d418bc 100644 --- a/themes/vivo-basic/ftl/components/identity.ftl +++ b/themes/vivo-basic/ftl/components/identity.ftl @@ -23,7 +23,7 @@
  • Log in
    • , -
  • About
    • , +
  • About
    • , <#if urls.contact??>
  • Contact Us
    • diff --git a/themes/vivo-basic/ftl/page/default.ftl b/themes/vivo-basic/ftl/page/default.ftl new file mode 100644 index 00000000..802fca58 --- /dev/null +++ b/themes/vivo-basic/ftl/page/default.ftl @@ -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"> + + +
    + + + + +
    +
    class="${contentClass}" > + ${body} +
    +
    + + <#include "/components/footer.ftl"> + +
    + + diff --git a/themes/vivo-basic/jsp/dashboard.jsp b/themes/vivo-basic/jsp/dashboard.jsp deleted file mode 100644 index afd9a99a..00000000 --- a/themes/vivo-basic/jsp/dashboard.jsp +++ /dev/null @@ -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"%> - - - - -<%/* just moving this into page scope for easy use */ %> - - - - -
    class="loggedIn"> - - - - - - - " title="click to view larger image in new window" alt="" width="150"/> - -
    ${entity.citation}
     - - - - - - <%-- unless a value is provided, properties not assigned to a group will not appear on the dashboard --%> - - - -
    \ No newline at end of file