litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rewrote comment form controllers and templates in FreeMarker.

Browse source
This commit is contained in:
rjy7 2010-05-19 19:50:54 +00:00
parent ae01a03122
commit f88a77d307
24 changed files with 723 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

75
webapp/web/js/commentForm.js Normal file
View file

@ -0,0 +1,75 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
function ValidateForm(formName) {
var x = 0; // counts form elements - used as array index
var y = 0; // counts required fields - used as array index
errors = false;
var errorList;
if (document.forms[formName].RequiredFields) {
errorList = 'Please fill out the following required fields:\n';
// build array of required fields
reqStr = document.forms[formName].RequiredFields.value;
requiredFields = reqStr.split(',');
// build array holding the names of required fields as
// displayed in error box
if (document.forms[formName].RequiredFieldsNames) {
reqNameStr = document.forms[formName].RequiredFieldsNames.value;
} else {
reqNameStr = document.forms[formName].RequiredFields.value;
}
requiredNames = reqNameStr.split(',');
// Loop through form elements, checking for required fields
while ((x < document.forms[formName].elements.length)) {
if (document.forms[formName].elements[x].name == requiredFields[y]) {
if (document.forms[formName].elements[x].value == '') {
errorList += requiredNames[y] + '\n';
errors = true;
}
y++;
}
x++;
}
if (errors) {
alert(errorList);
return false;
}
x = 0;
y = 0;
}
// Check for Email formatting
if (document.forms[formName].EmailFields) {
errorList = 'Please format your e-mail address as: \"userid@institution.edu\" or enter another complete email address';
// build array of required fields
emailStr = document.forms[formName].EmailFields.value;
emailFields = emailStr.split(',');
// build array holding the names of required fields as
// displayed in error box
if (document.forms[formName].EmailFieldsNames) {
emailNameStr = document.forms[formName].EmailFieldsNames.value;
} else {
emailNameStr = document.forms[formName].EmailFields.value;
}
emailNames = emailNameStr.split(',');
// Loop through form elements, checking for required fields
while ((x < document.forms[formName].elements.length)) {
if (document.forms[formName].elements[x].name == emailFields[y]) {
if ((document.forms[formName].elements[x].value.indexOf('@') < 1)
|| (document.forms[formName].elements[x].value.lastIndexOf('.') < document.forms[formName].elements[x].value.indexOf('@')+1)) {
errors = true;
}
y++;
}
x++;
}
if (errors) {
alert(errorList);
return false;
}
x = 0;
y = 0;
}
return true;
}

79
webapp/web/js/commentsForm.js
View file

@ -1,79 +0,0 @@
<!-- /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -->
<script language="JavaScript" type="text/javascript">
<!--
function ValidateForm(formName) {
var x = 0; // counts form elements - used as array index
var y = 0; // counts required fields - used as array index
errors = false;
var errorList;
if (document.forms[formName].RequiredFields) {
errorList = 'Please fill out the following required fields:\n';
// build array of required fields
reqStr = document.forms[formName].RequiredFields.value;
requiredFields = reqStr.split(',');
// build array holding the names of required fields as
// displayed in error box
if (document.forms[formName].RequiredFieldsNames) {
reqNameStr = document.forms[formName].RequiredFieldsNames.value;
} else {
reqNameStr = document.forms[formName].RequiredFields.value;
}
requiredNames = reqNameStr.split(',');
// Loop through form elements, checking for required fields
while ((x < document.forms[formName].elements.length)) {
if (document.forms[formName].elements[x].name == requiredFields[y]) {
if (document.forms[formName].elements[x].value == '') {
errorList += requiredNames[y] + '\n';
errors = true;
}
y++;
}
x++;
}
if (errors) {
alert(errorList);
return false;
}
x = 0;
y = 0;
}
// Check for Email formatting
if (document.forms[formName].EmailFields) {
errorList = 'Please format your e-mail address as: \"userid@institution.edu\" or enter another complete email address';
// build array of required fields
emailStr = document.forms[formName].EmailFields.value;
emailFields = emailStr.split(',');
// build array holding the names of required fields as
// displayed in error box
if (document.forms[formName].EmailFieldsNames) {
emailNameStr = document.forms[formName].EmailFieldsNames.value;
} else {
emailNameStr = document.forms[formName].EmailFields.value;
}
emailNames = emailNameStr.split(',');
// Loop through form elements, checking for required fields
while ((x < document.forms[formName].elements.length)) {
if (document.forms[formName].elements[x].name == emailFields[y]) {
if ((document.forms[formName].elements[x].value.indexOf('@') < 1)
|| (document.forms[formName].elements[x].value.lastIndexOf('.') < document.forms[formName].elements[x].value.indexOf('@')+1)) {
errors = true;
}
y++;
}
x++;
}
if (errors) {
alert(errorList);
return false;
}
x = 0;
y = 0;
}
return true;
}
-->
</script>

7
webapp/web/js/commentsForm.jsp Normal file
View file

@ -0,0 +1,7 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%
String contextPath = request.getContextPath();
%>
<script language="JavaScript" type="text/javascript" src="<%= contextPath %>/js/commentForm.js"></script>