[Mapbender-commits] r5941 - branches/3_dev/http/plugins

[svn_mapbender at osgeo.org]

Author: mh
Date: 2010-04-11 10:55:40 -0400 (Sun, 11 Apr 2010)
New Revision: 5941

Modified:
   branches/3_dev/http/plugins/mb_forgot_password.js
   branches/3_dev/http/plugins/mb_loginForm.js
   branches/3_dev/http/plugins/mb_login_html.php
Log:
login via index.php

Modified: branches/3_dev/http/plugins/mb_forgot_password.js
===================================================================
--- branches/3_dev/http/plugins/mb_forgot_password.js	2010-04-11 14:52:35 UTC (rev 5940)
+++ branches/3_dev/http/plugins/mb_forgot_password.js	2010-04-11 14:55:40 UTC (rev 5941)
@@ -3,13 +3,13 @@
 		return this.each(function () {
 			//alert(this.id);
 			if ($(this).is('div')) {
-				$(this).load("./plugins/mb_forgot_password_html.php");
+				$(this).load("../plugins/mb_forgot_password_html.php");
 				//$("#passwordForm").validate();
 
 			}
 			else {
-				var $passwordDiv = $("<div title='Order a new password'/>").hide().load("./plugins/mb_forgot_password_html.php", function (){
-					$(this).find('form').validate()
+				var $passwordDiv = $("<div title='Order a new password'/>").hide().load("../plugins/mb_forgot_password_html.php", function (){
+					$(this).find('form').validate();
 				});
 				$(this).append($passwordDiv).bind("click", function () {
 					$passwordDiv.dialog({
@@ -18,11 +18,10 @@
 								if (!$passwordDiv.find('form').valid()){
 									return false;
 								}
-								
 								var name = $("form", $passwordDiv).get(0).name.value;
 								var email = $("form", $passwordDiv).get(0).email.value;
 								var req = new Mapbender.Ajax.Request({
-									url: "./plugins/mb_forgot_password_server.php",
+									url: "../plugins/mb_forgot_password_server.php",
 									method: "setNewPasswordRequest",
 									parameters: {
 										name: name,
@@ -38,11 +37,12 @@
 											userId : message
 										};
 
-										$.post("./plugins/mod_sendUserMail.php", parameters, function (json, status) {
+										$.post("../plugins/mod_sendUserMail.php", parameters, function (json, status) {
 											if(status == 'success') {
 												alert(json);
 												$passwordDiv.dialog('close');
-											}else {
+											}
+											else {
 												alert('send Error');
 											}
 										});
@@ -61,8 +61,4 @@
 			}
 		});
 	};
-
-
-
-})(jQuery);
-
+})(jQuery);
\ No newline at end of file

Modified: branches/3_dev/http/plugins/mb_loginForm.js
===================================================================
--- branches/3_dev/http/plugins/mb_loginForm.js	2010-04-11 14:52:35 UTC (rev 5940)
+++ branches/3_dev/http/plugins/mb_loginForm.js	2010-04-11 14:55:40 UTC (rev 5941)
@@ -3,10 +3,14 @@
 		return this.each(function () {
 			//alert(this.id);
 			if ($(this).is('div')) {
-				$(this).load("../plugins/mb_login_html.php");
+				$(this).load("../plugins/mb_login_html.php", function () {
+					$(this).find("a").forgotPassword();
+				});
 			}
 			else {
-				var $loginDiv = $("<div title='Login'/>").hide().load("../plugins/mb_login_html.php");
+				var $loginDiv = $("<div title='Login'/>").hide().load("../plugins/mb_login_html.php", function () {
+					$(this).find("a").forgotPassword();
+				});
 				$(this).append($loginDiv).bind("click", function () {
 					$loginDiv.dialog({
 						buttons: {

Modified: branches/3_dev/http/plugins/mb_login_html.php
===================================================================
--- branches/3_dev/http/plugins/mb_login_html.php	2010-04-11 14:52:35 UTC (rev 5940)
+++ branches/3_dev/http/plugins/mb_login_html.php	2010-04-11 14:55:40 UTC (rev 5941)
@@ -5,11 +5,9 @@
 	echo "<table>";
 	echo "<tr><td>" . _mb("Name") . ": </td><td><input type='text' name='name' class='login_text' value=''></td></tr>";
 	echo "<tr><td>" . _mb("Password") . ": </td><td><input type='password' name='password' class='login_text'></td></tr>";
-	echo "<tr><td></td><td>";
-//	echo "<input type='submit' class='myButton' value='login' title='anmelden'>";
-	echo "&nbsp;&nbsp;<a href='../frames/forgottenPassword.php' title='" . 
-		_mb("Forgot your password?") . "' target='_blank'>" . 
-		_mb("Forgot your password?") . "</a>";
-	echo "</td></tr></table>";
+	echo "</table>";
 	echo "</form>";
-?>
\ No newline at end of file
+	echo "<a href='#' title='" . 
+		_mb("Forgot your password?") . "'>" . 
+		_mb("Forgot your password?") . "</a>";
+	?>
\ No newline at end of file