From 5b25d9218108636b712baaa7b41e28ddbc83e968 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 8 Sep 2010 20:37:26 +0000
Subject: [PATCH] Initial work moving individual profile page to Freemarker.
 Includes temporary servlet mappings for new Freemarker page. Allow adding
 script tags to the page head element.

---
 productMods/WEB-INF/web.xml      | 24 ++++++++++++++++++++++++
 themes/vivo-basic/css/entity.css |  6 +-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index 9d1f03e3..eb23a810 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -1050,6 +1050,11 @@
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.EntityController</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>individual</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualController</servlet-class>
+  </servlet>
+  
   <servlet>
     <servlet-name>updateEntityFlags</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.UpdateEntityFlagServlet</servlet-class>
@@ -1198,6 +1203,7 @@
     <servlet-name>mailusers</servlet-name>
     <url-pattern>/mailusers</url-pattern>
   </servlet-mapping>
+  
   <servlet-mapping>
     <servlet-name>entity</servlet-name>
     <url-pattern>/entity</url-pattern>
@@ -1214,6 +1220,24 @@
     <servlet-name>entity</servlet-name>
     <url-pattern>/display/*</url-pattern>
   </servlet-mapping>
+    
+  <servlet-mapping>
+    <servlet-name>individual</servlet-name>
+    <url-pattern>/entityfm</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>individual</servlet-name>
+    <url-pattern>/entityfm/*</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>individual</servlet-name>
+    <url-pattern>/individualfm/*</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>individual</servlet-name>
+    <url-pattern>/displayfm/*</url-pattern>
+  </servlet-mapping>    
+
   <servlet-mapping>
     <servlet-name>updateEntityFlags</servlet-name>
     <url-pattern>/updateEntityFlags</url-pattern>
diff --git a/themes/vivo-basic/css/entity.css b/themes/vivo-basic/css/entity.css
index f71f9deb..44393530 100644
--- a/themes/vivo-basic/css/entity.css
+++ b/themes/vivo-basic/css/entity.css
@@ -1,11 +1,7 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
 /*************************************************
- vivo-basic theme: entity page styles
+ vivo-basic theme: individual profile page styles
  
- This document is included by EntityController
- 
- Original version
- 2009-05-05 mw542
 **************************************************/