From 7d26f8d322a44565402686d9b5480c6c50a18d0a Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 1 Apr 2010 04:52:08 +0000
Subject: [PATCH] NIHVIVO-193 Minor tweaks.

---
 productMods/edit/forms/css/customForm.css         | 15 ++++-----------
 .../edit/forms/css/personHasPositionHistory.css   |  3 +++
 .../edit/forms/personHasPositionHistory.jsp       | 11 ++++-------
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/productMods/edit/forms/css/customForm.css b/productMods/edit/forms/css/customForm.css
index d2f5c332..35106804 100644
--- a/productMods/edit/forms/css/customForm.css
+++ b/productMods/edit/forms/css/customForm.css
@@ -1,13 +1,11 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-/* Some of these styles should most likely apply to all forms. */
-
 #content form {
     width: 50%;
 }
 
 #content form div {
-  clear: left;
+  clear: both;
 }
 
 #content form h6 {
@@ -15,9 +13,9 @@
 }
 
 #addNewLink {
+    /* Right float isn't the right way to do this, because the correct right margin 
+    depends on window size. Should be floated left instead. */
     float: right;
-    /* This right margin works pretty well for both the add and edit version of the form.
-    Could customize for each of these versions later. */
     margin-right: 15em;
     margin-top: .8em;
     width: 30%;
@@ -33,7 +31,7 @@
 }
 
 #existingOrNew {
-    font-style:italic;
+    font-style: italic;
     margin-left: 1em;
 }
 
@@ -69,11 +67,6 @@ select,
     margin-bottom: 1em;
 }
 
-/* This div starts off hidden in case Javascript is disabled. Javascript will show it. */
-#addNewLink {
-    display: none;
-}
-
 option {
     padding: 0 2px;
 }
diff --git a/productMods/edit/forms/css/personHasPositionHistory.css b/productMods/edit/forms/css/personHasPositionHistory.css
index 0dc42bbe..5d2adcc0 100644
--- a/productMods/edit/forms/css/personHasPositionHistory.css
+++ b/productMods/edit/forms/css/personHasPositionHistory.css
@@ -1,2 +1,5 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
+#endYearHint {
+    margin-left: 1em;
+}
\ No newline at end of file
diff --git a/productMods/edit/forms/personHasPositionHistory.jsp b/productMods/edit/forms/personHasPositionHistory.jsp
index a0567e54..23b99772 100644
--- a/productMods/edit/forms/personHasPositionHistory.jsp
+++ b/productMods/edit/forms/personHasPositionHistory.jsp
@@ -300,14 +300,13 @@
     request.setAttribute("customCss", customCss);   
 %>
 
-<c:set var="yearHint" value="<span class='hint'>&nbsp;(YYYY)</span>" />
 <c:set var="requiredHint" value="<span class='requiredHint'> *</span>" />
 
 <jsp:include page="${preForm}" />
 
 <h2>${title}</h2>
 
-<form action="<c:url value="/edit/processRdfForm2.jsp"/>" >
+<form class="${editType}" action="<c:url value="/edit/processRdfForm2.jsp"/>" >
 
     <div id="addNewLink">
         If your organization is not listed, please <a href="#">add a new organization</a>.    
@@ -317,8 +316,6 @@
         <v:input type="select" label="Select Existing Organization" labelClass="required" id="organizationUri"  /><span id="existingOrNew">or</span>
     </div>
     
-
-    
     <div id="new">
         <h6>Add a New Organization</h6>
         <v:input type="text" label="Organization Name" labelClass="required" id="newOrgName" />
@@ -329,11 +326,11 @@
         <v:input type="text" label="Position Title ${requiredHint}" id="title" size="30" />
         <v:input type="select" label="Position Type ${requiredHint}" id="positionType" />
 
-        <p class="inline year"><v:input type="text" label="Start Year ${requiredHint} ${yearHint}" id="startYear" size="4" /></p>    
-        <p class="inline year"><v:input type="text" label="End Year ${yearHint}" id="endYear" size="4" /></p>
+        <p class="inline year"><v:input type="text" label="Start Year ${requiredHint} <span class='hint'>(YYYY)</span>" id="startYear" size="4" /></p>    
+        <p class="inline year"><v:input type="text" label="End Year <span id='endYearHint' class='hint'>(YYYY)</span>" id="endYear" size="4" /></p>
     </div>
     
-    <!-- For Javascript -->
+    <!-- Processing information for Javascript -->
     <input type="hidden" name="editType" value="${editType}" />
     <input type="hidden" name="entryType" value="position" /> 
     <input type="hidden" name="newType" value="organization" />