From 4a3bc7d0922f1ded7a27a88be73d81c1a5225e4c Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 18 Nov 2010 00:46:04 +0000
Subject: [PATCH] Added ${url.base} to template model so templates can build
 urls. Modified templates accordingly to replace ${url.home} with {$url.base}.
 Also replaced ${url.base}/images with ${url.images}. Added scripts and
 stylesheets to personHasEducationalTraining.ftl.

---
 .../freemarker/FreemarkerHttpServlet.java     |  5 +++-
 .../controller/freemarker/UrlBuilder.java     |  5 ++++
 .../individual/individual--foaf-person.ftl    | 16 +++++-----
 .../menupage/menupage--classgroup-people.ftl  | 30 +++++++++----------
 .../freemarker/body/menupage/menupage.ftl     |  2 +-
 5 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
index bef8115ea..c6e8d3771 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
@@ -301,6 +301,9 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
         Map<String, String> urls = new HashMap<String, String>();
         
         urls.put("home", urlBuilder.getHomeUrl());
+        
+        // Templates use this to construct urls.
+        urls.put("base", urlBuilder.contextPath);
 
         urls.put("about", urlBuilder.getPortalUrl(Route.ABOUT));
         if (ContactMailServlet.getSmtpHostFromProperties() != null) {
@@ -311,7 +314,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
         urls.put("login", urlBuilder.getPortalUrl(Route.LOGIN));          
         urls.put("logout", urlBuilder.getLogoutUrl());       
         urls.put("siteAdmin", urlBuilder.getPortalUrl(Route.SITE_ADMIN));  
-        urls.put("siteIcons", urlBuilder.getPortalUrl(themeDir + "/site_icons"));
+        urls.put("siteIcons", urlBuilder.getPortalUrl(themeDir + "/site_icons")); // deprecated
         urls.put("themeImages", urlBuilder.getPortalUrl(themeDir + "/images"));
         urls.put("images", urlBuilder.getUrl("/images"));
         urls.put("theme", urlBuilder.getUrl(themeDir));
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
index 48bce63c5..0b8d30096 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
@@ -115,6 +115,11 @@ public class UrlBuilder {
         return getUrl(path);
     }
     
+    // Used by templates to build urls.
+    public String getBaseUrl() {
+        return contextPath;
+    }
+    
     public String getLogoutUrl() {
         return getPortalUrl(Route.LOGOUT, new ParamMap("loginSubmitMode", "Log Out"));
     }
diff --git a/webapp/web/templates/freemarker/body/individual/individual--foaf-person.ftl b/webapp/web/templates/freemarker/body/individual/individual--foaf-person.ftl
index 6cc03b1bf..a8345cc3f 100644
--- a/webapp/web/templates/freemarker/body/individual/individual--foaf-person.ftl
+++ b/webapp/web/templates/freemarker/body/individual/individual--foaf-person.ftl
@@ -1,7 +1,7 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
 <section id="individual-intro-person" class="vcard">
-    <div id="individual-intro-left-content"> <img class="individual-photo2" src="${urls.home}/images/individual/individual--foaf-person.png" /><!-- mb863 get rid off div-->
+    <div id="individual-intro-left-content"> <img class="individual-photo2" src="${urls.images}/individual/individual--foaf-person.png" /><!-- mb863 get rid off div-->
         <nav>
             <ul id ="individual-tools-people">
                 <li><a class="picto-font  picto-uri" href="#">j</a></li>
@@ -11,7 +11,7 @@
             </ul>
         </nav>
         
-        <a class="email" href="#"><span class ="picto-font  picto-email">M</span> email@cornell.edu</a> <a class="tel" href="#"><img class ="icon-phone" src="${urls.home}/images/individual/phone-icon.gif" />555 567 7878</a>
+        <a class="email" href="#"><span class ="picto-font  picto-email">M</span> email@cornell.edu</a> <a class="tel" href="#"><img class ="icon-phone" src="${urls.images}/individual/phone-icon.gif" />555 567 7878</a>
         
         <nav>
             <ul id ="individual-urls-people">
@@ -62,12 +62,12 @@
         </header>
         
         <ul>
-            <li><a href="#"><img class="co-author" src="${urls.home}/images/individual/Bacall.jpg" /></a></li>
-            <li><a href="#"><img class="co-author" src="${urls.home}/images/individual/Bogart.jpg" /></a></li>
-            <li><a href="#"><img class="co-author" src="${urls.home}/images/individual/Gable.jpg" /></a></li>
-            <li><a href="#"><img class="co-author" src="${urls.home}/images/individual/Grant.jpg" /></a></li>
-            <li><a href="#"><img class="co-author" src="${urls.home}/images/individual/Leigh.jpg" /></a></li>
-            <li><a href="#"><img class="co-author" src="${urls.home}/images/individual/Welles.jpg" /></a></li>
+            <li><a href="#"><img class="co-author" src="${urls.images}/individual/Bacall.jpg" /></a></li>
+            <li><a href="#"><img class="co-author" src="${urls.images}/individual/Bogart.jpg" /></a></li>
+            <li><a href="#"><img class="co-author" src="${urls.images}/individual/Gable.jpg" /></a></li>
+            <li><a href="#"><img class="co-author" src="${urls.images}/individual/Grant.jpg" /></a></li>
+            <li><a href="#"><img class="co-author" src="${urls.images}/individual/Leigh.jpg" /></a></li>
+            <li><a href="#"><img class="co-author" src="${urls.images}/individual/Welles.jpg" /></a></li>
         </ul>
         
         <p class="view-all-coauthors"><a class="view-all-style" href="#">View All <span class="pictos-arrow-10">4</span></a></p>
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 81e656c42..cc61f9a7e 100644
--- a/webapp/web/templates/freemarker/body/menupage/menupage--classgroup-people.ftl
+++ b/webapp/web/templates/freemarker/body/menupage/menupage--classgroup-people.ftl
@@ -20,7 +20,7 @@
         </nav>
         
         <section id="foaf-person-graph" role="region">
-            <img src="${urls.home}/images/menupage/visual-graph.jpg" alt="" />
+            <img src="${urls.images}/menupage/visual-graph.jpg" alt="" />
         </section>
     </section>
     
@@ -58,19 +58,19 @@
     
         <nav id="profile-photo-display" role = "navigation">
             <ul>
-                <li><img src="${urls.home}/images/menupage/person-thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
-                <li><img src="${urls.home}/images/menupage/person-thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
-                <li><img src="${urls.home}/images/menupage/person-thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
-                <li><img src="${urls.home}/images/menupage/person-thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
-                <li><img src="${urls.home}/images/menupage/person-thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
-                <li><img src="${urls.home}/images/menupage/person-thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
+                <li><img src="${urls.images}/menupage/person-thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
+                <li><img src="${urls.images}/menupage/person-thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
+                <li><img src="${urls.images}/menupage/person-thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
+                <li><img src="${urls.images}/menupage/person-thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
+                <li><img src="${urls.images}/menupage/person-thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
+                <li><img src="${urls.images}/menupage/person-thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" /></li>
             </ul>
         </nav>
         
         <div id="nav-display">
             <p>All</p>
             
-            <a href="#"><img src="${urls.home}/images/menupage/arrow-carousel-people.jpg" alt="" width="44" height="58" /></a> 
+            <a href="#"><img src="${urls.images}/menupage/arrow-carousel-people.jpg" alt="" width="44" height="58" /></a> 
         </div>
     </section>
 </section>
@@ -113,31 +113,31 @@
     <section id="individuals-in-childClass" role="region">
         <h3>B</h3>
         
-        <article class="vcard individual-foaf-person" role="navigation"> <img src="${urls.home}/images/menupage/person-thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" />
+        <article class="vcard individual-foaf-person" role="navigation"> <img src="${urls.images}/menupage/person-thumbnail.jpg" width="90" height="90" alt="foaf:lastName, foaf:firstName" />
             <h1 class="fn"><strong>foaf:lastName, foaf:fisrtName</strong><br>core:preferredTitle <br><span class="org">Albert Mann Library</span></h1>
         </article>
         
-        <article class="vcard individual-foaf-person"  role="navigation"> <img src="${urls.home}/images/menupage/person-thumbnail.jpg" width="90" height="90"  alt="foaf:lastName, foaf:firstName"/>
+        <article class="vcard individual-foaf-person"  role="navigation"> <img src="${urls.images}/menupage/person-thumbnail.jpg" width="90" height="90"  alt="foaf:lastName, foaf:firstName"/>
             <h1 class="fn"><strong>foaf:lastName, foaf:fisrtName</strong><br>core:preferredTitle <br><span class="org">Albert Mann Library</span></h1>
         </article>
         
-        <article class="vcard individual-foaf-person" role="navigation"> <img src="${urls.home}/images/menupage/person-thumbnail.jpg" width="90" height="90"  alt="foaf:lastName, foaf:firstName"/>
+        <article class="vcard individual-foaf-person" role="navigation"> <img src="${urls.images}/menupage/person-thumbnail.jpg" width="90" height="90"  alt="foaf:lastName, foaf:firstName"/>
             <h1 class="fn"><strong>foaf:lastName, foaf:fisrtName</strong><br>core:preferredTitle <br><span class="org">Albert Mann Library</span></h1>
         </article>
         
-        <article class="vcard individual-foaf-person" role="navigation"> <img src="${urls.home}/images/menupage/person-thumbnail.jpg" width="90" height="90"  alt="foaf:lastName, foaf:firstName"/>
+        <article class="vcard individual-foaf-person" role="navigation"> <img src="${urls.images}/menupage/person-thumbnail.jpg" width="90" height="90"  alt="foaf:lastName, foaf:firstName"/>
             <h1 class="fn"><strong>foaf:lastName, foaf:fisrtName</strong><br>core:preferredTitle <br><span class="org">Albert Mann Library</span></h1>
         </article>
         
-        <article class="vcard individual-foaf-person" role="navigation"> <img src="${urls.home}/images/menupage/person-thumbnail.jpg" width="90" height="90"  alt="foaf:lastName, foaf:firstName"/>
+        <article class="vcard individual-foaf-person" role="navigation"> <img src="${urls.images}/menupage/person-thumbnail.jpg" width="90" height="90"  alt="foaf:lastName, foaf:firstName"/>
             <h1 class="fn"><strong>foaf:lastName, foaf:fisrtName</strong><br>core:preferredTitle <br><span class="org">Albert Mann Library</span></h1>
         </article>
         
-        <article class="vcard individual-foaf-person" role="navigation"> <img src="${urls.home}/images/menupage/person-thumbnail.jpg" width="90" height="90"  alt="foaf:lastName, foaf:firstName"/>
+        <article class="vcard individual-foaf-person" role="navigation"> <img src="${urls.images}/menupage/person-thumbnail.jpg" width="90" height="90"  alt="foaf:lastName, foaf:firstName"/>
             <h1 class="fn"><strong>foaf:lastName, foaf:fisrtName</strong><br>core:preferredTitle <br><span class="org">Albert Mann Library</span></h1>
         </article>
         
-        <article class="vcard individual-foaf-person" role="navigation"> <img src="${urls.home}/images/menupage/person-thumbnail.jpg" width="90" height="90"  alt="foaf:lastName, foaf:firstName"/>
+        <article class="vcard individual-foaf-person" role="navigation"> <img src="${urls.images}/menupage/person-thumbnail.jpg" width="90" height="90"  alt="foaf:lastName, foaf:firstName"/>
             <h1 class="fn"><strong>foaf:lastName, foaf:fisrtName</strong><br>core:preferredTitle <br><span class="org">Albert Mann Library</span></h1>
         </article>
     </section>
diff --git a/webapp/web/templates/freemarker/body/menupage/menupage.ftl b/webapp/web/templates/freemarker/body/menupage/menupage.ftl
index 7ed8a62ad..c44d63960 100644
--- a/webapp/web/templates/freemarker/body/menupage/menupage.ftl
+++ b/webapp/web/templates/freemarker/body/menupage/menupage.ftl
@@ -20,7 +20,7 @@
     </nav>
     
     <section id="generic-class-graph" role="region">
-        <img src="${urls.home}/images/menupage/visual-graph-generic-class.jpg" width="500" height="283" alt ="" />
+        <img src="${urls.images}/menupage/visual-graph-generic-class.jpg" width="500" height="283" alt ="" />
     </section>
 </section>