From 1b4b52954d1a0aaa0a7b34ecac6906f9b1af7bb0 Mon Sep 17 00:00:00 2001
From: nac26 <nac26@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 29 Mar 2010 13:46:59 +0000
Subject: [PATCH] NIHVIVO-193 Markup and style tweaks for
 personHasPositionHistory

---
 .../forms/css/personHasPositionHistory.css    | 18 ++++++---
 .../edit/forms/personHasPositionHistory.jsp   | 40 +++++++++----------
 themes/vivo-basic/css/formedit.css            | 15 +++----
 3 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/productMods/edit/forms/css/personHasPositionHistory.css b/productMods/edit/forms/css/personHasPositionHistory.css
index 87539499..eb1abcd7 100644
--- a/productMods/edit/forms/css/personHasPositionHistory.css
+++ b/productMods/edit/forms/css/personHasPositionHistory.css
@@ -1,13 +1,21 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-#content form {
-    width: 50%;
+#content form div {
+  clear: left;
 }
 
-#orgNotListed {
-    float: right;
-    margin-right: 20em;
+#content form #existing {
+  float: left;
+  clear: none;
+/*  width: 300px;*/
+  display: inline-block;
+}
+
+#content form #notListed {
+    float: left;
+    clear: none;
     width: 200px;
+    margin-left: 4em;
     padding: 10px 0px 10px 16px;
     border: 1px solid #9c9c9c;
     
diff --git a/productMods/edit/forms/personHasPositionHistory.jsp b/productMods/edit/forms/personHasPositionHistory.jsp
index dffbf0b1..63ddda0e 100644
--- a/productMods/edit/forms/personHasPositionHistory.jsp
+++ b/productMods/edit/forms/personHasPositionHistory.jsp
@@ -241,28 +241,28 @@
 
 <h2>${title}</h2>
 
-<form action="<c:url value="/edit/processRdfForm2.jsp"/>" >
-    <div id="orgNotListed">
+<form action="<c:url value="/edit/processRdfForm2.jsp"/>"
+  <div id="existing">
+    <v:input type="select" label="Organization" id="organizationUri"  />  
+  </div>
+  
+  <div id="notListed">
     If your organization is not listed, please <a href="#">add a new organization</a>.
-    </div>
-    
-    <div id="existingOrg">
-        <v:input type="select" label="Organization" id="organizationUri"  />  
-    </div>
-    
-    <div id="newOrg">
-    
-    </div>
-    
-    <div id="position"> 
-        <v:input type="text" label="Position Title" id="title" size="30" />
-        <v:input type="select" label="Position Type" id="type" />
+  </div>
+  
+  <div id="newOrg">
+  
+  </div>
+  
+  <div id="position"> 
+    <v:input type="text" label="Position Title" id="title" size="30" />
+    <v:input type="select" label="Position Type" id="type" />
 
-        <v:input type="text" label="Start Year" id="startYear" size="4"/>    
-        <v:input type="text" label="End Year" id="endYear" size="4"/>
-    </div>
-    
-    <p class="submit"><v:input type="submit" id="submit" value="<%=submitLabel%>" cancel="${param.subjectUri}"/></p>
+    <v:input type="text" label="Start Year" id="startYear" size="4"/>    
+    <v:input type="text" label="End Year" id="endYear" size="4"/>
+  </div>
+  
+  <p class="submit"><v:input type="submit" id="submit" value="<%=submitLabel%>" cancel="${param.subjectUri}"/></p>
 </form>
 
 <jsp:include page="${postForm}"/>
diff --git a/themes/vivo-basic/css/formedit.css b/themes/vivo-basic/css/formedit.css
index b9ab5074..1df556f2 100644
--- a/themes/vivo-basic/css/formedit.css
+++ b/themes/vivo-basic/css/formedit.css
@@ -20,17 +20,17 @@ form textarea {
 }
 
 form a:link.cancel, form a:visited.cancel {
-	color: #f00;
-	border-color: #f00;
-}
-
-form select option{
-	padding-right: 5px;
+	color: #f70;
+	border-color: #f70;
 }
 
 form a:hover.cancel {
 	color: #fff;
-	background: #f00;
+	background: #f70;
+}
+
+form select option{
+	padding-right: 5px;
 }
 
 form dl {
@@ -55,5 +55,6 @@ form dl dt, form dl dd {
 }
 
 p.submit {
+  clear: left;
   margin-top: 1em;
 }