From 5d7bb6e77d3ad5e588c92003c7957cad631e90ae Mon Sep 17 00:00:00 2001 From: tworrall Date: Fri, 18 Nov 2011 14:15:17 +0000 Subject: [PATCH] template work --- .../forms/personHasEducationalTraining.ftl | 15 +- .../edit/forms/personHasPositionHistory.ftl | 133 +++++++++++------- 2 files changed, 85 insertions(+), 63 deletions(-) diff --git a/productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl b/productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl index 515b9538..6fc4f8e6 100644 --- a/productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl +++ b/productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl @@ -92,7 +92,7 @@

<#assign orgTypeOpts = editConfiguration.pageData.orgType /> - <#list orgTypeOpts?keys as key> <#if orgTypeValue = key> @@ -108,7 +108,7 @@

- 0)>disabled="${disabledVal}"/> + 0)>disabled="${disabledVal}" />

<#--Store values in hidden fields--> @@ -118,8 +118,6 @@ <@lvf.acSelection urls.base /> - -

@@ -132,8 +130,7 @@ <#assign degreeOpts = editConfiguration.pageData.degree /> @@ -145,11 +142,11 @@

- + -
e.g., Postdoctoral training or Transferred +

- +

<#--Need to draw edit elements for dates here--> <#if htmlForElements?keys?seq_contains("startField")> diff --git a/productMods/templates/freemarker/edit/forms/personHasPositionHistory.ftl b/productMods/templates/freemarker/edit/forms/personHasPositionHistory.ftl index c7bbc981..830f98f1 100644 --- a/productMods/templates/freemarker/edit/forms/personHasPositionHistory.ftl +++ b/productMods/templates/freemarker/edit/forms/personHasPositionHistory.ftl @@ -4,53 +4,79 @@ <#import "lib-vivo-form.ftl" as lvf> -<#if editConfiguration.objectUri?has_content> - <#assign editMode = "edit"> -<#else> - <#assign editMode = "add"> +<#--Retrieve certain edit configuration information--> +<#assign htmlForElements = editConfiguration.pageData.htmlForElements /> +<#assign editMode = editConfiguration.pageData.editMode /> + +<#--Get existing value for specific data literals and uris--> +<#assign orgTypeValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "orgType")/> +<#assign orgLabelValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "orgLabel")/> +<#assign positionTitleValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "positionTitle")/> +<#assign positionTypeValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "positionType")/> + +<#--If edit submission exists, then retrieve validation errors if they exist--> +<#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content> + <#assign submissionErrors = editSubmission.validationErrors/> +<#assign disabledVal = ""/> <#if editMode == "edit"> <#assign formAction="Edit"> <#assign submitButtonText="Edit Position"> + <#assign disabledVal="disabled"> <#else> <#assign formAction="Create"> <#assign submitButtonText="Create Position"> + <#assign disabledVal=""> -<#--Get existing value for specific data literals and uris--> - -<#assign orgLabel = lvf.getFormFieldValue(editSubmission, editConfiguration, "orgLabel")/> -<#assign positionTitle = lvf.getFormFieldValue(editSubmission, editConfiguration, "positionTitle")/> -<#assign startField = lvf.getFormFieldValue(editSubmission, editConfiguration, "startField") /> -<#assign endField = lvf.getFormFieldValue(editSubmission, editConfiguration, "endField") /> - <#assign requiredHint=" *"/> +<#assign yearHint = "(YYYY)" /> -<#-- <@lvf.unsupportedBrowser urls.base /> --> +<@lvf.unsupportedBrowser urls.base />

${formAction} position entry for ${editConfiguration.subjectName}

-<#if errorOrgType??> - <#assign errorMessage = "You must supply an organization type." /> - - -<#if errorOrgLabel??> - <#assign errorMessage = "You must supply an organization name." /> - - -<#if errorPositionTitle??> - <#assign errorMessage = "You must supply a position title." /> - - -<#if errorPositionType??> - <#assign errorMessage = "You must supply a position type." /> - - -<#if errorMessage?has_content> +<#--Display error messages if any--> +<#if submissionErrors?has_content> @@ -58,14 +84,10 @@

<#assign orgTypeOpts = editConfiguration.pageData.orgType /> - <#list orgTypeOpts?keys as key> - <#if editConfiguration.objectUri?has_content && editConfiguration.objectUri = key> - - <#else> - - +

@@ -73,34 +95,40 @@

- + 0)>disabled="${disabledVal}" >

+ <#if editMode = "edit"> + + <@lvf.acSelection urls.base /> - + <#assign posnTypeOpts = editConfiguration.pageData.positionType /> - <#list posnTypeOpts?keys as key> - <#if editConfiguration.objectUri?has_content && editConfiguration.objectUri = key> - - <#else> - - + +

+ <#--Need to draw edit elements for dates here--> + <#if htmlForElements?keys?seq_contains("startField")> + + ${htmlForElements["startField"]} ${yearHint} + +

+ <#if htmlForElements?keys?seq_contains("endField")> + + ${htmlForElements["endField"]} ${yearHint} + - - - (YYYY) - - - (YYYY) + <#--End draw elements--> +
@@ -135,9 +163,6 @@ ${stylesheets.add('', '', '', + '', '', '')} - - - -