You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ja...@apache.org on 2011/08/23 08:52:57 UTC
svn commit: r1160562 - in /incubator/rave/trunk/rave-portal/src/main/webapp:
WEB-INF/views/newaccount.jsp script/rave_forms.js
Author: jasha
Date: Tue Aug 23 06:52:56 2011
New Revision: 1160562
URL: http://svn.apache.org/viewvc?rev=1160562&view=rev
Log:
RAVE-190 changed field names broke client side form validation
Made HTML for form valid
Modified:
incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/newaccount.jsp
incubator/rave/trunk/rave-portal/src/main/webapp/script/rave_forms.js
Modified: incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/newaccount.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/newaccount.jsp?rev=1160562&r1=1160561&r2=1160562&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/newaccount.jsp (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/newaccount.jsp Tue Aug 23 06:52:56 2011
@@ -1,4 +1,4 @@
-<sele%--
+<%--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -27,33 +27,33 @@
<form:form id="newAccountForm" commandName="newUser" action="newaccount" method="POST">
<fieldset>
<p>All fields are required</p>
- <p><form:errors cssClass="error"/>
+ <p><form:errors cssClass="error"/>
<p>
<label for="userNameField">Username:</label>
- <form:input id="userNameField" type="text" path="username" required="required" autofocus="autofocus"/>
+ <form:input id="userNameField" path="username" required="required" autofocus="autofocus"/>
<form:errors path="username" cssClass="error" />
</p>
<p>
<label for="passwordField">Password:</label>
- <form:input id="passwordField" type="password" path="password" required="required"/>
- <form:errors path="password" cssClass="error" />
+ <form:password id="passwordField" path="password" required="required"/>
+ <form:errors path="password" cssClass="error" />
</p>
<p>
<label for="passwordConfirmField">Confirm Password:</label>
- <form:input id="passwordConfirmField" type="password" path="confirmPassword" required="required"/>
- <form:errors path="confirmPassword" cssClass="error" />
+ <form:password id="passwordConfirmField" path="confirmPassword" required="required"/>
+ <form:errors path="confirmPassword" cssClass="error" />
</p>
<p>
- <label for="pageLayoutField">Select Page Layout:</label>
- <form:select path="pageLayout">
- <form:option value="columns_1" id="columns_1_id">One Column</form:option>
- <form:option value="columns_2" id="columns_2_id" selected="selected" xmlns="default namespace">Two Columns</form:option>
- <form:option value="columns_2wn" id="columns_2wn_id">Two Columns (wide/narrow)</form:option>
- <form:option value="columns_3" id="columns_3_id">Three Columns</form:option>
- <form:option value="columns_3nwn" id="columns_3nwn_id">Three Columns (narrow/wide/narrow)</form:option>
- <form:option value="columns_4" id="columns_4_id">Four Columns</form:option>
- <form:option value="columns_3nwn_1_bottom" id="columns_3nwn_1_bottom">Four Columns (narrow/wide/narrow/bottom)</form:option>
- </form:select>
+ <label for="pageLayoutField">Select Page Layout:</label>
+ <form:select path="pageLayout" id="pageLayoutField">
+ <form:option value="columns_1" id="columns_1_id">One Column</form:option>
+ <form:option value="columns_2" id="columns_2_id" selected="selected">Two Columns</form:option>
+ <form:option value="columns_2wn" id="columns_2wn_id">Two Columns (wide/narrow)</form:option>
+ <form:option value="columns_3" id="columns_3_id">Three Columns</form:option>
+ <form:option value="columns_3nwn" id="columns_3nwn_id">Three Columns (narrow/wide/narrow)</form:option>
+ <form:option value="columns_4" id="columns_4_id">Four Columns</form:option>
+ <form:option value="columns_3nwn_1_bottom" id="columns_3nwn_1_bottom">Four Columns (narrow/wide/narrow/bottom)</form:option>
+ </form:select>
</p>
</fieldset>
<fieldset>
Modified: incubator/rave/trunk/rave-portal/src/main/webapp/script/rave_forms.js
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/script/rave_forms.js?rev=1160562&r1=1160561&r2=1160562&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/script/rave_forms.js (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/script/rave_forms.js Tue Aug 23 06:52:56 2011
@@ -23,7 +23,7 @@ rave.forms = rave.forms || (function() {
function validateNewAccountForm() {
$("#newAccountForm").validate({
rules: {
- userName : {
+ username : {
required: true,
minlength: 2
},
@@ -31,14 +31,14 @@ rave.forms = rave.forms || (function() {
required: true,
minlength: 4
},
- passwordConfirm : {
+ confirmPassword : {
required: true,
minlength: 4,
equalTo: "#passwordField"
}
},
messages: {
- passwordConfirm: {
+ confirmPassword: {
equalTo: "The password does not match"
}
}