This commit is contained in:
tworrall 2013-09-23 09:04:22 -04:00
parent 4047b4e8a9
commit fca87953d2
15 changed files with 804 additions and 736 deletions

View file

@ -54,7 +54,7 @@
<div id="titleContainer"><span class="display-title-not-editable">${statement.value}</span></div>
<#else>
<span class="display-title-editable">${statement.value}</span>
<@p.editingLinks "${title.name}" statement editable />
<@p.editingLinks "${title.name}" "" statement editable />
</#if>
</#list>
</#if>

View file

@ -66,7 +66,7 @@
<div id="titleContainer"><span class="display-title-not-editable">${statement.value}</span></div>
<#else>
<span class="display-title-editable">${statement.value}</span>
<@p.editingLinks "${title.name}" statement editable />
<@p.editingLinks "${title.name}" "" statement editable />
</#if>
</#list>
</#if>

View file

@ -15,7 +15,7 @@
<#macro showRole statement property>
<#local linkedIndividual>
<#if statement?has_content && statement.activity?has_content>
<a href="${profileUrl(statement.uri("activity"))}" title="${i18n().activity_name}">${statement.activityLabel!statement.activityName}</a>
<a href="${profileUrl(statement.uri("activity"))}" title="${i18n().activity_name}">${statement.activityLabel!statement.activityName!}</a>
</#if>
</#local>
@ -24,6 +24,5 @@
</#local>
<#-- If property is collated, then subclass label is redundant information -->
${linkedIndividual} <#if ! property.collatedBySubclass>${statement.subclassLabel!}</#if> ${dateTime!}
${linkedIndividual} <#if ! property.collatedBySubclass>&nbsp;(${statement.subclassLabel!})</#if> ${dateTime!}
</#macro>

View file

@ -1,29 +1,29 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#--Two stage form for service provider role-->
<#--
Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are:
roleDescriptor.
The other required values (roleType, optionsType, objectClassUri, and literalOptions are
set in the JAVA class corresponding to the form, e.g. AddReviewerRoleToPersonGenerator.java.
Optional values can be set, but each of these has default values
set in addRoleToPersonTwoStage.ftl:
buttonText
typeSelectorLabel
numDateFields
showRoleLAbelField
roleExamples-->
<#--Variable assignments for Add Clinical Role To Person-->
<#assign roleDescriptor = "${i18n().reviewer_of}" />
<#assign typeSelectorLabel = "${i18n().reviewer_of}" />
<#assign genericLabel = "${i18n().item_capitalized}" />
<#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#InformationResource'}" />
<#--Each of the two stage forms will include the form below-->
<#include "addRoleToPersonTwoStage.ftl">
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#--Two stage form for service provider role-->
<#--
Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are:
roleDescriptor.
The other required values (roleType, optionsType, objectClassUri, and literalOptions are
set in the JAVA class corresponding to the form, e.g. AddReviewerRoleToPersonGenerator.java.
Optional values can be set, but each of these has default values
set in addRoleToPersonTwoStage.ftl:
buttonText
typeSelectorLabel
numDateFields
showRoleLAbelField
roleExamples-->
<#--Variable assignments for Add Clinical Role To Person-->
<#assign roleDescriptor = "${i18n().reviewer_of}" />
<#assign typeSelectorLabel = "${i18n().reviewer_of}" />
<#assign genericLabel = "${i18n().item_capitalized}" />
<#assign acTypes = "{activity: 'http://purl.org/ontology/bibo/Document'}" />
<#--Each of the two stage forms will include the form below-->
<#include "addRoleToPersonTwoStage.ftl">