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

NIHVIVO-2449 Remove vitro:moniker from individual profile, and display preferredTitle instead, falling back to mostSpecificTypes.

Browse source
This commit is contained in:
ryounes 2011-07-06 17:09:55 +00:00
parent fface83a87
commit f344c92dff
4 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
View file

@ -73,13 +73,24 @@
<#-- Label --> <#-- Label -->
<@p.label individual editable /> <@p.label individual editable />
<#-- Most-specific types --> <#-- Display preferredTitle if it exists; otherwise mostSpecificTypes -->
<@p.mostSpecificTypes individual /> <#assign title = propertyGroups.pullProperty("${core}preferredTitle")!>
<#if title?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<@p.addLinkWithLabel title editable />
<#list title.statements as statement>
<span class="display-title">${statement.value}</span>
<@p.editingLinks "${title.name}" statement editable />
</#list>
</#if>
<#-- If preferredTitle is unpopulated, display mostSpecificTypes -->
<#if ! (title.statements)?has_content>
<@p.mostSpecificTypes individual />
</#if>
</h1> </h1>
</#if> </#if>
<#-- Positions --> <#-- Positions -->
<#assign positions = propertyGroups.getPropertyAndRemoveFromList("${core}personInPosition")!> <#assign positions = propertyGroups.pullProperty("${core}personInPosition")!>
<#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<@p.objectPropertyListing positions editable /> <@p.objectPropertyListing positions editable />
</#if> </#if>
@ -89,7 +100,7 @@
<#include "individual-overview.ftl"> <#include "individual-overview.ftl">
<#-- Research Areas --> <#-- Research Areas -->
<#assign researchAreas = propertyGroups.getPropertyAndRemoveFromList("${core}hasResearchArea")!> <#assign researchAreas = propertyGroups.pullProperty("${core}hasResearchArea")!>
<#if researchAreas?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <#if researchAreas?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<@p.objectPropertyListing researchAreas editable /> <@p.objectPropertyListing researchAreas editable />
</#if> </#if>

4
productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl
View file

@ -9,7 +9,7 @@
<@emailLinks "${core}email" /> <@emailLinks "${core}email" />
<#-- Phone --> <#-- Phone -->
<#assign phone = propertyGroups.getPropertyAndRemoveFromList("${core}phoneNumber")!> <#assign phone = propertyGroups.pullProperty("${core}phoneNumber")!>
<#if phone?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <#if phone?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<@p.addLinkWithLabel phone editable /> <@p.addLinkWithLabel phone editable />
<#if phone.statements?has_content> <#-- if there are any statements --> <#if phone.statements?has_content> <#-- if there are any statements -->
@ -25,7 +25,7 @@
</#if> </#if>
<#macro emailLinks property> <#macro emailLinks property>
<#assign email = propertyGroups.getPropertyAndRemoveFromList(property)!> <#assign email = propertyGroups.pullProperty(property)!>
<#if property == "${core}primaryEmail"> <#if property == "${core}primaryEmail">
<#local listId = "primary-email"> <#local listId = "primary-email">
<#local label = "Primary Email"> <#local label = "Primary Email">

2
productMods/templates/freemarker/body/partials/individual/individual-overview.ftl
View file

@ -10,7 +10,7 @@
<div class="overview-value"> <div class="overview-value">
${statement.value} ${statement.value}
</div> </div>
<@p.editingLinks "${overview.localName}" statement editable /> <@p.editingLinks "${overview.name}" statement editable />
</div> </div>
</#list> </#list>
</#if> </#if>

4
themes/wilma/css/wilma.css
View file

@ -1190,7 +1190,7 @@ nav#alpha-browse-container {
font-size: 1.375em; font-size: 1.375em;
color: #2485ae; color: #2485ae;
} }
#individual-intro span.most-specific-type { #individual-intro span.display-title {
font-size: .825em; font-size: .825em;
color: #5e6363; color: #5e6363;
border-left: 1px solid #A6B1B0; border-left: 1px solid #A6B1B0;
@ -1260,7 +1260,7 @@ ul.individual-urls-people li a {
color: #2485ae; color: #2485ae;
line-height: 1.3em; line-height: 1.3em;
} }
h1.fn .most-specific-type { h1.fn .display-title {
font-size: .825em; font-size: .825em;
color: #5e6363; color: #5e6363;
border-left: 1px solid #a6b1b0; border-left: 1px solid #a6b1b0;