From 015ee4c448aa72b70a7b7f2fd0b35dbda8d0c01a Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 17 May 2010 19:30:26 +0000
Subject: [PATCH] Moved vivo-basic theme jsps out of themes into productMods,
 to make them less easily accessible to theme customizers.

---
 .../themes}/vivo-basic/jsp/footer.jsp         |  4 +-
 .../themes}/vivo-basic/jsp/identity.jsp       |  3 +
 .../themes}/vivo-basic/jsp/menu.jsp           |  2 +
 themes/vivo-basic/ftl/components/identity.ftl |  2 +-
 themes/vivo-basic/ftl/page/default.ftl        | 34 +++++++++++
 themes/vivo-basic/jsp/dashboard.jsp           | 59 -------------------
 6 files changed, 43 insertions(+), 61 deletions(-)
 rename {themes => productMods/themes}/vivo-basic/jsp/footer.jsp (86%)
 rename {themes => productMods/themes}/vivo-basic/jsp/identity.jsp (86%)
 rename {themes => productMods/themes}/vivo-basic/jsp/menu.jsp (91%)
 create mode 100644 themes/vivo-basic/ftl/page/default.ftl
 delete mode 100644 themes/vivo-basic/jsp/dashboard.jsp

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 @@
                  <li><a title="log in to manage this site" href="${urls.login}">Log in</a></li>,
             </#if> 
             
-            <li><a href="${urls.about}$">About</a></li>,
+            <li><a href="${urls.about}">About</a></li>,
             <#if urls.contact??>
                 <li><a href="${urls.contact}">Contact Us</a></li>
             </#if> 
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">
+
+<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>
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"%>
-
-<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>
\ No newline at end of file