From 7be66f9748e42ccf4c72190d4e23d7ac5d733343 Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Fri, 20 Dec 2013 13:27:21 -0500
Subject: [PATCH] encode urls being used as parameters

---
 .../individual-affiliated-departments.ftl     | 70 ++++++++--------
 .../individual-affiliated-research-areas.ftl  | 80 +++++++++----------
 2 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/productMods/templates/freemarker/body/partials/individual/individual-affiliated-departments.ftl b/productMods/templates/freemarker/body/partials/individual/individual-affiliated-departments.ftl
index 59a6f9b8..7370afdc 100644
--- a/productMods/templates/freemarker/body/partials/individual/individual-affiliated-departments.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/individual-affiliated-departments.ftl
@@ -1,35 +1,35 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#if departmentsResults?has_content>
-    <#-- is strictly a usability issue so we can refer accurately to "faculty members" within the dept.     -->
-    <#assign urlForDetailsPage = "affiliatedDepartments" />
-    <#assign headingText = "${i18n().affiliated_departments}" />
-        <h2 id="facultyResearchAreas" class="mainPropGroup">
-            ${headingText} 
-        </h2>
-        <ul id="individual-hasResearchArea" role="list">
-            <#assign moreDisplayed = false>
-            <#list departmentsResults as resultRow>
-		            <li class="raLink">
-		            <a class="raLink"  href="${urls.base}/${urlForDetailsPage}?orgURI=${resultRow["dept"]}&raURI=${individual.uri}" title="${i18n().organization}">
-		                ${resultRow["deptLabel"]}
-		            </a>
-		        </li>
-            </#list>
-        </ul>    
-</#if>
-<script>
-$('a#raMore').click(function() {
-    $('li.raLinkMore').each(function() {
-        $(this).show();
-    });
-    $('li#raMoreContainer').hide();
-    $('li#raLessContainer').show();
-});
-$('a#raLess').click(function() {
-    $('li.raLinkMore').each(function() {
-        $(this).hide();
-    });
-    $('li#raMoreContainer').show();
-    $('li#raLessContainer').hide();
-});
-</script>
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+<#if departmentsResults?has_content>
+    <#-- is strictly a usability issue so we can refer accurately to "faculty members" within the dept.     -->
+    <#assign urlForDetailsPage = "affiliatedDepartments" />
+    <#assign headingText = "${i18n().affiliated_departments}" />
+        <h2 id="facultyResearchAreas" class="mainPropGroup">
+            ${headingText} 
+        </h2>
+        <ul id="individual-hasResearchArea" role="list">
+            <#assign moreDisplayed = false>
+            <#list departmentsResults as resultRow>
+		            <li class="raLink">
+		            <a class="raLink"  href="${urls.base}/${urlForDetailsPage}?orgURI=${resultRow["dept"]?url}&raURI=${individual.uri?url}" title="${i18n().organization}">
+		                ${resultRow["deptLabel"]}
+		            </a>
+		        </li>
+            </#list>
+        </ul>    
+</#if>
+<script>
+$('a#raMore').click(function() {
+    $('li.raLinkMore').each(function() {
+        $(this).show();
+    });
+    $('li#raMoreContainer').hide();
+    $('li#raLessContainer').show();
+});
+$('a#raLess').click(function() {
+    $('li.raLinkMore').each(function() {
+        $(this).hide();
+    });
+    $('li#raMoreContainer').show();
+    $('li#raLessContainer').hide();
+});
+</script>
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-affiliated-research-areas.ftl b/productMods/templates/freemarker/body/partials/individual/individual-affiliated-research-areas.ftl
index d0a3ab8a..aa76a095 100644
--- a/productMods/templates/freemarker/body/partials/individual/individual-affiliated-research-areas.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/individual-affiliated-research-areas.ftl
@@ -1,40 +1,40 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#if researchAreaResults?has_content>
-    <#-- If the organization is an Academic Department, we use a different datagetter and detail page. This -->
-    <#-- is strictly a usability issue so we can refer accurately to "faculty members" within the dept.     -->
-    <#assign urlForDetailsPage = "affiliatedResearchAreas" />
-    <#assign headingText = "${i18n().affiliated_research_areas}" />
-    <#if individual.mostSpecificTypes?seq_contains("Academic Department")>
-        <#assign urlForDetailsPage = "deptResearchAreas" />
-        <#assign headingText = "${i18n().faculty_research_areas}" />
-    </#if>
-        <h2 id="facultyResearchAreas" class="mainPropGroup">
-            ${headingText} 
-        </h2>
-        <ul id="individual-hasResearchArea" role="list">
-            <#assign moreDisplayed = false>
-            <#list researchAreaResults as resultRow>
-		            <li class="raLink">
-		            <a class="raLink"  href="${urls.base}/${urlForDetailsPage}?orgURI=${individual.uri}&raURI=${resultRow["ra"]}" title="${i18n().research_area}">
-		                ${resultRow["raLabel"]}
-		            </a>
-		        </li>
-            </#list>
-        </ul>    
-</#if>
-<script>
-$('a#raMore').click(function() {
-    $('li.raLinkMore').each(function() {
-        $(this).show();
-    });
-    $('li#raMoreContainer').hide();
-    $('li#raLessContainer').show();
-});
-$('a#raLess').click(function() {
-    $('li.raLinkMore').each(function() {
-        $(this).hide();
-    });
-    $('li#raMoreContainer').show();
-    $('li#raLessContainer').hide();
-});
-</script>
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+<#if researchAreaResults?has_content>
+    <#-- If the organization is an Academic Department, we use a different datagetter and detail page. This -->
+    <#-- is strictly a usability issue so we can refer accurately to "faculty members" within the dept.     -->
+    <#assign urlForDetailsPage = "affiliatedResearchAreas" />
+    <#assign headingText = "${i18n().affiliated_research_areas}" />
+    <#if individual.mostSpecificTypes?seq_contains("Academic Department")>
+        <#assign urlForDetailsPage = "deptResearchAreas" />
+        <#assign headingText = "${i18n().faculty_research_areas}" />
+    </#if>
+        <h2 id="facultyResearchAreas" class="mainPropGroup">
+            ${headingText} 
+        </h2>
+        <ul id="individual-hasResearchArea" role="list">
+            <#assign moreDisplayed = false>
+            <#list researchAreaResults as resultRow>
+		            <li class="raLink">
+		            <a class="raLink"  href="${urls.base}/${urlForDetailsPage}?orgURI=${individual.uri?url}&raURI=${resultRow["ra"]?url}" title="${i18n().research_area}">
+		                ${resultRow["raLabel"]}
+		            </a>
+		        </li>
+            </#list>
+        </ul>    
+</#if>
+<script>
+$('a#raMore').click(function() {
+    $('li.raLinkMore').each(function() {
+        $(this).show();
+    });
+    $('li#raMoreContainer').hide();
+    $('li#raLessContainer').show();
+});
+$('a#raLess').click(function() {
+    $('li.raLinkMore').each(function() {
+        $(this).hide();
+    });
+    $('li#raMoreContainer').show();
+    $('li#raLessContainer').hide();
+});
+</script>