From cea493de326ad6971c065c238e355912ec30b522 Mon Sep 17 00:00:00 2001
From: nac26 <nac26@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 23 Dec 2010 15:05:03 +0000
Subject: [PATCH] Moved call for individual.css and menupages.css to respective
 templates now that controllers are in place

---
 .../web/templates/freemarker/body/individual/individual.ftl | 6 ++----
 .../body/menupage/menupage--classgroup-people.ftl           | 1 +
 webapp/web/templates/freemarker/body/menupage/menupage.ftl  | 4 +++-
 .../web/templates/freemarker/page/partials/stylesheets.ftl  | 2 --
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/webapp/web/templates/freemarker/body/individual/individual.ftl b/webapp/web/templates/freemarker/body/individual/individual.ftl
index b2f0fc6c9..3d7ea07e5 100644
--- a/webapp/web/templates/freemarker/body/individual/individual.ftl
+++ b/webapp/web/templates/freemarker/body/individual/individual.ftl
@@ -123,7 +123,7 @@
     <p id="keywords">Keywords: ${individual.keywordString}</p>
 </#if>
 
-${stylesheets.addFromTheme("/css/entity.css")}
+${stylesheets.add("/css/individual/individual.css")}
                            
 <#-- RY Figure out which of these scripts really need to go into the head, and which are needed at all (e.g., tinyMCE??) -->
 ${headScripts.add("/js/jquery_plugins/getUrlParam.js",                  
@@ -135,6 +135,4 @@ ${headScripts.add("/js/jquery_plugins/getUrlParam.js",
                   "http://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D",
                   "/js/toggle.js")}
                   
-${scripts.add("/js/imageUpload/imageUploadUtils.js")}
-
-
+${scripts.add("/js/imageUpload/imageUploadUtils.js")}
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/menupage/menupage--classgroup-people.ftl b/webapp/web/templates/freemarker/body/menupage/menupage--classgroup-people.ftl
index bf5bf0494..fbb1f3e34 100644
--- a/webapp/web/templates/freemarker/body/menupage/menupage--classgroup-people.ftl
+++ b/webapp/web/templates/freemarker/body/menupage/menupage--classgroup-people.ftl
@@ -131,3 +131,4 @@
     </section>    
 </section>
 
+${stylesheets.add("/css/menupage/menupage.css")}
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/menupage/menupage.ftl b/webapp/web/templates/freemarker/body/menupage/menupage.ftl
index c44d63960..0abc07705 100644
--- a/webapp/web/templates/freemarker/body/menupage/menupage.ftl
+++ b/webapp/web/templates/freemarker/body/menupage/menupage.ftl
@@ -79,4 +79,6 @@
         <article class="vcard individual" role="article"><h1 class="fn">&lt;individualName&gt;</h1></article>
         <article class="vcard individual" role="article"><h1 class="fn">&lt;individualName&gt;</h1></article>
     </section>
-</section>
\ No newline at end of file
+</section>
+
+${stylesheets.add("/css/menupage/menupage.css")}
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/page/partials/stylesheets.ftl b/webapp/web/templates/freemarker/page/partials/stylesheets.ftl
index de99d2ccb..3d35e8df9 100644
--- a/webapp/web/templates/freemarker/page/partials/stylesheets.ftl
+++ b/webapp/web/templates/freemarker/page/partials/stylesheets.ftl
@@ -1,7 +1,5 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 <#-- Template for loading stylesheets in the head -->
 ${stylesheets.add("/css/edit.css")} <#--temporary until edit controller can include this when needed -->
-${stylesheets.add("/css/menupage/menupage.css")}
-${stylesheets.add("/css/individual/individual.css")}
 
 ${stylesheets.tags}
\ No newline at end of file