:(

index.html

@@ -100,8 +100,8 @@ <h1 style='margin: 0px'>Please enter your information.</h1>
 					<div><div style='width: 10em; float: left;'>Confirm Password: </div><input id='pwdconf' type="password"></input></div>
 
 					<div>
-						<button type="button" onclick="login('create')" style='float: left'>Create account and log in</button>
-						<button type="button" onclick="returnToLogin()" style='float: right'>Return to login screen</button>
+						<button type="button" onclick="returnToLogin()" style='float: left'>Return to login screen</button>
+						<button type="button" onclick="login('create')" style='float: right'>Create account and log in</button>
 					</div>
 				</div>
 			</div>

js/newbucketList.js

@@ -47,8 +47,12 @@ function login(type) {
 		firstBucket.tasks = [task1, task2];
 		secondBucket.tasks = [task3, task4];
 		var or=[firstBucket, secondBucket];
-
-		user = new User('img/personIcon.png', "Alice Packer", "[email protected]")//usually gotten from backend
+		if(type == 'create') {
+			user = new User('img/personIcon.png', $('#newNameEntry').val(), $('#newEmail').val())//usually gotten from backend
+			$('#nameButton').val($('#newNameEntry').val())
+		} else {
+			user = new User('img/personIcon.png', "Alice Packer", "[email protected]");
+		}
 		user.organizer = or;
 		user.friends = [new Collaborator("Becky Bianco", "[email protected]"), new Collaborator("Tamara Fleisher", "[email protected]")];
 		maxZ = 0; // should get this and totalPapers from data from backend
@@ -460,11 +464,6 @@ function collabBlur(paperID) {
 		name = $(inp).val();
 		var collab = new Collaborator(name, null);
 		addCollabToBucket(paper, collab);
-    	//$(inp).removeClass('new');
-		//name = $(inp).val();
-		//var iconText = "<img src='img/personIcon.png' class='icon persona'></img>"
-		//var xbutton = "<div style='color:#808080; cursor: pointer; float: right;'>x</div>"
-    	//$('#'+currentView.objName+"collabs").append("<div>"+iconText+name+xbutton+"</div>");
     } else {
     	name = $(inp).val();
     	var collab = new Collaborator(name, null);