From c3bdcb66766271df8a8bd7e13e8e014fd8c3746c Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Fri, 28 Jun 2013 10:15:32 -0400
Subject: [PATCH] minor change, renamed a variable

---
 .../loadedAtStartup/homePageDataGetters.n3    |  6 +--
 .../freemarker/lib/lib-home-page.ftl          | 52 +++++++++++--------
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/productMods/WEB-INF/ontologies/app/loadedAtStartup/homePageDataGetters.n3 b/productMods/WEB-INF/ontologies/app/loadedAtStartup/homePageDataGetters.n3
index 30f4d155..40a566b8 100644
--- a/productMods/WEB-INF/ontologies/app/loadedAtStartup/homePageDataGetters.n3
+++ b/productMods/WEB-INF/ontologies/app/loadedAtStartup/homePageDataGetters.n3
@@ -20,11 +20,11 @@ display:academicDeptsDataGetter
     PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
     PREFIX vivo: <http://vivoweb.org/ontology/core#>
 
-    SELECT DISTINCT ?deptURI (str(?label) as ?name)
+    SELECT DISTINCT ?theURI (str(?label) as ?name)
     WHERE
     {
-          ?deptURI rdf:type vivo:AcademicDepartment .
-          ?deptURI rdfs:label ?label 
+          ?theURI rdf:type vivo:AcademicDepartment .
+          ?theURI rdfs:label ?label 
     }
     
     """ .
diff --git a/productMods/templates/freemarker/lib/lib-home-page.ftl b/productMods/templates/freemarker/lib/lib-home-page.ftl
index ac2ddd31..d523035b 100644
--- a/productMods/templates/freemarker/lib/lib-home-page.ftl
+++ b/productMods/templates/freemarker/lib/lib-home-page.ftl
@@ -114,28 +114,38 @@
             
 </#macro>
 
-<#-- builds the "research" box on the home page -->
+<#-- Renders the html for the research section on the home page. -->
+<#-- Works in conjunction with the homePageUtils.js file -->
 <#macro researchClasses classGroups=vClassGroups>
-    <#assign foundClassGroup = false />
-    <section id="home-research" class="home-sections">
-        <h4>${i18n().research_capitalized}</h4>
-        <ul>
-            <#list classGroups as group>
-                <#if (group.individualCount > 0) && group.displayName == "research" >
-                    <#assign foundClassGroup = true />
-                    <#list group.classes as class>
-                        <#if (class.name == "Academic Article" || class.name == "Book" || class.name == "Conference Paper" ||class.name == "Media Contribution" || class.name == "Report" || class.name == "Library Collection") && (class.individualCount > 0)>
-                            <li role="listitem"><span>${class.individualCount!}</span>&nbsp;<a href='${urls.base}/individuallist?vclassId=${class.uri?replace("#","%23")!}'>${class.name}s</a></li>
-                        </#if>
-                    </#list>
-                    <li><a href="${urls.base}/research" alt="${i18n().view_all_research}">${i18n().view_all}</a></li>
-                </#if>
-            </#list>
-            <#if !foundClassGroup>
-                <p><li>${i18n().no_research_content_found}</li></p> 
+<#assign foundClassGroup = false />
+<section id="home-research" class="home-sections">
+    <h4>${i18n().research_capitalized}</h4>
+    <ul>
+        <#list classGroups as group>
+            <#if (group.individualCount > 0) && group.displayName == "research" >
+                <#assign foundClassGroup = true />
+                <#list group.classes as class>
+                    <#if (class.individualCount > 0) && (class.name == "Academic Article" || class.name == "Book" || class.name == "Chapter" ||class.name == "Conference Paper" || class.name == "Proceedings" || class.name == "Report") >
+                        <li role="listitem">
+                            <span>${class.individualCount!}</span>&nbsp;
+                            <a href='${urls.base}/individuallist?vclassId=${class.uri?replace("#","%23")!}'>
+                                <#if class.name?substring(class.name?length-1) == "s">
+                                    ${class.name}
+                                <#else>
+                                    ${class.name}s 
+                                </#if>
+                            </a>
+                        </li>
+                    </#if>
+                </#list>
+                <li><a href="${urls.base}/research" alt="${i18n().view_all_research}">${i18n().view_all}</a></li>
             </#if>
-        </ul>
-    </section>
+        </#list>
+        <#if !foundClassGroup>
+            <p><li>${i18n().no_research_content_found}</li></p> 
+        </#if>
+    </ul>
+</section>
 </#macro>
 
 <#-- Renders the html for the academic departments section on the home page. -->
@@ -154,7 +164,7 @@
 var academicDepartments = [
 <#if academicDeptDG?has_content>
     <#list academicDeptDG as resultRow>
-        <#assign uri = resultRow["deptURI"] />
+        <#assign uri = resultRow["theURI"] />
         <#assign label = resultRow["name"] />
         <#assign localName = uri?substring(uri?last_index_of("/")) />
             {"uri": "${localName}", "name": "${label}"}<#if (resultRow_has_next)>,</#if>