New js login form works

greghaynes · Mar 25, 2010 · d0b06ee · d0b06ee
1 parent 6a50eac
commit d0b06ee
Show file tree

Hide file tree

Showing 18 changed files with 509 additions and 36 deletions.
diff --git a/http/admin.html b/http/admin.html
@@ -1,8 +1,10 @@
 <html>
 
 <head>
+<link rel="stylesheet" href="css/jquery-ui.css" type="text/css" />
 <link rel="stylesheet" href="css/main.css" type="text/css" />
 <script type="text/javascript" src="js/jquery.js"></script>
+<script type="text/javascript" src="js/jquery-ui.js"></script>
 <script type="text/javascript" src="js/xsbs.js"></script>
 <script type="text/javascript">
 	var hostname = 'localhost:8081';
@@ -16,16 +18,6 @@
 
 <body onload="start()">
 <div id="content">
-	<h2>XSBS Admin Panel</h2>
-	<div id="topnav">
-		<ul id="topnav_list">
-			<li><a href="#" id="topnav_players">Players</a></li>
-			<li><a href="#" id="topnav_server">Server</a></li>
-			<li><a href="#" id="topnav_logout">Logout</a></li>
-		</ul>
-	</div>
-	<div id="main_content">
-	</div>
 </div>
 <div id="alerts"></div>
 </body>

diff --git a/http/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/http/css/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/http/css/images/ui-bg_glass_95_fef1ec_1x400.png b/http/css/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/http/css/images/ui-bg_gloss-wave_16_121212_500x100.png b/http/css/images/ui-bg_gloss-wave_16_121212_500x100.png
diff --git a/http/css/images/ui-bg_highlight-hard_15_888888_1x100.png b/http/css/images/ui-bg_highlight-hard_15_888888_1x100.png
diff --git a/http/css/images/ui-bg_highlight-hard_55_555555_1x100.png b/http/css/images/ui-bg_highlight-hard_55_555555_1x100.png
diff --git a/http/css/images/ui-bg_highlight-soft_35_adadad_1x100.png b/http/css/images/ui-bg_highlight-soft_35_adadad_1x100.png
diff --git a/http/css/images/ui-bg_highlight-soft_60_dddddd_1x100.png b/http/css/images/ui-bg_highlight-soft_60_dddddd_1x100.png
diff --git a/http/css/images/ui-bg_inset-soft_15_121212_1x100.png b/http/css/images/ui-bg_inset-soft_15_121212_1x100.png
diff --git a/http/css/images/ui-icons_666666_256x240.png b/http/css/images/ui-icons_666666_256x240.png
diff --git a/http/css/images/ui-icons_aaaaaa_256x240.png b/http/css/images/ui-icons_aaaaaa_256x240.png
diff --git a/http/css/images/ui-icons_bbbbbb_256x240.png b/http/css/images/ui-icons_bbbbbb_256x240.png
diff --git a/http/css/images/ui-icons_c98000_256x240.png b/http/css/images/ui-icons_c98000_256x240.png
diff --git a/http/css/images/ui-icons_cccccc_256x240.png b/http/css/images/ui-icons_cccccc_256x240.png
diff --git a/http/css/images/ui-icons_cd0a0a_256x240.png b/http/css/images/ui-icons_cd0a0a_256x240.png
diff --git a/http/css/images/ui-icons_f29a00_256x240.png b/http/css/images/ui-icons_f29a00_256x240.png
diff --git a/http/css/jquery-ui.css b/http/css/jquery-ui.css
diff --git a/http/js/xsbs.js b/http/js/xsbs.js
@@ -83,35 +83,36 @@ function enableTopNav(hostname, username, password)
 	$('#topnav_logout').click(function() { window.location.reload(); });
 }
 
-function loadLoginPage(hostname, callback) {
-	html_page = '<h3>Please login</h3>Username: <input type=\"text\" id=\"username_input\" /><br />Password: <input type=\"password\" id=\"password_input\" /><br /><input type=\"submit\" value=\"Login\" id=\"login_submit\" /><br /><span id=\"login_status\"></span>';
-	displayAlert(html_page);
-	$('#login_submit').click(function() {
-		$('#login_status').empty();
-		$('#login_status').html('Trying login...');
-		var username = $('#username_input').val();
-		var password = $('#password_input').val();
-		tryLogin(hostname, username, password, function(data) {
-				error_code = data.error
-				$('#login_status').empty();
-				if(error_code == 'INVALID_LOGIN')
-					$('#login_status').html('Invalid login.');
-				else
-					$('#login_status').html('Unknown error.');
-				},
-			function(data) {
-				$('#login_status').empty();
-				$('#login_status').html('Success.');
-				callback(username, password);
-				});
+function loginDialog(hostname, callback) {
+	$("<div id=\"dialog\" title=\"Please login\">Username:<input type=\"text\" id=\"username_input\" /><br />Password: <input type=\"password\" id=\"password\" /><br /><span id=\"login_status\"></span></div>").dialog(
+		{
+			modal: true,
+			buttons: {
+				"Login": function() {
+					$('#login_status').empty();
+					$('#login_status').html('Trying login...');
+					var username = $('#username_input').val();
+					var password = $('#password_input').val();
+					tryLogin(hostname, username, password,
+						function(data) {
+							error_code = data.error
+							$('#login_status').empty();
+							if(error_code == 'INVALID_LOGIN')
+								$('#login_status').html('Invalid login.');
+							else
+								$('#login_status').html('Unknown error.');
+							},
+						function(data) {
+								$('#login_status').empty();
+								$('#login_status').html('Success.');
+								callback(username, password);
+							});
+					}
+				}
 		});
 }
 
 function setup(hostname) {
-	loadLoginPage(hostname, function(username, password) {
-		clearAlert();
-		enableTopNav(hostname, username, password);
-		loadPlayerAdminPage(hostname, username, password);
-		});
+	loginDialog('localhost:8081', function(username, password) { })
 }