diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css b/webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css index 887597a8..4c0b045a 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css +++ b/webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css @@ -146,4 +146,12 @@ ul#individual-personInPosition li { ul#individual-personInPosition li:last-child { padding-bottom: 5px; +} + +section.vcard { + float: left; +} + +section#preferredTitle { + float: left; } \ No newline at end of file diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl index 145748bb..86805168 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl +++ b/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl @@ -53,29 +53,32 @@
-

- <#-- Label --> - <@p.label individual editable labelCount localesCount/> - - <#-- Display preferredTitle if it exists; otherwise mostSpecificTypes --> - <#assign title = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#Title")!> - <#if title?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> - <#if (title.statements?size < 1) > - <@p.addLinkWithLabel title editable /> - <#elseif editable> -

${title.name?capitalize!}

- <@p.verboseDisplay title /> +
+

+ <#-- Label --> + <@p.label individual editable labelCount localesCount/> +

+
+ <#-- Display preferredTitle if it exists; otherwise mostSpecificTypes --> + <#assign title = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#Title")!> + <#if title?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> + <#if (title.statements?size < 1) > + <@p.addLinkWithLabel title editable /> + <#elseif editable> +

${title.name?capitalize!}

+ <@p.verboseDisplay title /> + + <#list title.statements as statement> + ${statement.preferredTitle} + <@p.editingLinks "${title.localName}" "${title.name}" statement editable title.rangeUri /> + - <#list title.statements as statement> - ${statement.preferredTitle} - <@p.editingLinks "${title.localName}" "${title.name}" statement editable title.rangeUri /> - - - <#-- If preferredTitle is unpopulated, display mostSpecificTypes --> - <#if ! (title.statements)?has_content> - <@p.mostSpecificTypes individual /> - - + <#-- If preferredTitle is unpopulated, display mostSpecificTypes --> + <#if ! (title.statements)?has_content> + <@p.mostSpecificTypes individual /> + +
+
${i18n().uri_icon} <#if checkNamesResult?has_content > diff --git a/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl b/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl index b01c531d..3a9dab46 100644 --- a/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl +++ b/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl @@ -73,12 +73,13 @@

<#-- Label --> <@p.label individual editable labelCount localesCount/> - +

+
<#-- Display preferredTitle if it exists; otherwise mostSpecificTypes --> <#assign title = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#Title")!> <#if title?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <#if (title.statements?size < 1) > - <@p.addLinkWithLabel title editable /> + <@p.addLinkWithLabel title editable /> <#elseif editable>

${title.name?capitalize!}

<@p.verboseDisplay title /> @@ -91,8 +92,8 @@ <#-- If preferredTitle is unpopulated, display mostSpecificTypes --> <#if ! (title.statements)?has_content> <@p.mostSpecificTypes individual /> - - + +
<#include "individual-positions.ftl">