[Registry-dev] svn commit r15432 - in
trunk/registry/modules/webapps/src/main/webapp/admin: . js
svn at wso2.org
svn at wso2.org
Tue Apr 1 02:20:02 PDT 2008
Author: chanaka
Date: Tue Apr 1 02:19:45 2008
New Revision: 15432
Log:
some validation related changes
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/advanced-search.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
trunk/registry/modules/webapps/src/main/webapp/admin/js/validation.js
trunk/registry/modules/webapps/src/main/webapp/admin/people.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/recent-activity.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/user.jsp
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/advanced-search.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/advanced-search.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/advanced-search.jsp Tue Apr 1 02:19:45 2008
@@ -65,10 +65,10 @@
<div class="content">
<h1 class="headding-search">Advanced Search</h1>
-
+<div id="advSearchReason" class="validationError" style="display: none;"></div>
<div class="box1-mid" id="userExpanded">
-<form id="advancedSearchForm" name="advancedSearch" onsubmit="return true;" action="/wso2registry/system/search/advanced" method="get">
+<form id="advancedSearchForm" name="advancedSearch" onsubmit="return submitAdvSearchForm()" action="/wso2registry/system/search/advanced" method="get">
<%--<table cellpadding="0" cellspacing="0" border="0" class="form-table">--%>
<%--<tr>--%>
<%--<td class="leftColumn">Search For</td>--%>
@@ -253,7 +253,7 @@
<tr>
<td class="leftColumn"></td>
<td>
- <input type="submit" id="#_0" value="Search" class="button" />
+ <input type="button" id="#_0" value="Search" class="button" onclick="submitAdvSearchForm()" />
</td>
@@ -284,7 +284,7 @@
</tr>
<tr>
<th></th>
- <th>Created Date</th>
+ <th>Created</th>
<th>Author</th>
<th>Rating</th>
</tr>
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp Tue Apr 1 02:19:45 2008
@@ -131,7 +131,7 @@
<td align="left" style="padding-right:0px;"><img src="/wso2registry/admin/images/menu-left.gif" /></td>
- <form action="/wso2registry/system/search" method="get" style="display:inline;" name="searchForm">
+ <form action="/wso2registry/system/search" method="get" style="display:inline;" name="searchForm" onsubmit="submitSearchForm();">
<td class="top-menu">
<input type="text" name="criteria" id="criteria" class="input-text" />
</td>
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js Tue Apr 1 02:19:45 2008
@@ -186,6 +186,7 @@
}else{
reasonDiv.innerHTML=reason;
reasonDiv.style.display="block";
+ return false;
}
}
function addLifecycle(resourcePath){
@@ -421,6 +422,7 @@
if(reason!=""){
reasonDiv.innerHTML=reason;
reasonDiv.style.display="block";
+ return false;
}else{
cleanField($('propName'));
cleanField($('propValue'));
@@ -455,17 +457,41 @@
}
function saveFriendlyName(userName) {
+ var reason="";
+ var reasonDiv=$('userReason');
+
+ reason+=validateIllegal($('friendlyName'),"Display name");
+
+ if(reason!=""){
+ reasonDiv.innerHTML=reason;
+ reasonDiv.style.display="block";
+ return false;
+ }else{
+ cleanField($('userReason'));
+ reasonDiv.style.display="none";
+ var friendlyName = $('friendlyName').value;
+ new Ajax.Updater('friendlyNameDiv', '/wso2registry/system/saveFriendlyName', { method: 'post', parameters: {userName: userName, friendlyName: friendlyName} });
+ showHideCommon('friendlyNameEdit');
+ showHideCommon('friendlyNameView');
+ }
- var friendlyName = document.getElementById('friendlyName').value;
- new Ajax.Updater('friendlyNameDiv', '/wso2registry/system/saveFriendlyName', { method: 'post', parameters: {userName: userName, friendlyName: friendlyName} });
}
function saveNewPassword(userName) {
- var newPassword = document.getElementById('newPassword').value;
- var newPasswordConfirm = document.getElementById('newPasswordConfirm').value;
+ var error="";
+ var reasonDiv=$('userReason');
+
+ var newPassword = $('newPassword').value;
+ var newPasswordConfirm = $('newPasswordConfirm').value;
+ if(newPassword!=newPasswordConfirm) {
+ error="Please verify your password again.<br />";
+ $('newPassword').style.background="Yellow";
+ $('newPasswordConfirm').style.background="Yellow";
+ }
+ error +=validatePassword($('newPassword'));
var passwordErrorMessage = document.getElementById('passwordErrorMessage');
- if(newPassword!=newPasswordConfirm){
- passwordErrorMessage.style.display = "block";
- passwordErrorMessage.innerHTML="Please verify your password again.";
+ if(error!=""){
+ reasonDiv.innerHTML=error;
+ reasonDiv.style.display="block";
}
else
{
@@ -474,7 +500,10 @@
showHideCommon('passwordEdit1');
showHideCommon('passwordEdit2');
showHideCommon('passwordEdit3');
-
+ reasonDiv.style.display="none";
+ $('newPassword').style.background="#ffffff";
+ $('newPasswordConfirm').style.background="#ffffff";
+
new Ajax.Updater('passwordDiv', '/wso2registry/system/saveNewPassword', { method: 'post', parameters: {userName: userName, newPassword: newPassword} });
}
}
@@ -591,6 +620,7 @@
if(reason!=""){
resourceReason.style.display="block";
resourceReason.innerHTML=reason;
+ return false;
}else{
if (document.getElementById('contentURL').checked) {
rForm.encoding = "application/x-www-form-urlencoded";
@@ -610,10 +640,12 @@
var reasonDiv=$('collectionReason');
var reason="";
reason +=validateIllegal($('collectionName'),"Name");
-
- if(reason!="") reasonDiv.style.display="block";
- else document.forms["collectionForm"].submit();
reasonDiv.innerHTML=reason;
+ if(reason!="") {
+ reasonDiv.style.display="block";
+ return false;
+ }
+ else document.forms["collectionForm"].submit();
}
function submitUserAddForm(){
var reasonDiv=$('newUserReason');
@@ -629,46 +661,82 @@
$('passwordMain').style.background="#ffffff";
}
reason +=validateForInput($('friendlyName'),"Display name");
-
+ reasonDiv.innerHTML=reason;
if(reason!="") {
reasonDiv.style.display="block";
+ return false;
}
else {
document.forms["peopleAddForm"].submit();
showHideCommon('userAddBox');
}
- reasonDiv.innerHTML=reason;
}
function submitRoleAddForm(){
var reasonDiv=$('newRoleReason');
var reason="";
reason +=validateIllegal($('newRoleName'),"Role Name");
-
+ reasonDiv.innerHTML=reason;
+
if(reason!="") {
reasonDiv.style.display="block";
+ return false;
}
else {
document.forms["roleAddForm"].submit();
showHideCommon('addRoleBox');
}
- reasonDiv.innerHTML=reason;
}
function submitSearchForm(){
var reasonDiv=$('searchReason');
var reason="";
reason +=validateForInput($('criteria'),"Search Criteria");
-
+ reasonDiv.innerHTML=reason;
if(reason!="") {
reasonDiv.style.display="block";
+ return false;
}
else {
document.forms["searchForm"].submit();
- showHideCommon('addRoleBox');
}
+}
+
+function submitAdvSearchForm(){
+ var reasonDiv=$('advSearchReason');
+ var reason="";
+
+ if($('#_cfromDate').value!="") reason +=validateDate($('#_cfromDate'),"From");
+ if($('#_ctoDate').value!="") reason +=validateDate($('#_ctoDate'),"To");
+ if($('#_ufromDate').value!="") reason +=validateDate($('#_ufromDate'),"From");
+ if($('#_utoDate').value!="") reason +=validateDate($('#_utoDate'),"From");
+ reasonDiv.innerHTML=reason;
+ if(reason!="") {
+ reasonDiv.style.display="block";
+ return false;
+ }
+ else {
+ document.forms["advancedSearch"].submit();
+ }
+}
+
+function submitActivityForm(){
+ var reasonDiv=$('activityReason');
+ var reason="";
+
+ if($('fromDate').value!="") reason +=validateDate($('fromDate'),"From");
+ if($('toDate').value!="") reason +=validateDate($('toDate'),"To");
+
reasonDiv.innerHTML=reason;
+ if(reason!="") {
+ reasonDiv.style.display="block";
+ return false;
+ }
+ else {
+ document.forms["activityForm"].submit();
+ }
}
+
function doGreeting(){
datetoday = new Date();
timenow=datetoday.getTime();
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/js/validation.js
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/js/validation.js (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/js/validation.js Tue Apr 1 02:19:45 2008
@@ -71,6 +71,18 @@
}
return error;
}
+function validateDate(fld,fldName){
+ var error = "";
+ var allowed= /(0[1-9]|1[0-2]\/[0-2][0-9]|3[0-1]\/[1-2][0-9][0-9][0-9])/;
+ if (allowed.test(fld.value)) {
+ fld.style.background = '#ffffff;';
+ }
+ else {
+ error = "The "+fldName+" is not a valid date. Please make sure it's in MM/DD/YYYY format.<br />";
+ fld.style.background = 'Yellow';
+ }
+ return error;
+}
function validateUsername(fld) {
var error = "";
var illegalChars = /\W/; // allow letters, numbers, and underscores
@@ -89,6 +101,7 @@
}
return error;
}
+
function validatePassword(fld) {
var error = "";
var illegalChars = /[\W_]/; // allow only letters and numbers
@@ -96,16 +109,16 @@
if (fld.value == "") {
fld.style.background = 'Yellow';
error = "You didn't enter a password.<br />";
- } else if ((fld.value.length < 7) || (fld.value.length > 15)) {
- error = "The password is the wrong length. <br />";
+ } else if ((fld.value.length < 3) || (fld.value.length > 15)) {
+ error = "The password is the wrong length. It should be 3 to 15 characters long.<br />";
fld.style.background = 'Yellow';
} else if (illegalChars.test(fld.value)) {
error = "The password contains illegal characters.<br />";
fld.style.background = 'Yellow';
- } else if (!((fld.value.search(/(a-z)+/)) && (fld.value.search(/(0-9)+/)))) {
+ } /*else if (!((fld.value.search(/(a-z)+/)) && (fld.value.search(/(0-9)+/)))) {
error = "The password must contain at least one numeral.<br />";
fld.style.background = 'Yellow';
- } else {
+ } */else {
fld.style.background = 'White';
}
return error;
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/people.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/people.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/people.jsp Tue Apr 1 02:19:45 2008
@@ -74,7 +74,7 @@
<div id="userAddBox" style="display:none;">
<h3 class="forPeople">Add New User</h3>
- <div id="newUserReason" class="validationError" style="display: none;"></div>
+ <div id="newUserReason" class="validationError" style="display: none;" onsubmit="return submitUserAddForm();"></div>
<form action="/wso2registry/system/addUser" method="post" name="peopleAddForm">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="form-table" style="margin-left:10px;margin-top:-5px;">
<tr>
@@ -192,7 +192,7 @@
<div id="addRoleBox" style="display:none;">
<h3 class="forPeople">Add New Role</h3>
<div id="newRoleReason" class="validationError" style="display: none;"></div>
- <form action="/wso2registry/system/addRole" method="post" name="roleAddForm">
+ <form action="/wso2registry/system/addRole" method="post" name="roleAddForm" onsubmit="return submitRoleAddForm();">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="form-table" style="margin-left:10px;margin-top:-5px;">
<tr>
<td width="130">Role name</td>
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/recent-activity.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/recent-activity.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/recent-activity.jsp Tue Apr 1 02:19:45 2008
@@ -15,7 +15,8 @@
<meta http-equiv=pragma content="no-cache">
<meta name="revisit-after" content="1 day">
<meta http-equiv="content-script-type" content="text/javascript">
-
+
+ <script language="JavaScript" type="text/JavaScript" src="/wso2registry/admin/js/validation.js"></script>
<script language="JavaScript" type="text/JavaScript" src="/wso2registry/admin/js/common.js"></script>
<script language="JavaScript" type="text/JavaScript" src="/wso2registry/admin/js/prototype.js"></script>
<script language="javascript1.2" src="/wso2registry/admin/js/CodeThatCalendar/Scripts/codethatcalendarstd.js"></script>
@@ -58,7 +59,7 @@
<div class="error-message"><%=errorMessage%></div>
<% } %>
-
+ <div id="activityReason" class="validationError" style="display: none;"></div>
<!-- Hear comes the box1 table -->
@@ -66,7 +67,7 @@
<div class="box1-mid">
<!-- all the content goes here -->
- <form action="/wso2registry/system/activity" method="get">
+ <form action="/wso2registry/system/activity" method="get" name="activityForm" onsubmit="return submitActivityForm();">
<table cellpadding="0" cellspacing="0" border="0" class="form-table">
<tr>
<td style="width:100px;" valign="top">Username</td>
@@ -87,13 +88,13 @@
From :
</td>
<td>
- <input type="text" name="fromDate" style="widht:140px;" /> <a href="#cal1" name="cal1" onclick="c1.popup('fromDate');"><img src="/wso2registry/admin/images/calendar.jpg" border="0" align="top" /></a>
+ <input type="text" name="fromDate" id="fromDate" style="widht:140px;" /> <a href="#cal1" name="cal1" onclick="c1.popup('fromDate');"><img src="/wso2registry/admin/images/calendar.jpg" border="0" align="top" /></a>
</td>
<td style="padding-left:10px;">
To :
</td>
<td>
- <input type="text" name="toDate" style="widht:140px;" /> <a href="#cal1" onclick="c2.popup('toDate');"><img src="/wso2registry/admin/images/calendar.jpg" border="0" align="top" /></a>
+ <input type="text" name="toDate" id="toDate" style="widht:140px;" /> <a href="#cal1" onclick="c2.popup('toDate');"><img src="/wso2registry/admin/images/calendar.jpg" border="0" align="top" /></a>
</td>
</tr>
<tr>
@@ -123,7 +124,7 @@
<tr>
<td></td>
- <td><input class="button" type="submit" value="Search Activities"/></td>
+ <td><input class="button" type="button" onclick="submitActivityForm();" value="Search Activities"/></td>
</tr>
</table>
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp Tue Apr 1 02:19:45 2008
@@ -180,7 +180,7 @@
<td class="propertiesCol">
<div id="propertiesReason" class="validationError" style="display: none;"></div>
<div id="propertiesAddDiv" style="display:none;">
- <form>
+ <form onsubmit="return setProperty();">
<input type="hidden" id="propRPath" value="<%=details.getPath()%>" />
<table cellpadding="0" cellspacing="0" border="0" class="simple-data-table">
@@ -333,7 +333,7 @@
<!-- Add resource div -->
<div class="add-resource-div" id="add-resource-div" style="display:none;">
- <form method="post" name="resourceupload" id="resourceupload" action="/wso2registry/system/addResource"
+ <form onsubmit="return submitResourceAddForm();" method="post" name="resourceupload" id="resourceupload" action="/wso2registry/system/addResource"
enctype="multipart/form-data">
<input type="hidden" name="path" value="<%=details.getPath()%>"/>
@@ -384,7 +384,7 @@
<!-- Add folder div -->
<div class="add-resource-div" id="add-folder-div" style="display:none;">
<h3>Add Collection</h3>
- <form name="collectionForm" method="post" action="/wso2registry/system/addCollection">
+ <form name="collectionForm" method="post" action="/wso2registry/system/addCollection" onsubmit="return submitCollectionAddForm();">
<input type="hidden" name="parentPath" value="<%=details.getPath()%>"/>
<div class="validationError" id="collectionReason" style="display:none;"></div>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
@@ -639,7 +639,7 @@
<h3>Add Comment</h3>
<div id="commentsReason" class="validationError" style="display: none;"></div>
- <form>
+ <form onsubmit="return addComment('<%=details.getPath()%>');">
<textarea id="comment" name="comment" class="comment-textbox" style="width:99%"></textarea>
<div style="margin-top:10px;"><input type="button" class="button" value="Add" onclick="addComment('<%=details.getPath()%>');" /> <input type="button" class="button" value="Cancel" onclick="showHideCommon('add-comment-div');" /></div>
</form>
@@ -698,7 +698,7 @@
<div id="add-lifecycle-div" style="display:none;padding-bottom:10px;">
<h3>Assign New Lifecycle</h3>
- <form>
+ <form onsubmit="return addLifecycle('<%=details.getPath()%>');">
<input type="text" id="lifecycle" name="lifecycle" style="width:99%" />
<div style="margin-top:10px;"><input type="button" class="button" value="Add" onclick="addLifecycle('<%=details.getPath()%>');showHideCommon('add-lifecycle-div');" /> <input type="button" class="button" value="Cancel" onclick="showHideCommon('add-lifecycle-div');" /></div>
</form>
@@ -770,7 +770,7 @@
<div id="dependenciesAddDiv" style="display:none;">
- <form>
+ <form onsubmit="return addDependency();">
<input type="hidden" name="resourcePath" id="resourcePath" value="<%=details.getPath()%>" />
<table cellpadding="0" cellspacing="0" border="0" class="simple-data-table">
<tr><th>Dependency: </th><td><input type="text" id="dependency" name="dependency" /></td></tr>
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/user.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/user.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/user.jsp Tue Apr 1 02:19:45 2008
@@ -5,6 +5,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
+ <script language="JavaScript" type="text/JavaScript" src="/wso2registry/admin/js/validation.js"></script>
<script language="JavaScript" type="text/JavaScript" src="/wso2registry/admin/js/common.js"></script>
<script language="JavaScript" type="text/JavaScript" src="/wso2registry/admin/js/prototype.js"></script>
<link type="text/css" href="/wso2registry/admin/css/main.css" rel="stylesheet" />
@@ -43,7 +44,7 @@
<!-- Hear comes the box1 table -->
-
+<div id="userReason" class="validationError" style="display: none;"></div>
<div class="box1-mid">
<!-- all the content goes here -->
<h3>Personal information - <%=userDetailsAction.getDisplayUserName()%></h3>
@@ -65,7 +66,7 @@
<tr id="friendlyNameEdit" style="display:none;">
<th style="width:140px; height:25px;">Display name:</th>
<td style="text-align:right;width:20px;" align="right">
- <a title="Save Friendly Name" href="#editButton" onclick="showHideCommon('friendlyNameEdit');showHideCommon('friendlyNameView');saveFriendlyName('<%=userDetailsAction.getDisplayUserName()%>');">
+ <a title="Save Friendly Name" href="#editButton" onclick="saveFriendlyName('<%=userDetailsAction.getDisplayUserName()%>');">
<img border="0" align="bottom" src="/wso2registry/admin/images/save-button.gif"/>
</a>
</td>
More information about the Registry-dev
mailing list