From 98c515b0986c83050be3a7b588c950ac4f8ffd50 Mon Sep 17 00:00:00 2001
From: tworrall <tworrall@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 1 Dec 2011 18:55:27 +0000
Subject: [PATCH] template cleanup

---
 .../freemarker/edit/forms/addAssociatedConcept.ftl     | 10 +++++-----
 .../freemarker/edit/forms/addUserDefinedConcept.ftl    |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl b/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
index 976e16ea..5df8cee2 100644
--- a/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
+++ b/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
@@ -74,7 +74,7 @@
 
 <div id="showAddForm">
     <input type="submit" value="Add Concept" id="showAddFormButton" name="showAddFormButton">  or 
-    <a class="cancel" href="${cancelUrl}&url=/individual">Return</a>
+    <a class="cancel" href="${cancelUrl}&url=/individual">Return to Profile Page</a>
 </div> 
     <form id="addConceptForm" class="customForm" action="${submitUrl}">
 		<#assign checkedSource = false />
@@ -86,7 +86,7 @@
 
     <p class="inline">
         <input type="text" id="searchTerm" label="Search" class="acSelector" size="35" />
-        <input type="button" id="searchButton" name="searchButton" value="Search"/>
+        <input type="button" class="submit concept-search" id="searchButton" name="searchButton" value="Search"/>
     </p>
     <input type="hidden" id="conceptNode" name="conceptNode" value=""/> <!-- Field value populated by JavaScript -->
     <input type="hidden" id="conceptLabel" name="conceptLabel" value="" />  <!-- Field value populated by JavaScript -->
@@ -98,12 +98,12 @@
     </div>
     <div id="errors" name="errors"></div>
     
-    <div><a href="${userDefinedConceptUrl}" > Can't find the concept you want? Create your own.</a>
+    <div id="createOwn"><br /><a href="${userDefinedConceptUrl}" > Can't find the concept you want? Create your own.</a>
     </div>	
     <input type="hidden" name="editKey" id="editKey" value="${editKey}"/>
     <p class="submit">
-        <input type="submit" id="submit" name="submit" value="Add Term" />
-        <span class="or"> or <a class="cancel" href="${cancelUrl}">Cancel</a>
+        <input type="submit" id="submit" name="submit" value="Add Selected Concept" />
+        <span class="or"> or </span><a class="cancel" href="${cancelUrl}">Cancel</a>
     </p>
 
     </form>
diff --git a/productMods/templates/freemarker/edit/forms/addUserDefinedConcept.ftl b/productMods/templates/freemarker/edit/forms/addUserDefinedConcept.ftl
index 99967d72..9d444166 100644
--- a/productMods/templates/freemarker/edit/forms/addUserDefinedConcept.ftl
+++ b/productMods/templates/freemarker/edit/forms/addUserDefinedConcept.ftl
@@ -7,7 +7,7 @@
 
 <#assign sparqlForAcFilter = editConfiguration.pageData.sparqlForAcFilter />
 
-<h2>Add Your Own Concept</h2>
+<h2>Create Your Own Concept</h2>
 
 
 <form id="addUserDefinedConceptForm" class="customForm noIE67" action = "${submitUrl}" method="post">
@@ -33,7 +33,7 @@
     
 		<p class="submit">
 				<input type="hidden" name = "editKey" value="${editKey}"/>
-				<input type="submit" id="submit" value="Add Concept"/><span class="or"> or </span><a class="cancel" href="${cancelUrl}">Return to Manage Concepts</a>
+				<input type="submit" id="submit" value="Concept"/><span class="or"> or </span><a class="cancel" href="${cancelUrl}">Return to Manage Concepts</a>
 		</p>
 		
 		<p id="requiredLegend" class="requiredHint">* required fields</p>
@@ -50,6 +50,7 @@
         acType: 'http://www.w3.org/2004/02/skos/core#Concept',
         submitButtonTextType: 'simple',
         editMode: 'add',
+        typeName: 'Concept',
         defaultTypeName: 'concept' // used in repair mode to generate button text
     };
     </script>