litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[VIVO-1251] Special chars in property group names

Browse source
This commit is contained in:
Graham Triggs 2016-07-07 08:21:12 +01:00
parent 809644f4b8
commit f954fdbde4
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-property-group-menus.ftl
View file

@ -19,7 +19,7 @@
<#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="#${groupnameHtmlId?replace("/","-")}" title="${i18n().group_name}">${groupname?capitalize}</a></li>
<li role="listitem"><a href="#${groupnameHtmlId}" title="${i18n().group_name}">${groupname?capitalize}</a></li>
</#if>
</#if>
</#list>
@ -44,7 +44,7 @@
<#if groupName?has_content>
<#--the function replaces spaces in the name with underscores, also called for the property group menu-->
<#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
<h2 id="${groupNameHtmlId?replace("/","-")}">${groupName?capitalize}</h2>
<h2 id="${groupNameHtmlId}">${groupName?capitalize}</h2>
<#else>
<h2 id="properties">${i18n().properties_capitalized}</h2>
</#if>

6
webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl
View file

@ -334,6 +334,10 @@ name will be used as the label. -->
<#--Property group names may have spaces in them, replace spaces with underscores for html id/hash-->
<#function createPropertyGroupHtmlId propertyGroupName>
<#return propertyGroupName?replace(" ", "_")>
<#local groupName = propertyGroupName?replace(" ", "_")>
<#local groupName = groupName?replace("/", "-slash-")>
<#local groupName = groupName?replace(",", "-comma-")>
<#local groupName = groupName?replace("&", "-and-")>
<#return groupName>
</#function>