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

date labels now display correctly

Browse source
This commit is contained in:
tworrall 2011-11-17 16:43:59 +00:00
parent cd161798c8
commit 4c49f270c9
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
View file

@ -111,12 +111,13 @@
<h4>Years of Participation in Grant</h4> <h4>Years of Participation in Grant</h4>
<#if htmlForElements?keys?seq_contains("startField")> <#if htmlForElements?keys?seq_contains("startField")>
<label for="startField">Start Year ${yearHint}</label> <label class="dateTime" for="startField">Start</label>
${htmlForElements["startField"]} ${htmlForElements["startField"]} ${yearHint}
</#if> </#if>
<p></p>
<#if htmlForElements?keys?seq_contains("endField")> <#if htmlForElements?keys?seq_contains("endField")>
<label for="endField">End Year ${yearHint}</label> <label class="dateTime" for="endField">End</label>
${htmlForElements["endField"]} ${htmlForElements["endField"]} ${yearHint}
</#if> </#if>
<p class="submit"> <p class="submit">

21
productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
View file

@ -88,14 +88,14 @@
</#if> </#if>
</#if> </#if>
</#list> </#list>
<#--Checking if role field is empty-->
<#if lvf.submissionErrorExists(editSubmission, "roleLabel")>
Please specify a role for this activity.
</#if>
<#--Checking if Name field is empty--> <#--Checking if Name field is empty-->
<#if lvf.submissionErrorExists(editSubmission, "activityLabel")> <#if lvf.submissionErrorExists(editSubmission, "activityLabel")>
Please enter or select a value in the Name field. Please enter or select a value in the Name field.
</#if> </#if>
<#--Checking if role field is empty-->
<#if lvf.submissionErrorExists(editSubmission, "roleLabel")>
Please specify a role for this activity.
</#if>
</p> </p>
</section> </section>
@ -155,18 +155,19 @@
<#if numDateFields == 1 > <#if numDateFields == 1 >
<#--Generated html is a map with key name mapping to html string--> <#--Generated html is a map with key name mapping to html string-->
<#if htmlForElements?keys?seq_contains("startField")> <#if htmlForElements?keys?seq_contains("startField")>
<label for="startField">Start Year ${yearHint}</label> <label class="dateTimeLabel" for="startField">Start Year</label>
${htmlForElements["startField"]} ${htmlForElements["startField"]} ${yearHint}
</#if> </#if>
<#else> <#else>
<h4>Years of Participation in ${roleDescriptor?capitalize}</h4> <h4>Years of Participation in ${roleDescriptor?capitalize}</h4>
<#if htmlForElements?keys?seq_contains("startField")> <#if htmlForElements?keys?seq_contains("startField")>
<label for="startField">Start Year ${yearHint}</label> <label class="dateTime" for="startField">Start</label>
${htmlForElements["startField"]} ${htmlForElements["startField"]} ${yearHint}
</#if> </#if>
<p></p>
<#if htmlForElements?keys?seq_contains("endField")> <#if htmlForElements?keys?seq_contains("endField")>
<label for="endField">End Year ${yearHint}</label> <label class="dateTime" for="endField">End</label>
${htmlForElements["endField"]} ${htmlForElements["endField"]} ${yearHint}
</#if> </#if>
</#if> </#if>
</div> </div>