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

NIHVIVO-3815, 3816, 3822 modified default type value in educational training ftl, fixed placeholder text issue with presentations, now display end date in list view when no start date with grants

Browse source
This commit is contained in:
tworrall 2012-06-26 17:44:06 +00:00
parent 88bba25bc6
commit 61d77d16c7
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,7 @@
</#local> </#local>
<#local dateTime> <#local dateTime>
<#if statement.dateTimeStartRole?has_content > <#if statement.dateTimeStartRole?has_content || statement.dateTimeEndRole?has_content>
<@dt.yearIntervalSpan "${statement.dateTimeStartRole!}" "${statement.dateTimeEndRole!}" /> <@dt.yearIntervalSpan "${statement.dateTimeStartRole!}" "${statement.dateTimeEndRole!}" />
<#else> <#else>
<@dt.yearIntervalSpan "${statement.dateTimeStartGrant!}" "${statement.dateTimeEndGrant!}" /> <@dt.yearIntervalSpan "${statement.dateTimeStartGrant!}" "${statement.dateTimeEndGrant!}" />

2
productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
View file

@ -143,7 +143,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
<input class="acUriReceiver" type="hidden" id="conferenceUri" name="existingConference" value="${conferenceValue}" ${flagClearLabelForExisting}="true" /> <input class="acUriReceiver" type="hidden" id="conferenceUri" name="existingConference" value="${conferenceValue}" ${flagClearLabelForExisting}="true" />
</div> </div>
<p> <p>
<h4>Years of Participation in ###</h4> <h4 class="label">Years of Participation in ###</h4>
</p> </p>
<#--Need to draw edit elements for dates here--> <#--Need to draw edit elements for dates here-->
<#assign htmlForElements = editConfiguration.pageData.htmlForElements /> <#assign htmlForElements = editConfiguration.pageData.htmlForElements />

2
productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl
View file

@ -167,7 +167,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
<select name="trainingType" style="margin-top:-2px" > <select name="trainingType" style="margin-top:-2px" >
<option value="" <#if trainingTypeValue == "">selected</#if>>Select one</option> <option value="" <#if trainingTypeValue == "">selected</#if>>Select one</option>
<#list trainingTypeOpts?keys as key> <#list trainingTypeOpts?keys as key>
<option value="${key}" <#if trainingTypeValue == key>selected</#if>>${trainingTypeOpts[key]}</option> <option value="${key}" <#if trainingTypeValue == key>selected</#if>><#if trainingTypeOpts[key] == "Other">Academic Studies or Other Training<#else>${trainingTypeOpts[key]}</#if></option>
</#list> </#list>
</select> </select>
<p> <p>