Author: jonathan Date: Wed Sep 24 10:06:09 2008 New Revision: 22069 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=22069
Log: MASHUP-1115: Added dynamic analysis of password strength at all places where one sets or changes a password. Some minor styling fixes as well. Modified: trunk/mashup/java/modules/www/add_user.jsp trunk/mashup/java/modules/www/css/styles.css trunk/mashup/java/modules/www/register_admin.jsp trunk/mashup/java/modules/www/register_self.jsp trunk/mashup/java/modules/www/user.jsp Modified: trunk/mashup/java/modules/www/add_user.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/add_user.jsp?rev=22069&r1=22068&r2=22069&view=diff ============================================================================== --- trunk/mashup/java/modules/www/add_user.jsp (original) +++ trunk/mashup/java/modules/www/add_user.jsp Wed Sep 24 10:06:09 2008 @@ -75,6 +75,8 @@ <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> <script language="javascript" src="js/common.js" type="text/javascript"></script> + <script language="javascript" src="js/prototype.js" type="text/javascript"></script> + <script language="javascript" src="js/password-utils.js" type="text/javascript"></script> <script language="javascript" type="text/javascript">userLoggedOn = <%=RegistryUtils.isLoggedIn(userRegistry) %>;</script> </head> @@ -109,26 +111,31 @@ <tr> <td width="130"><label><strong>E-mail:</strong></label></td> <td><input type="text" name="emailId" - value="<%=addUserHandler.getEmailId()%>"/></td> + value="<%=addUserHandler.getEmailId()%>"/> + <a class="help" title="An email address is necessary if the user wishes to recover a lost password."><img src="images/blank.gif"/></a> + </td> </tr> <tr> <td><label><strong>Password:<% if (!"true".equals(editMode)) { %> <font color="#FF0000">*</font><%}%></strong></label></td> <td> <% if ("true".equals(editMode) && addUserHandler.isPasswordFixed()) { %> - <div class="login-error">Password changes not perrmitted for this user.</div> + <div class="login-error">Password changes not permitted for this user.</div> <% } else { %> - <input type="password" name="password" - value="<%=addUserHandler.getPassword()%>"/> - <br><div class="login-error"><%=addUserHandler.getErrorMessage("password")%></div> - <% if ("true".equals(editMode)) { %> - <br><strong>If a password is entered here it will reset the user's existing password.</strong> - <% }} %> + <input type="password" id="password" name="password" + value="<%=addUserHandler.getPassword()%>" onkeyup="evalStrength('password','passwordStrength', <%= MashupConstants.MIN_PASSWORD_LENGTH %>)"/> + <span id="passwordStrength"> + <% if ("true".equals(editMode)) { %> + <strong>If a password is entered here it will reset the user's existing password.</strong> + <% } %> + </span> <a class="help" title="Passwords must be at least <%= MashupConstants.MIN_PASSWORD_LENGTH %> characters long. Strong passwords contain at least three of the following: upper case, lower case, numbers, punctuation marks."><img src="images/blank.gif"/></a> + <div class="login-error"><%=addUserHandler.getErrorMessage("password")%></div> + <% } %> </td> </tr> <tr> <td><label><strong>Bio:</strong></label></td> - <td><input type="text" name="bio" + <td><input type="text" name="bio" size="80" value="<%=addUserHandler.getBio()%>"/></td> </tr> <tr> Modified: trunk/mashup/java/modules/www/css/styles.css URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/css/styles.css?rev=22069&r1=22068&r2=22069&view=diff ============================================================================== --- trunk/mashup/java/modules/www/css/styles.css (original) +++ trunk/mashup/java/modules/www/css/styles.css Wed Sep 24 10:06:09 2008 @@ -590,6 +590,14 @@ padding:1em; } +.box td table { + text-align:left; +} + +.box td table td { + padding:6px; +} + div.querypane div.heading { font-size: 12pt; font-family: Verdana, Arial, Helvetica, sans-serif; @@ -1241,4 +1249,4 @@ } -/* Rnd Styles for Data Services*/ +/* End Styles for Data Services*/ Modified: trunk/mashup/java/modules/www/register_admin.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/register_admin.jsp?rev=22069&r1=22068&r2=22069&view=diff ============================================================================== --- trunk/mashup/java/modules/www/register_admin.jsp (original) +++ trunk/mashup/java/modules/www/register_admin.jsp Wed Sep 24 10:06:09 2008 @@ -37,7 +37,7 @@ response.sendRedirect("index.jsp"); return; } - + if (!"true".equals(firstCall)) { if (registrationHandler.isInputValid(request)) { registrationHandler.createAdmin(request); @@ -52,6 +52,8 @@ <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> <script language="javascript" src="js/common.js" type="text/javascript"></script> + <script language="javascript" src="js/prototype.js" type="text/javascript"></script> + <script language="javascript" src="js/password-utils.js" type="text/javascript"></script> <script language="javascript" type="text/javascript">userLoggedOn = <%=RegistryUtils.isLoggedIn(userRegistry) %>;</script> </head> @@ -70,37 +72,39 @@ <td width="130"><label><strong>User Name:<font color="#FF0000">*</font></strong></label></td> <td><input type="text" name="userName" value="<%=registrationHandler.getUserName()%>"/> - <br><font color="#FF0000"><%=registrationHandler.getErrorMessage("userName")%></font> - </td> - </tr> - <tr> - <td width="130"><label><strong>Email:</strong></label></td> - <td><input type="text" name="emailId" - value="<%=registrationHandler.getEmailId()%>"/> - <br><font color="#FF0000"><%=registrationHandler.getErrorMessage("email")%></font> + <div class="login-error"><%=registrationHandler.getErrorMessage("userName")%></div> </td> </tr> <tr> <td width="130"><label><strong>Full Name:</strong></label></td> <td><input type="text" name="fullName" value="<%=registrationHandler.getFullName()%>"/> - <br><font color="#FF0000"><%=registrationHandler.getErrorMessage("fullName")%></font> + <div class="login-error"><%=registrationHandler.getErrorMessage("fullName")%></div> + </td> + </tr> + <tr> + <td width="130"><label><strong>Email:</strong></label></td> + <td><input type="text" name="emailId" + value="<%=registrationHandler.getEmailId()%>"/> + <div class="login-error"><%=registrationHandler.getErrorMessage("email")%></div> </td> </tr> <tr> <td><label><strong>Password:<font color="#FF0000">*</font></strong></label></td> - <td><input type="password" name="password" - value="<%=registrationHandler.getPassword()%>"/> - <br><font color="#FF0000"><%=registrationHandler.getErrorMessage("password")%></font> + <td><input type="password" name="password" id="password" + value="<%=registrationHandler.getPassword()%>" + onkeyup="evalStrength('password','passwordStrength', <%= MashupConstants.MIN_PASSWORD_LENGTH %>)"/> + <span id="passwordStrength"></span> + <a class="help" title="Passwords must be at least <%= MashupConstants.MIN_PASSWORD_LENGTH %> characters long. Strong passwords contain at least three of the following: upper case, lower case, numbers, punctuation marks."><img src="images/blank.gif"/></a> + <div class="login-error"><%=registrationHandler.getErrorMessage("password")%></div> </td> </tr> <tr> - <td><label><strong>Confirmation Password:<font color="#FF0000">*</font></strong></label></td> + <td><label><strong>Confirm password:<font color="#FF0000">*</font></strong></label></td> <td><input type="password" name="confirmedPassword"<%=registrationHandler .getConfirmedPassword()%>"/> - <br><font color="#FF0000"><%=registrationHandler - .getErrorMessage("confirmedPassword")%></font> + <div class="login-error"><%=registrationHandler.getErrorMessage("confirmedPassword")%></div> </td> </tr> <tr> Modified: trunk/mashup/java/modules/www/register_self.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/register_self.jsp?rev=22069&r1=22068&r2=22069&view=diff ============================================================================== --- trunk/mashup/java/modules/www/register_self.jsp (original) +++ trunk/mashup/java/modules/www/register_self.jsp Wed Sep 24 10:06:09 2008 @@ -68,6 +68,8 @@ <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> <script language="javascript" src="js/common.js" type="text/javascript"></script> + <script language="javascript" src="js/prototype.js" type="text/javascript"></script> + <script language="javascript" src="js/password-utils.js" type="text/javascript"></script> <script language="javascript" type="text/javascript">userLoggedOn = <%=RegistryUtils.isLoggedIn(userRegistry) %>;</script> <script type="text/javascript" language="JavaScript"> @@ -116,7 +118,7 @@ <div id="search"></div> <div id="simple-content" style="height:500px; "> <% if (RegistrationBean.isSelfRegistrationEnabled()) { %> -<div class="page_title">Self Registration</div> +<div class="page_title" >Self Registration</div> <br/> <table width="875" border="0" cellpadding="1" cellspacing="0" class="box" align="center"> <tr> @@ -133,42 +135,38 @@ <td width="130"><label><strong>User Name:<font color="#FF0000">*</font></strong></label></td> <td><input type="text" name="userName" value="<%=registrationHandler.getUserName()%>"/> - <br><font color="#FF0000"><%=registrationHandler.getErrorMessage("userName")%> - </font> + <div class="login-error"><%=registrationHandler.getErrorMessage("userName")%></div> </td> </tr> <tr> - <td width="130"><label><strong>Full Name:<font color="#FF0000">*</font></strong></label></td> + <td><label><strong>Full Name:<font color="#FF0000">*</font></strong></label></td> <td><input type="text" name="fullName" value="<%=registrationHandler.getFullName()%>"/> - <br><font color="#FF0000"><%=registrationHandler.getErrorMessage("fullName")%> - </font> + <div class="login-error"><%=registrationHandler.getErrorMessage("fullName")%></div> </td> </tr> <tr> - <td width="130"><label><strong>E-mail:<font color="#FF0000">*</font></strong></label></td> + <td><label><strong>E-mail:<font color="#FF0000">*</font></strong></label></td> <td><input type="text" name="emailId" value="<%=registrationHandler.getEmailId()%>"/> - <br><font color="#FF0000"><%=registrationHandler.getErrorMessage("emailId")%> - </font> + <div class="login-error"><%=registrationHandler.getErrorMessage("emailId")%></div> </td> </tr> <tr> <td><label><strong>Password:<font color="#FF0000">*</font></strong></label></td> - <td><input type="password" name="password" - value="<%=registrationHandler.getPassword()%>"/> - <br><font color="#FF0000"><%=registrationHandler.getErrorMessage("password")%> - </font> + <td><input type="password" name="password" id="password" + value="<%=registrationHandler.getPassword()%>" + onkeyup="evalStrength('password','passwordStrength', <%= MashupConstants.MIN_PASSWORD_LENGTH %>)"/> + <span id="passwordStrength"></span> + <a class="help" title="Passwords must be at least <%= MashupConstants.MIN_PASSWORD_LENGTH %> characters long. Strong passwords contain at least three of the following: upper case, lower case, numbers, punctuation marks."><img src="images/blank.gif"/></a> + <div class="login-error"><%=registrationHandler.getErrorMessage("password")%></div> </td> </tr> <tr> - <td><label><strong>Confirmation Password:<font color="#FF0000">*</font></strong></label></td> + <td><label><strong>Confirm Password:<font color="#FF0000">*</font></strong></label></td> <td><input type="password" - name="confirmedPassword"<%=registrationHandler - .getConfirmedPassword()%>"/> - <br><font color="#FF0000"><%=registrationHandler - .getErrorMessage("confirmedPassword")%> - </font> + name="confirmedPassword" value="<%=registrationHandler.getConfirmedPassword()%>"/> + <div class="login-error"><%=registrationHandler.getErrorMessage("confirmedPassword")%></div> </td> </tr> <% @@ -188,14 +186,12 @@ </td> <td> <br/> - <label>Type the text you see in the image here (Not case sensitive)<font + <label>Type the text you see in the image here (not case sensitive.)<font color="#FF0000">*</font></label> <br/> <input type="text" name="captcha" value="<%=registrationHandler.getCaptcha()%>"/> - <br><font color="#FF0000"><%=registrationHandler - .getErrorMessage("captcha")%> - </font> + <div class="login-error"><%=registrationHandler.getErrorMessage("captcha")%></div> </td> </tr> <% Modified: trunk/mashup/java/modules/www/user.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/user.jsp?rev=22069&r1=22068&r2=22069&view=diff ============================================================================== --- trunk/mashup/java/modules/www/user.jsp (original) +++ trunk/mashup/java/modules/www/user.jsp Wed Sep 24 10:06:09 2008 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -107,6 +107,7 @@ <script type="text/javascript" src="js/mashup-main.js"></script> <script type="text/javascript" src="js/services.js"></script> <script type="text/javascript" src="js/mashup-utils.js"></script> + <script type="text/javascript" src="js/password-utils.js"></script> <script language="javascript" type="text/javascript"> @@ -150,6 +151,7 @@ $("oldPassword_input_text").value = ""; $("newPassword_input_text").value = ""; $("newPasswordConf_input_text").value = ""; + $("passwordStrength").innerHTML = ""; $(field + "_input").show(); $(field).hide(); } @@ -344,8 +346,10 @@ old: </td><td><input type="password" id="oldPassword_input_text"> </td></tr> <tr><td class="profile_label"> - new: </td><td><input type="password" id="newPassword_input_text"> - </td></tr> + new: </td><td><input type="password" id="newPassword_input_text" onkeyup="evalStrength('newPassword_input_text','passwordStrength', <%= MashupConstants.MIN_PASSWORD_LENGTH %>)"> + </td></tr> + <tr><td class="profile_label"> + strength: </td><td><span id="passwordStrength"></span> <a class="help" title="Passwords must be at least <%= MashupConstants.MIN_PASSWORD_LENGTH %> characters long. Strong passwords contain at least three of the following: upper case, lower case, numbers, punctuation marks."><img src="images/blank.gif"/></a></td></tr> <tr><td class="profile_label"> confirm new: </td><td><input type="password" id="newPasswordConf_input_text"> </td></tr></table> _______________________________________________ Mashup-dev mailing list [email protected] http://mailman.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
