From c4091eaa1f24f12fd7ae221341cfbf95e1d0b6c6 Mon Sep 17 00:00:00 2001
From: hjkhjk54 <hjkhjk54@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 23 Feb 2012 18:15:04 +0000
Subject: [PATCH] Changes for NIHVIVO-3629: removing spaces in the href links
 and ids for property groups and replacing them with underscores.

---
 .../body/partials/individual/individual-properties.ftl      | 4 +++-
 .../partials/individual/individual-propertyGroupMenu.ftl    | 6 ++++--
 webapp/web/templates/freemarker/lib/lib-properties.ftl      | 4 ++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
index fc322ab25..4a341d795 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
@@ -16,7 +16,9 @@
         
         <#-- Display the group heading --> 
         <#if groupName?has_content>
-            <h2 id="${groupName}">${groupName?capitalize}</h2>
+    		<#--the function replaces spaces in the name with underscores, also called for the property group menu-->
+        	<#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
+            <h2 id="${groupNameHtmlId}">${groupName?capitalize}</h2>
         <#else>
             <h2 id="properties">Properties</h2>
         </#if>
diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-propertyGroupMenu.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-propertyGroupMenu.ftl
index 04fec93b7..a7b7bf618 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/individual-propertyGroupMenu.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/individual-propertyGroupMenu.ftl
@@ -12,11 +12,13 @@
             <nav id="property-group-menu" role="navigation">
                 <ul role="list">
                     <#list groups as group>
-                        <#assign groupname = group.getName(nameForOtherGroup)>
+                        <#assign groupname = group.getName(nameForOtherGroup)>                        
                         <#if groupname?has_content>
+                    		<#--create property group html id is the function that will replace all spaces with underscore to make a valid id-->
+                        	<#assign groupnameHtmlId = p.createPropertyGroupHtmlId(groupname) >
                             <#-- capitalize will capitalize each word in the name; cap_first only the first. We may need a custom
                             function to capitalize all except function words. -->
-                            <li role="listitem"><a href="#${groupname}" title="group name">${groupname?capitalize}</a></li>
+                            <li role="listitem"><a href="#${groupnameHtmlId}" title="group name">${groupname?capitalize}</a></li>
                         </#if>
                     </#list>
                 </ul>
diff --git a/webapp/web/templates/freemarker/lib/lib-properties.ftl b/webapp/web/templates/freemarker/lib/lib-properties.ftl
index d5f645034..e6b0643d2 100644
--- a/webapp/web/templates/freemarker/lib/lib-properties.ftl
+++ b/webapp/web/templates/freemarker/lib/lib-properties.ftl
@@ -228,4 +228,8 @@ name will be used as the label. -->
     </#list>
 </#macro>
 
+<#--Property group names may have spaces in them, replace spaces with underscores for html id/hash-->
+<#function createPropertyGroupHtmlId propertyGroupName>
+	<#return propertyGroupName?replace(" ", "_")>
+</#function>