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

now displaying correct name in heading and selected organization type in labels; added statements to source in correct js files

Browse source
This commit is contained in:
tworrall 2011-11-14 18:42:19 +00:00
parent c5a1582fe8
commit 6bdc8b6b3a
1 changed files with 32 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,9 +6,7 @@
<#import "lib-vivo-form.ftl" as lvf> <#import "lib-vivo-form.ftl" as lvf>
<#assign subjectName="Fake name hardcoded in FTL"/> <#assign subjectName=""/>
<#assign requiredHint="*"/>
<#assign yearHint="Do it his year!!!"/>
<#assign roleActivityUri="mysteryRoleActivityURI"/> <#assign roleActivityUri="mysteryRoleActivityURI"/>
<#assign orgLabel="mysteryOrgLabel"/> <#assign orgLabel="mysteryOrgLabel"/>
@ -39,7 +37,7 @@
<#else> <#else>
--> -->
<h2>${titleVerb}&nbsp;educational training entry for ${subjectName}</h2> <h2>${titleVerb}&nbsp;educational training entry for ${subjectName}${editConfiguration.subjectName}</h2>
<#-- <#--
<#if errorTypeFieldIsEmpty??> <#if errorTypeFieldIsEmpty??>
@ -63,8 +61,8 @@
<form id="personHasEducationalTraining" class="customForm noIE67" action="${submitUrl}" role="add/edit educational training"> <form id="personHasEducationalTraining" class="customForm noIE67" action="${submitUrl}" role="add/edit educational training">
<p class="inline">
<label for="orgType">Select Organization Type ${requiredHint}</label> <label for="orgType">Organization Type ${requiredHint}</label>
<#assign orgTypeOpts = editConfiguration.pageData.orgType /> <#assign orgTypeOpts = editConfiguration.pageData.orgType />
<select id="typeSelector" name="orgType" > <select id="typeSelector" name="orgType" >
<option value="" selected="selected">Select one</option> <option value="" selected="selected">Select one</option>
@ -76,10 +74,11 @@
</#if> </#if>
</#list> </#list>
</select> </select>
</p>
<p> <p>
<label for="relatedIndLabel">Organization Name ${requiredHint}</label> <label for="relatedIndLabel">### Name ${requiredHint}</label>
<input class="acSelector" size="50" type="text" id="relatedIndLabel" name="orgLabel" disabled="${disabledVal}" value="" /> <input class="acSelector" size="50" type="text" id="relatedIndLabel" name="orgLabel" value="" />
</p> </p>
<div class="acSelection"> <div class="acSelection">
@ -94,7 +93,7 @@
</div> </div>
<p> <p>
<label for="dept">Department or School Name within the Organization</label> <label for="dept">Department or School Name within the ###</label>
<input size="50" type="text" id="dept" name="dept" value="" /> <input size="50" type="text" id="dept" name="dept" value="" />
</p> </p>
@ -119,7 +118,7 @@
<p> <p>
<label for="info">Supplemental Information</label> <label for="info">Supplemental Information</label>
<input size="50" type="text" id="info" name="info" value="" /> <input size="50" type="text" id="info" name="info" value="" />
<p>e.g., <em>Postdoctoral training</em> or <em>Transferred</em></p> <br />e.g., <em>Postdoctoral training</em> or <em>Transferred</em>
</p> </p>
<label for="startField">Start Year ${yearHint}</label> <label for="startField">Start Year ${yearHint}</label>
@ -142,20 +141,27 @@
</form> </form>
<#assign acUrl="/autocomplete?tokenize=true&stem=true" >
<#--
<script type="text/javascript"> <script type="text/javascript">
var customFormData = { var customFormData = {
acUrl: '${acUrl}', acUrl: '${urls.base}/autocomplete?tokenize=true&stem=true',
editMode: '${editMode}', editMode: '${editMode}',
submitButtonTextType: 'compound', submitButtonTextType: 'compound',
defaultTypeName: 'organization' defaultTypeName: 'organization'
}; };
</script> </script>
-->
</section> </section>
${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/customFormWithAutocomplete.css" />')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/extensions/String.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.bgiframe.pack.js"></script>',
'<script type="text/javascript" src="${urls.base}/edit/forms/js/customFormWithAutocomplete.js"></script>')}