NIHVIVO-3381 ensured unspupported browser message works correctly

This commit is contained in:
tworrall 2011-12-01 20:15:24 +00:00
parent e04d956668
commit 702004c977
5 changed files with 18 additions and 13 deletions

View file

@ -102,7 +102,7 @@
<a class="cancel" href="${cancelUrl}&url=/individual" title="Cancel">Return to Publication</a> <a class="cancel" href="${cancelUrl}&url=/individual" title="Cancel">Return to Publication</a>
</section> </section>
<form id="addAuthorForm" action ="${submitUrl}" class="customForm"> <form id="addAuthorForm" action ="${submitUrl}" class="customForm noIE67">
<h3>Add an Author</h3> <h3>Add an Author</h3>
<#--These wrapper paragraph elements are important because javascript hides parent of these fields, since last name <#--These wrapper paragraph elements are important because javascript hides parent of these fields, since last name
should be visible even when first name/middle name are not, the parents should be separate for each field--> should be visible even when first name/middle name are not, the parents should be separate for each field-->

View file

@ -104,6 +104,7 @@
</section> </section>
</#if> </#if>
<@lvf.unsupportedBrowser urls.base />
<section id="add${roleDescriptor?capitalize}RoleToPersonTwoStage" role="region"> <section id="add${roleDescriptor?capitalize}RoleToPersonTwoStage" role="region">
@ -198,6 +199,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/cust
${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" />')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>')} ${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>')} ${scripts.add('<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/edit/forms/js/customFormWithAutocomplete.js"></script>')} ${scripts.add('<script type="text/javascript" src="${urls.base}/edit/forms/js/customFormWithAutocomplete.js"></script>')}

View file

@ -68,9 +68,9 @@
</section> </section>
</#if> </#if>
<section id="organizationHasPositionHistory" role="region"> <@lvf.unsupportedBrowser urls.base/>
<@lvf.unsupportedBrowser urls.base/> <section id="organizationHasPositionHistory" role="region">
<form id="organizationHasPositionHistory" class="customForm noIE67" action="${submitUrl}" role="add/edit position history"> <form id="organizationHasPositionHistory" class="customForm noIE67" action="${submitUrl}" role="add/edit position history">
<p> <p>
@ -155,5 +155,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/cust
${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>', ${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/customFormUtils.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/extensions/String.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>', '<script type="text/javascript" src="${urls.base}/js/browserUtils.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>')} '<script type="text/javascript" src="${urls.base}/edit/forms/js/customFormWithAutocomplete.js"></script>')}

View file

@ -42,13 +42,6 @@
<#assign yearHint = "<span class='hint'>(YYYY)</span>" /> <#assign yearHint = "<span class='hint'>(YYYY)</span>" />
<#--
<#if editMode = “ERROR”>
<div>This form is unable to handle the editing of this position because it is associated with
multiple Position individuals.</div>
<#else>
-->
<h2>${titleVerb}&nbsp;educational training entry for ${subjectName}${editConfiguration.subjectName}</h2> <h2>${titleVerb}&nbsp;educational training entry for ${subjectName}${editConfiguration.subjectName}</h2>
<#--Display error messages if any--> <#--Display error messages if any-->
@ -85,6 +78,9 @@
</p> </p>
</section> </section>
</#if> </#if>
<@lvf.unsupportedBrowser urls.base />
<section id="personHasEducationalTraining" role="region"> <section id="personHasEducationalTraining" role="region">
<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">
@ -192,6 +188,9 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/cust
${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>', ${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/customFormUtils.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/extensions/String.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/browserUtils.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>')} '<script type="text/javascript" src="${urls.base}/edit/forms/js/customFormWithAutocomplete.js"></script>')}

View file

@ -34,8 +34,6 @@
<#assign requiredHint="<span class='requiredHint'> *</span>"/> <#assign requiredHint="<span class='requiredHint'> *</span>"/>
<#assign yearHint = "<span class='hint'>(YYYY)</span>" /> <#assign yearHint = "<span class='hint'>(YYYY)</span>" />
<@lvf.unsupportedBrowser urls.base />
<h2>${formAction} position entry for ${editConfiguration.subjectName}</h2> <h2>${formAction} position entry for ${editConfiguration.subjectName}</h2>
<#--Display error messages if any--> <#--Display error messages if any-->
@ -81,7 +79,9 @@
</section> </section>
</#if> </#if>
<form class="customForm" action ="${submitUrl}" class="customForm" role="${formAction} position entry"> <@lvf.unsupportedBrowser urls.base />
<form class="customForm" action ="${submitUrl}" class="customForm noIE67" role="${formAction} position entry">
<p class="inline"> <p class="inline">
<label for="orgType">Organization Type ${requiredHint}</label> <label for="orgType">Organization Type ${requiredHint}</label>
<#assign orgTypeOpts = editConfiguration.pageData.orgType /> <#assign orgTypeOpts = editConfiguration.pageData.orgType />
@ -162,5 +162,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/cust
${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>', ${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/customFormUtils.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/extensions/String.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>', '<script type="text/javascript" src="${urls.base}/js/browserUtils.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>')} '<script type="text/javascript" src="${urls.base}/edit/forms/js/customFormWithAutocomplete.js"></script>')}