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

Improve html structure for testing

Browse source
This commit is contained in:
Graham Triggs 2017-09-28 13:50:40 +01:00
parent 1ffe30fb4b
commit 7c27b74fd6
3 changed files with 38 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css
View file

@ -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;
}

47
webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl
View file

@ -53,29 +53,32 @@
<div class="col-md-10 person-details">
<div class="row title">
<div class="col-md-12">
<h1 class="vcard foaf-person">
<#-- Label -->
<span itemprop="name" class="fn"><@p.label individual editable labelCount localesCount/></span>
<#-- 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>
<h2>${title.name?capitalize!}</h2>
<@p.verboseDisplay title />
<section class="vcard person">
<h1 class="foaf-person">
<#-- Label -->
<span itemprop="name" class="fn"><@p.label individual editable labelCount localesCount/></span>
</h1>
<section id="preferredTitle">
<#-- 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>
<h2>${title.name?capitalize!}</h2>
<@p.verboseDisplay title />
</#if>
<#list title.statements as statement>
<span itemprop="jobTitle" class="display-title<#if editable>-editable</#if>">${statement.preferredTitle}</span>
<@p.editingLinks "${title.localName}" "${title.name}" statement editable title.rangeUri />
</#list>
</#if>
<#list title.statements as statement>
<span itemprop="jobTitle" class="display-title<#if editable>-editable</#if>">${statement.preferredTitle}</span>
<@p.editingLinks "${title.localName}" "${title.name}" statement editable title.rangeUri />
</#list>
</#if>
<#-- If preferredTitle is unpopulated, display mostSpecificTypes -->
<#if ! (title.statements)?has_content>
<@p.mostSpecificTypes individual />
</#if>
</h1>
<#-- If preferredTitle is unpopulated, display mostSpecificTypes -->
<#if ! (title.statements)?has_content>
<@p.mostSpecificTypes individual />
</#if>
</section>
</section>
<span id="iconControlsRightSide">
<img id="uriIcon" title="${individual.uri}" src="${urls.images}/individual/uriIcon.gif" alt="${i18n().uri_icon}"/>
<#if checkNamesResult?has_content >

9
webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl
View file

@ -73,12 +73,13 @@
<h1 class="foaf-person">
<#-- Label -->
<span itemprop="name" class="fn"><@p.label individual editable labelCount localesCount/></span>
</h1>
<section id="preferredTitle">
<#-- 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>
<h2>${title.name?capitalize!}</h2>
<@p.verboseDisplay title />
@ -91,8 +92,8 @@
<#-- If preferredTitle is unpopulated, display mostSpecificTypes -->
<#if ! (title.statements)?has_content>
<@p.mostSpecificTypes individual />
</#if>
</h1>
</#if>
</section>
</#if>
<!-- Positions -->
<#include "individual-positions.ftl">