From 702004c97794e369e4d68c196f93e291e4170d7c Mon Sep 17 00:00:00 2001
From: tworrall <tworrall@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 1 Dec 2011 20:15:24 +0000
Subject: [PATCH] NIHVIVO-3381 ensured unspupported browser message works
 correctly

---
 .../edit/forms/addAuthorsToInformationResource.ftl  |  2 +-
 .../edit/forms/addRoleToPersonTwoStage.ftl          |  2 ++
 .../edit/forms/organizationHasPositionHistory.ftl   |  6 ++++--
 .../edit/forms/personHasEducationalTraining.ftl     | 13 ++++++-------
 .../edit/forms/personHasPositionHistory.ftl         |  8 +++++---
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/productMods/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl b/productMods/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl
index a4d71003..d6bc65a9 100644
--- a/productMods/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl
+++ b/productMods/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl
@@ -102,7 +102,7 @@
     <a class="cancel" href="${cancelUrl}&url=/individual" title="Cancel">Return to Publication</a>
 </section> 
 
-<form id="addAuthorForm" action ="${submitUrl}" class="customForm">
+<form id="addAuthorForm" action ="${submitUrl}" class="customForm noIE67">
     <h3>Add an Author</h3>
     		<#--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-->
diff --git a/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl b/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
index 7eb1330d..e6443405 100644
--- a/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
+++ b/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
@@ -104,6 +104,7 @@
     </section>
 </#if>
 
+<@lvf.unsupportedBrowser urls.base /> 
 
 <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" />')}
 
 ${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}/edit/forms/js/customFormWithAutocomplete.js"></script>')}
 
diff --git a/productMods/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl b/productMods/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl
index b678ca65..59dae9f3 100644
--- a/productMods/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl
+++ b/productMods/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl
@@ -68,10 +68,10 @@
     </section>
 </#if>
 
+<@lvf.unsupportedBrowser urls.base/>
+
 <section id="organizationHasPositionHistory" role="region">        
     
-    <@lvf.unsupportedBrowser urls.base/>
-
 	<form id="organizationHasPositionHistory" class="customForm noIE67" action="${submitUrl}"  role="add/edit position history">
 	    <p>
 	        <label for="positionTitle">Position Title ${requiredHint}</label>
@@ -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>',
              '<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>')}
diff --git a/productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl b/productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl
index 25bfc2a1..ccea6035 100644
--- a/productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl
+++ b/productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl
@@ -42,13 +42,6 @@
 <#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>
 
 <#--Display error messages if any-->
@@ -85,6 +78,9 @@
         </p>
     </section>
 </#if>
+
+<@lvf.unsupportedBrowser urls.base /> 
+
 <section id="personHasEducationalTraining" role="region">        
     
     <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>',
              '<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>')}
 
 
diff --git a/productMods/templates/freemarker/edit/forms/personHasPositionHistory.ftl b/productMods/templates/freemarker/edit/forms/personHasPositionHistory.ftl
index a1af2fde..d79fad4e 100644
--- a/productMods/templates/freemarker/edit/forms/personHasPositionHistory.ftl
+++ b/productMods/templates/freemarker/edit/forms/personHasPositionHistory.ftl
@@ -34,8 +34,6 @@
 <#assign requiredHint="<span class='requiredHint'> *</span>"/> 
 <#assign yearHint     = "<span class='hint'>(YYYY)</span>" />
 
-<@lvf.unsupportedBrowser urls.base /> 
-
 <h2>${formAction} position entry for ${editConfiguration.subjectName}</h2>
 
 <#--Display error messages if any-->
@@ -81,7 +79,9 @@
     </section>
 </#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">    
     <label for="orgType">Organization Type ${requiredHint}</label>
     <#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>',
              '<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>')}