From f2ba8c51c41b3104377e04ba49761541a36ba7fc Mon Sep 17 00:00:00 2001
From: tworrall <tworrall@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 1 Dec 2011 21:38:50 +0000
Subject: [PATCH] minor template and css changes

---
 productMods/edit/forms/css/customForm.css             | 11 +++++++++--
 .../freemarker/edit/forms/addAssociatedConcept.ftl    | 10 +++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/productMods/edit/forms/css/customForm.css b/productMods/edit/forms/css/customForm.css
index 453a957d..0096b186 100644
--- a/productMods/edit/forms/css/customForm.css
+++ b/productMods/edit/forms/css/customForm.css
@@ -99,9 +99,16 @@ form.customForm input.concept-search {
     background-color: #317e95;
 }
 form.customForm h5.services {
-    margin-bottom: -10px;
+    margin-bottom: -8px;
+    margin-top: -12px;
+}
+form.customForm p.inline-search {
+    float: left;
+    clear: left;
+}
+form.customForm p.inline-search #searchTerm{
+    margin-top: 6px;
 }
-
 /* <------ DATE TIME*/
 form.customForm label.dateTime {
     display: inline;
diff --git a/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl b/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
index c0ba0b68..43753a47 100644
--- a/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
+++ b/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
@@ -73,6 +73,7 @@
 </#if>
 
 <div id="showAddForm">
+    
     <input type="submit" value="Add Concept" id="showAddFormButton" name="showAddFormButton">  or 
     <a class="cancel" href="${cancelUrl}&url=/individual">Return to Profile Page</a>
 </div> 
@@ -85,10 +86,9 @@
         <label class="inline" for="${thisSource.label}"> <a href="${thisSource.url}">${thisSource.label}</a> &nbsp;(${thisSource.description})</label>
         <br />
     </#list>
-
-    <p class="inline">
+    <p class="inline-search">
         <input type="text" id="searchTerm" label="Search" class="acSelector" size="35" />
-        <input type="button" class="submit concept-search" id="searchButton" name="searchButton" value="Search"/>
+        &nbsp;<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 -->
@@ -100,13 +100,13 @@
     </div>
     <div id="errors" name="errors"></div>
     
-    <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 Selected Concept" />
         <span class="or"> or </span><a class="cancel" href="${cancelUrl}">Cancel</a>
     </p>
+    <div id="createOwn"><br /><a href="${userDefinedConceptUrl}" > Can't find the concept you want? Create your own.</a>
+    </div>	
 
     </form>
 </div>