From 6bcbca8552d9c59f27c8d3d8fd7dc2798c157f61 Mon Sep 17 00:00:00 2001
From: hjkhjk54 <hjkhjk54@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 21 Nov 2011 21:23:51 +0000
Subject: [PATCH] updating authors to information resource and associated
 concept

---
 .../edit/forms/addAssociatedConcept.ftl           |  2 +-
 .../forms/addAuthorsToInformationResource.ftl     | 15 ++++++++++++---
 .../AddAuthorsToInformationResourceGenerator.java |  1 -
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl b/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
index be1d7c3d..e9dca238 100644
--- a/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
+++ b/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
@@ -39,7 +39,7 @@
     </script>
     
     <#list existingConcepts?keys as key>
-    	<#local existingConcept = existingConcepts[key] />
+    	<#assign existingConcept = existingConcepts[key] />
         <li class="existingTerm">
               
             <span class="term">
diff --git a/productMods/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl b/productMods/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl
index 7e32c31e..19b187f5 100644
--- a/productMods/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl
+++ b/productMods/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl
@@ -79,19 +79,28 @@
     <input type="submit" id="showAddFormButton" value="Add Author" role="button" />
 
     <span class="or"> or </span>
-    <a class="cancel" href="${cancelUrl}" title="Cancel">Return to Publication</a>
+    <a class="cancel" href="${cancelUrl}&url=/individual" title="Cancel">Return to Publication</a>
 </section> 
 
 <form id="addAuthorForm" action ="${submitUrl}" class="customForm">
     <h3>Add an Author</h3>
+    		<#--These wrapper paragraph elements are important because javascript hides parent of these fields, since last name
+    		should be visible even when first name/middle name are not, the parents should be separate for each field-->
+    		<p class="inline">
         <label for="lastName">Last name <span class='requiredHint'> *</span></label>
         <input class="acSelector" size="35"  type="text" id="lastName" name="lastName" value="" role="input" />
-
+        </p>
+				
+				<p class="inline">
         <label for="firstName">First name ${requiredHint} ${initialHint}</label>
         <input  size="20"  type="text" id="firstName" name="firstName" value=""  role="input" />
+        </p>
+        
 
-        <label for="middleName">Middle name <span class='hint'>(initial okay)</span></label>
+				<p class="inline">
+				<label for="middleName">Middle name <span class='hint'>(initial okay)</span></label>
         <input  size="20"  type="text" id="middleName" name="middleName" value=""  role="input" />
+        </p>
       
         <input type="hidden" id="label" name="label" value=""  role="input" />  <!-- Field value populated by JavaScript -->
 
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java
index 2a7aae94..c66eee2c 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java
@@ -277,7 +277,6 @@ public class AddAuthorsToInformationResourceGenerator extends VivoBaseGenerator
 	private void setPersonUriField(EditConfigurationVTwo editConfiguration) {
 		editConfiguration.addField(new FieldVTwo().
 				setName("personUri").
-				setValidators(list("")).
 				setObjectClassUri(personClass)
 				);