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

misc template clean up

Browse source
This commit is contained in:
tworrall 2011-11-18 22:07:06 +00:00
parent 5b4f819ad5
commit a014f61127
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -90,7 +90,7 @@
</#list> </#list>
<#--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.<br />
</#if> </#if>
<#--Checking if role field is empty--> <#--Checking if role field is empty-->
<#if lvf.submissionErrorExists(editSubmission, "roleLabel")> <#if lvf.submissionErrorExists(editSubmission, "roleLabel")>

17
productMods/templates/freemarker/edit/forms/personHasPositionHistory.ftl
View file

@ -61,19 +61,19 @@
</#list> </#list>
<#--Checking if Org Type field is empty--> <#--Checking if Org Type field is empty-->
<#if lvf.submissionErrorExists(editSubmission, "orgType")> <#if lvf.submissionErrorExists(editSubmission, "orgType")>
Please select a value in the Organization Type field. Please select a value in the Organization Type field.<br />
</#if> </#if>
<#--Checking if Org Name field is empty--> <#--Checking if Org Name field is empty-->
<#if lvf.submissionErrorExists(editSubmission, "orgLabel")> <#if lvf.submissionErrorExists(editSubmission, "orgLabel")>
Please enter or select a value in the Name field. Please enter or select a value in the Name field.<br />
</#if> </#if>
<#--Checking if Position Title field is empty--> <#--Checking if Position Title field is empty-->
<#if lvf.submissionErrorExists(editSubmission, "positionTitle")> <#if lvf.submissionErrorExists(editSubmission, "positionTitle")>
Please enter a value in the Position Title field. Please enter a value in the Position Title field.<br />
</#if> </#if>
<#--Checking if Position Type field is empty--> <#--Checking if Position Type field is empty-->
<#if lvf.submissionErrorExists(editSubmission, "positionType")> <#if lvf.submissionErrorExists(editSubmission, "positionType")>
Please select a value in the Position Type field. Please select a value in the Position Type field.<br />
</#if> </#if>
</p> </p>
@ -89,7 +89,7 @@
<#list orgTypeOpts?keys as key> <#list orgTypeOpts?keys as key>
<option value="${key}" <#if orgTypeValue = key>selected</#if>>${orgTypeOpts[key]}</option> <option value="${key}" <#if orgTypeValue = key>selected</#if>>${orgTypeOpts[key]}</option>
</#list> </#list>
</select> </select>
</p> </p>
<div class="fullViewOnly"> <div class="fullViewOnly">
@ -110,11 +110,11 @@
<label for="positionType">Position Type ${requiredHint}</label> <label for="positionType">Position Type ${requiredHint}</label>
<#assign posnTypeOpts = editConfiguration.pageData.positionType /> <#assign posnTypeOpts = editConfiguration.pageData.positionType />
<select name="positionType" style="margin-top:-2px" > <select name="positionType" style="margin-top:-2px" >
<option value="" selected="selected">Select one</option> <option value="" <#if positionTypeValue == "">selected</#if>>Select one</option>
<#list posnTypeOpts?keys as key> <#list posnTypeOpts?keys as key>
<option value="${key}" <#if positionTypeValue = key>selected</#if>>${posnTypeOpts[key]}</option> <option value="${key}" <#if positionTypeValue == key>selected</#if>>${posnTypeOpts[key]}</option>
</#list> </#list>
</select> </select>
<p></p> <p></p>
<#--Need to draw edit elements for dates here--> <#--Need to draw edit elements for dates here-->
<#if htmlForElements?keys?seq_contains("startField")> <#if htmlForElements?keys?seq_contains("startField")>
@ -154,7 +154,6 @@ var customFormData = {
}; };
</script> </script>
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css" />')} ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css" />')}
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />')} ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />')}
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customFormWithAutocomplete.css" />')} ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customFormWithAutocomplete.css" />')}