[Mapbender-commits] r5895 - in branches/3_dev/http: . plugins

Sat Apr 10 11:29:22 EDT 2010

Author: marc
Date: 2010-04-10 11:29:22 -0400 (Sat, 10 Apr 2010)
New Revision: 5895

Modified:
   branches/3_dev/http/index.php
   branches/3_dev/http/plugins/mb_forgot_password.js
   branches/3_dev/http/plugins/mb_forgot_password_html.php
Log:
validation in PasswordFunction

Modified: branches/3_dev/http/index.php
===================================================================

--- branches/3_dev/http/index.php	2010-04-10 15:27:22 UTC (rev 5894)
+++ branches/3_dev/http/index.php	2010-04-10 15:29:22 UTC (rev 5895)
@@ -18,6 +18,9 @@
 <meta http-equiv="expires" content="0">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Welcome to the Mapbender Portal</title>
+<!--
+<link rel="stylesheet" type="text/css" href="css/mapbender.css" />
+-->
 	<link type="text/css" href="./extensions/jquery-ui-1.8.custom/development-bundle/themes/base/jquery.ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="./extensions/jquery-ui-1.8.custom/development-bundle/jquery-1.4.2.js"></script>
 	<script type="text/javascript" src="./extensions/jquery-ui-1.8.custom/development-bundle/external/jquery.bgiframe-2.1.1.js"></script>
@@ -28,6 +31,7 @@
 	<script type="text/javascript" src="./extensions/jquery-ui-1.8.custom/development-bundle/ui/jquery.ui.position.js"></script>
 	<script type="text/javascript" src="./extensions/jquery-ui-1.8.custom/development-bundle/ui/jquery.ui.resizable.js"></script>
 	<script type="text/javascript" src="./extensions/jquery-ui-1.8.custom/development-bundle/ui/jquery.ui.dialog.js"></script>
+	<script type="text/javascript" src="./extensions/jquery-validate/jquery.validate.js"></script>
 
 	<script type="text/javascript" src="./plugins/mb_login.js"></script>
 	<script type="text/javascript" src="./plugins/mb_forgot_password.js"></script>
@@ -38,7 +42,10 @@
 		$("#forgotPassword").forgotPassword();
 	});
 	</script>
+<style type="text/css">
+label.error { float: none; color: red; padding-left: .5em; vertical-align: top; }
 
+</style>
 <body>
 <p><a href="#" id="mylink">Anmelden</a></p>
 <p><a href="#" id="forgotPassword">Password</a></p>
@@ -132,16 +139,6 @@
 	</tr>
 </table>
 
-<form name='passwordForm' id='passwordForm' action ='./frames/forgottenPassword.php' method='POST'>
-	<fieldset>
-		<label for="name">Name</label>
-		<input type="text" name="name" id="name" class="text ui-widget-content ui-corner-all" />
-		<label for="email">Email</label>
 
-		<input type="text" name="email" id="email" value="" class="required email" />
-		     <input class="submit" type="submit" value="Submit"/>
-	</fieldset>
-</form>
-
 </body>
 </html>
\ No newline at end of file

Modified: branches/3_dev/http/plugins/mb_forgot_password.js
===================================================================
--- branches/3_dev/http/plugins/mb_forgot_password.js	2010-04-10 15:27:22 UTC (rev 5894)
+++ branches/3_dev/http/plugins/mb_forgot_password.js	2010-04-10 15:29:22 UTC (rev 5895)
@@ -4,22 +4,29 @@
 			//alert(this.id);
 			if ($(this).is('div')) {
 				$(this).load("./plugins/mb_forgot_password_html.php");
+				//$("#passwordForm").validate();
+
 			}
 			else {
 				var $passwordDiv = $("<div title='forgotten Password'/>").hide().load("./plugins/mb_forgot_password_html.php");
 				$(this).append($passwordDiv).bind("click", function () {
 					$passwordDiv.dialog({
-						buttons: {
-							"order New": function () {
-								$("form", $passwordDiv).get(0).submit();
-							}
-						},
+						//buttons: {
+						//	"order New": function () {
+						//		$("form", $passwordDiv).get(0).submit();
+						//	}
+						//},
 						modal: true,
 						resizable: false,
 						draggable: false
 					});
+					$("#passwordForm").validate();
 				});
 			}
 		});
 	};
+
+
+
 })(jQuery);
+

Modified: branches/3_dev/http/plugins/mb_forgot_password_html.php
===================================================================
--- branches/3_dev/http/plugins/mb_forgot_password_html.php	2010-04-10 15:27:22 UTC (rev 5894)
+++ branches/3_dev/http/plugins/mb_forgot_password_html.php	2010-04-10 15:29:22 UTC (rev 5895)
@@ -5,9 +5,10 @@
 <form name='passwordForm' id='passwordForm' action ='./frames/forgottenPassword.php' method='POST'>
 	<fieldset>
 		<label for="name">Name</label>
-		<input type="text" name="name" id="name" class="text ui-widget-content ui-corner-all" />
+		<input type="text" name="name" id="name" class="text ui-widget-content required ui-corner-all" />
 		<label for="email">Email</label>
 
-		<input type="text" name="email" id="email" value="" class="required" />
+		<input type="text" name="email" id="email" value="" class="required email" />
+		<input class="submit" type="submit" value="Submit"/>
 	</fieldset>
 </form>

