From a02f9f337a3f4460765ffcdb192d4a0a00df714d Mon Sep 17 00:00:00 2001
From: Seth Meranda <smeranda2@unl.edu>
Date: Wed, 29 Feb 2012 14:35:47 +0000
Subject: [PATCH] Make sure the required attribute is working correctly in IE.
---
WebContent/css/ugradapp.css | 3 +++
WebContent/js/stuapp.js | 9 ++++++++-
WebContent/jsp/ugradpage1.jsp | 26 +++++++++++++-------------
WebContent/jsp/ugradpage2f.jsp | 2 +-
WebContent/jspf/ethnicity.jspf | 2 +-
5 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/WebContent/css/ugradapp.css b/WebContent/css/ugradapp.css
index 2d1492a..31cdb4b 100644
--- a/WebContent/css/ugradapp.css
+++ b/WebContent/css/ugradapp.css
@@ -6,6 +6,7 @@
}
.nav_unpinned #wdn_content_wrapper {margin-top:0;}
#maincontent .grid12 {width:960px;margin-left:0;clear:left;}
+.grid12 {width:960px;}
/*
Form styles
*/
@@ -137,6 +138,7 @@
}
#maincontent .stuapp input[type="text"], #maincontent .stuapp input[type="email"], #maincontent .stuapp select, #maincontent .stuapp textarea {
max-width: 99%;
+ width:99%
}
#maincontent .stuapp input[type="text"], #maincontent .stuapp input[type="email"] {
width: 99%;
@@ -147,6 +149,7 @@
}
#maincontent .stuapp #date_of_birth select {
max-width:45px;
+ width:45px;
}
/* Residency Date Ranges */
diff --git a/WebContent/js/stuapp.js b/WebContent/js/stuapp.js
index ca7e488..878de05 100644
--- a/WebContent/js/stuapp.js
+++ b/WebContent/js/stuapp.js
@@ -1,6 +1,7 @@
/*
2011 updated JS
*/
+
WDN.jQuery('document').ready(function($){
// for IE, we need to add a class to support the two columns
$('#maincontent .stuapp > fieldset > ol > li:nth-child(odd)').addClass('odd');
@@ -24,6 +25,11 @@ WDN.jQuery('document').ready(function($){
return false;
});
$('aside a.showHide').click();
+
+ /*
+ * For layout, we need to add a shim to keep the asides from floating all the way up in IE
+ */
+ $('.stuapp > fieldset, .stuapp input[type="submit"]').before('<div class="grid12" />');
/*
*
* Form Validation Stuff
@@ -48,7 +54,8 @@ WDN.jQuery('document').ready(function($){
elem.required === true;
};
// the current HTML5 spec for required is not as user-friendly as JS alternatives, so we'll yank these out.
- $('.stuapp *:required').addClass('required-entry').removeAttr('required');
+ $('.stuapp *[required]').addClass('required-entry').removeAttr('required');
+ //$('.stuapp *:required').addClass('required-entry').removeAttr('required');
$('#email').addClass('validate-email');
$('#parentZip, #zip').addClass('validate-zip');
$('#ssn1').addClass('validate-digits');
diff --git a/WebContent/jsp/ugradpage1.jsp b/WebContent/jsp/ugradpage1.jsp
index e5a96b2..72ff166 100644
--- a/WebContent/jsp/ugradpage1.jsp
+++ b/WebContent/jsp/ugradpage1.jsp
@@ -177,7 +177,7 @@
<ol>
<li>
<label for="appTerm" class="required">Consider my application for:</label>
- <select id="appTerm" name="Applying_for_Admission" autofocus required aria-required="true">
+ <select id="appTerm" name="Applying_for_Admission" autofocus required="required" aria-required="true">
<c:choose>
<c:when test="${pageScope.appType == 'F'}">
<% // 9-30-2007 if("F".equalsIgnoreCase(appType) || "I".equalsIgnoreCase(appType)) { %>
@@ -249,11 +249,11 @@
<ol>
<li>
<label for="firstName" class="required">First Name</label>
- <input type="text" id="firstName" name="First_Name" value="<c:out value='${ugApp.firstName}' />" required aria-required="true" maxlength="25" />
+ <input type="text" id="firstName" name="First_Name" value="<c:out value='${ugApp.firstName}' />" required="required" aria-required="true" maxlength="25" />
</li>
<li>
<label for="lastName" class="required">Last Name</label>
- <input type="text" id="lastName" name="Last_Name" required aria-required="true" value='<c:out value="${ugApp.lastName}"/>' maxlength="25" />
+ <input type="text" id="lastName" name="Last_Name" required="required" aria-required="true" value='<c:out value="${ugApp.lastName}"/>' maxlength="25" />
</li>
<li>
<label for="middleName">Middle Name</label>
@@ -283,13 +283,13 @@
</li>
<li>
<label for="email">Email address</label>
- <input type="email" id="email" name="Email" value='<c:out value="${ugApp.email1}"/>' size="20" maxlength="40" required />
+ <input type="email" id="email" name="Email" value='<c:out value="${ugApp.email1}"/>' size="20" maxlength="40" required="required" aria-required="true" />
</li>
<li>
<fieldset id="date_of_birth">
<legend id="selectDate1" class="required">Date of Birth</legend>
<span id="monthLabel1">Month</span>
- <select title="Birthday Month" name="Birth_month" id="birth_month" aria-labelledby="selectDate1 monthLabel1" required aria-required="true">
+ <select title="Birthday Month" name="Birth_month" id="birth_month" aria-labelledby="selectDate1 monthLabel1" required="required" aria-required="true">
<c:choose>
<c:when test='${pageScope.birthMm == ""}'>
<unltags:psDbdListOption applId="ugrad" elementId="month" useActiveOnly="true"/>
@@ -300,7 +300,7 @@
</c:choose>
</select>
<span id="dayLabel1">Day</span>
- <select title="Birthday Day" name="Birth_day" id="selectDay1" aria-labelledby="selectDate1 dayLabel1" required aria-required="true">
+ <select title="Birthday Day" name="Birth_day" id="selectDay1" aria-labelledby="selectDate1 dayLabel1" required="required" aria-required="true">
<c:choose>
<c:when test='${pageScope.birthDd == ""}'>
<unltags:psDbdListOption applId="ugrad" elementId="day" useActiveOnly="true"/>
@@ -311,7 +311,7 @@
</c:choose>
</select>
<span id="yearLabel1">Year</span>
- <select title="Birthday Year" name="Birth_year" id="selectYear1" aria-labelledby="selectDate1 yearLabel1" required aria-required="true">
+ <select title="Birthday Year" name="Birth_year" id="selectYear1" aria-labelledby="selectDate1 yearLabel1" required="required" aria-required="true">
<c:choose>
<c:when test='${pageScope.birthYyyy == ""}'>
<unltags:psDbdListOption applId="ugrad" elementId="year" useActiveOnly="true" sortDirection="desc"/>
@@ -327,10 +327,10 @@
<fieldset>
<legend class="required">Gender</legend>
<label for="male">
- <input type="radio" id="male" name="gender" required value="M" <c:if test="${ugApp.gender=='M'}"> checked </c:if> /> Male
+ <input type="radio" id="male" name="gender" required="required" value="M" <c:if test="${ugApp.gender=='M'}"> checked </c:if> /> Male
</label>
<label for="female">
- <input type="radio" id="female" name="gender" required value="F" <c:if test="${ugApp.gender=='F'}"> checked </c:if> /> Female
+ <input type="radio" id="female" name="gender" required="required" value="F" <c:if test="${ugApp.gender=='F'}"> checked </c:if> /> Female
</label>
</fieldset>
</li>
@@ -348,15 +348,15 @@
<fieldset class="grid8 first">
<legend>Mailing Address</legend>
<ol>
- <li class="full">
+ <li>
<label for="street" class="required">Street 1</label>
- <input type="text" id="street" required aria-required="true" name="Street" value="<c:out value='${ugApp.street1}'/>" maxlength="30" />
+ <input type="text" id="street" required="required" aria-required="true" name="Street" value="<c:out value='${ugApp.street1}'/>" maxlength="30" />
<label for="street2">Street 2</label>
<input type="text" id="street2" name="street_2" value="<c:out value='${ugApp.street2}'/>" maxlength="30" />
</li>
<li>
<label for="city" class="required">City</label>
- <input type="text" id="city" required aria-required="true" name="City" value="<c:out value='${ugApp.city}'/>" maxlength="30" />
+ <input type="text" id="city" required="required" aria-required="true" name="City" value="<c:out value='${ugApp.city}'/>" maxlength="30" />
<label for="state" class="required">State</label>
<select id="state" name="State">
<c:choose>
@@ -424,7 +424,7 @@
<fieldset class="grid8 first" id="parentInformation">
<legend>Parent/Guardian Address</legend>
<ol>
- <li class="full">
+ <li>
<label for="parentName">Parent Guardian Name(s)</label>
<input type="text" id="parentName" name="Parent_name" value="<c:out value='${ugApp.nokName}'/>" maxlength="30" />
</li>
diff --git a/WebContent/jsp/ugradpage2f.jsp b/WebContent/jsp/ugradpage2f.jsp
index bcccba6..9c31e61 100644
--- a/WebContent/jsp/ugradpage2f.jsp
+++ b/WebContent/jsp/ugradpage2f.jsp
@@ -855,7 +855,7 @@
<%@ include file="/jspf/applicationFee.jspf" %>
<input type="submit" value="Submit to Admissions" name="btnSubmit" onclick="action.value = 'submit';" />
- <input type="submit" value="Go Back to Previous Page" name="reset" onclick="action.value = 'saveAndGoBack';"/>
+ <a href="#" onclick="action.value = 'saveAndGoBack';">Go Back to Previous Page</a>
</form>
<!-- Special Form used by the popup Window to search for Institution -->
diff --git a/WebContent/jspf/ethnicity.jspf b/WebContent/jspf/ethnicity.jspf
index 79022e6..3eec62f 100644
--- a/WebContent/jspf/ethnicity.jspf
+++ b/WebContent/jspf/ethnicity.jspf
@@ -48,7 +48,7 @@
</ol>
</fieldset>
<aside class="grid4">
- <h4>Ethnic and Racial Background Notes</h4>
+ <h4>Ethnic & Racial Notes</h4>
<p>The ethnic and racial data collection instruments shown here have been formulated to comply with federal guidelines set forth through the Integrated Postsecondary Education Data System as designated by the United States Department of Education.
<a href="#" onclick="document.getElementById('eth_details').style.display=document.getElementById('eth_details').style.display=='none'?'block':'none';return false;">Explanation of categorizations…</a>
</p>
--
GitLab