fixes for list view and project participant entry form

vivo-project · Oct 7, 2024 · c831df0 · c831df0
1 parent cdfd672
commit c831df0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/...c/main/webapp/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl b/...c/main/webapp/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
@@ -17,10 +17,10 @@
     <#local linkedIndividual>
         <#if statement.indivInRole??>
     		<#if statement.vSubclass?? && statement.vSubclass?contains("vcard")>
-				<#if statement.indivLabel?replace(" ","")?length == statement.indivLabel?replace(" ","")?last_index_of(",") + 1 >
-        			${statement.indivLabel?replace(",","")}
+				<#if statement.indivLabel!?replace(" ","")?length == statement.indivLabel!?replace(" ","")?last_index_of(",") + 1 >
+        			${statement.indivLabel!?replace(",","")}
 				<#else>
-					${statement.indivLabel}
+					${statement.indivLabel!}
 				</#if>
     		<#else>
         			<a href="${profileUrl(statement.uri("indivInRole"))}" title="${i18n().name}">${statement.indivLabel!statement.indivName}</a>

diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/projectHasParticipant.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/projectHasParticipant.ftl
@@ -113,13 +113,13 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
             <input  size="30"  type="text" id="firstName" name="firstName" value="${firstNameValue}" ><br />
             <input type="hidden" id="lastName" name="lastName" value="">
             <input class="display" type="hidden" acGroupName="person" id="personDisplay" name="personLabelDisplay" value="${personLabelDisplayValue}" >
-            <div>
-                <p>${i18n().select_type} ${requiredHint}</p>
-                <input type="radio" id="createVCard" class="radiotypes" name="createVCard" value="n3-pattern:create-vcard-instance"/>
-                <label class="inline" for="createVCard" >${i18n().vcard}</label>
-                <input type="radio" id="createPersonInstance" class="radiotypes" name="createPersonInstance" value="n3-pattern:create-person-instance" checked />
-                <label class="inline" for="createPersonInstance" >${i18n().person_capitalized}</label>
-            </div>
+            <br>
+            <span>${i18n().select_type} ${requiredHint}</span><br>
+            <input type="radio" id="createVCard" class="radiotypes" name="createVCard" value="n3-pattern:create-vcard-instance"/>
+            <label class="inline" for="createVCard" >${i18n().vcard}</label>
+            <input type="radio" id="createPersonInstance" class="radiotypes" name="createPersonInstance" value="n3-pattern:create-person-instance" checked />
+            <label class="inline" for="createPersonInstance" >${i18n().person_capitalized}</label>
+
     </p>
 
     <div class="acSelection" acGroupName="person">