From 40dbf58377db4939d76a60b8cabffffe58ddcf19 Mon Sep 17 00:00:00 2001
From: nac26 <nac26@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 5 Apr 2010 03:04:11 +0000
Subject: [PATCH] NIHVIVO-174 Removed Cornell specific example addresses
 (simply commented out for now)

---
 webapp/web/commentsForm.jsp | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/webapp/web/commentsForm.jsp b/webapp/web/commentsForm.jsp
index 742dbbaae..98bd561e3 100644
--- a/webapp/web/commentsForm.jsp
+++ b/webapp/web/commentsForm.jsp
@@ -1,5 +1,5 @@
-<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
-
+<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
+
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 
 <div id="content" class="staticPageBackground">
@@ -23,20 +23,20 @@
 <p>
 
 		<c:if test='${portalType != "clone"}'>
- 			<p>If you are looking for information on:</p>
-			<ul>
-				<li>Undergraduate admissions: contact <a href="http://admissions.cornell.edu/">http://admissions.cornell.edu/</a></li>
- 				<li>Undergraduate financial aid: contact <a href="http://finaid.cornell.edu/">http://finaid.cornell.edu/</a></li>
- 				<li>Graduate admissions and information: contact <a href="http://www.gradschool.cornell.edu/">http://www.gradschool.cornell.edu/</a></li>
- 				<li>International Students and Scholars Office: contact <a href="http://www.isso.cornell.edu/">http://www.isso.cornell.edu/</a></li>
-				<li>Faculty, staff and student directory: contact <a href="http://www.cornell.edu/search?tab=people">http://www.cornell.edu/search/?tab=people</a></li>
-				<li>General information about Cornell University: <a href="http://www.cornell.edu/">http://www.cornell.edu/</a></li>
-			</ul>
+ 			<!-- <p>If you are looking for information on:</p>
+ 			      <ul>
+ 			        <li>Undergraduate admissions: contact <a href="http://admissions.cornell.edu/">http://admissions.cornell.edu/</a></li>
+ 			        <li>Undergraduate financial aid: contact <a href="http://finaid.cornell.edu/">http://finaid.cornell.edu/</a></li>
+ 			        <li>Graduate admissions and information: contact <a href="http://www.gradschool.cornell.edu/">http://www.gradschool.cornell.edu/</a></li>
+ 			        <li>International Students and Scholars Office: contact <a href="http://www.isso.cornell.edu/">http://www.isso.cornell.edu/</a></li>
+ 			        <li>Faculty, staff and student directory: contact <a href="http://www.cornell.edu/search?tab=people">http://www.cornell.edu/search/?tab=people</a></li>
+ 			        <li>General information about Cornell University: <a href="http://www.cornell.edu/">http://www.cornell.edu/</a></li>
+ 			      </ul> -->
 		</c:if>
 
 
 <p>
-		If you have a question regarding the content of this portal, please submit the form below.
+		If you have a question regarding the content of this site, please submit the form below.
 		<c:if test='${(siteName eq "CALSResearch" || siteName eq "CALSImpact")}'>
 			The reference librarians at Albert R. Mann Library will be in touch with you soon.
 		</c:if>
@@ -46,16 +46,16 @@
 
 		<form name = "contact_form" action="sendmail" method="post" onsubmit="return ValidateForm('contact_form');">
 		<input type="hidden" name="home" value="${portalId}"/>
-		<input type="hidden" name="RequiredFields" value="webuseremail,webusername,comments"/>
-		<input type="hidden" name="RequiredFieldsNames" value="Email address,Name,Comments"/>
+		<input type="hidden" name="RequiredFields" value="webusername,webuseremail,comments"/>
+		<input type="hidden" name="RequiredFieldsNames" value="Name,Email address,Comments"/>
 		<input type="hidden" name="EmailFields" value="webuseremail"/>
 		<input type="hidden" name="EmailFieldsNames" value="emailaddress"/>
 		<input type="hidden" name="DeliveryType" value="comment"/>
 		
-		<p class="normal">My email address is (e.g., userid<b>@institution.edu</b>):</p>
-		<input style="width:25%;" type="text" name="webuseremail" maxlength="255"/><br/><br/>
-		<p class="normal">My full name is:</p>
-		<input style="width:33%;" type="text" name="webusername" maxlength="255"/><br/><br/>
+		<label for="webusername">Full Name:</label>
+		<p><input style="width:33%;" type="text" name="webusername" maxlength="255"/></p>
+		<label for="webuseremail">Email Address:</label>
+		<p><input style="width:25%;" type="text" name="webuseremail" maxlength="255"/></p>
 
 		<p class="normal"><i>${siteName} is a service that depends on regular updates and feedback.
 			Please help us out by providing any necessary corrections and suggestions for additional content (people, departments, courses, research services, etc.)