Updates for freemarker conversion and also updates for umls term service integration

productMods/WEB-INF/web.xml

@@ -952,6 +952,15 @@
     <url-pattern>/UMLSTermsRetrieval</url-pattern>
   </servlet-mapping>
   
+    <servlet>
+    <servlet-name>ConceptSearchService</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.servlet.ConceptSearchServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>ConceptSearchService</servlet-name>
+    <url-pattern>/conceptSearchService</url-pattern>
+  </servlet-mapping>
+  
    <servlet>
     <servlet-name>ProcessTerminologyAnnotation</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.servlet.ProcessTerminologyController</servlet-class>

productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl

@@ -10,20 +10,31 @@
 <#assign sparqlForAcFilter = editConfiguration.pageData.sparqlForAcFilter />
 <#assign disabledVal = ""/>
 <#if editMode = "edit">
-	<#assign disabledVal = "" />
+	<#assign disabledVal = "disabled=\"disabled\"" />
 </#if>
 
 <#--the heading and submit button label depend on the predicate uri-->
+
 <#assign formHeading =  "investigator entry for "/>
-<#assign submitButtonLabel = "Edit Investigator" />
+<#assign submitButtonLabel = "Investigator" />
 <#if editConfiguration.predicateUri?ends_with("hasPrincipalInvestigatorRole") >
 	<#assign formHeading = "principal investigator entry for "/>
-	<#assign submitButtonLabel = "Edit Principal Investigator" />
+	<#assign submitButtonLabel = "Principal Investigator" />
 <#elseif editConfiguration.predicateUri?ends_with("hasCo-PrincipalInvestigatorRole") >
  	<#assign formHeading = "co-principal investigator entry for "/>
- 		<#assign submitButtonLabel = "Edit Co-Principal Investigator" />
+ 		<#assign submitButtonLabel = "Co-Principal Investigator" />
 </#if>
 
+<#if editMode = "add">
+	<#assign formHeading> Create ${formHeading} </#assign>
+<#else>
+	<#assign formHeading> Edit ${formHeading} </#assign>
+	<#assign submitButtonLabel> Edit ${submitButtonLabel} </#assign>
+
+</#if>
+
+
+
 <#--Get existing value for specific data literals and uris-->