Merge branch 'login_placeholder_382107'
diff --git a/bundles/org.eclipse.orion.client.core/web/mixloginstatic/LoginWindow.html b/bundles/org.eclipse.orion.client.core/web/mixloginstatic/LoginWindow.html
index 78ecdb8..29b7206 100644
--- a/bundles/org.eclipse.orion.client.core/web/mixloginstatic/LoginWindow.html
+++ b/bundles/org.eclipse.orion.client.core/web/mixloginstatic/LoginWindow.html
@@ -70,10 +70,10 @@
 				<div class="orion-login-header">Log in</div>

 				<form>

 					<div class="orion-input-holder">

-						<input type="text" class="orion-text-input" name="login" id="login" value="username" title="Username or email" autocomplete="on" autofocus="true">

+						<input type="text" class="orion-text-input" name="login" id="login" placeholder="username" title="Username or email" autocomplete="on" autofocus="true">

 					</div>

 					<div class="orion-input-holder">

-						<input name="password" type="text" id="password" class="orion-text-input" value="password" title="Password">

+						<input name="password" type="password" id="password" class="orion-text-input" placeholder="password" title="Password">

 					</div>

 					<div class="orion-login-button-holder">

 						<input type="button" name="password" id="loginButton" class="orion-login-button" value="Sign in" tabindex="0">

@@ -97,13 +97,13 @@
 				<div class="orion-login-header">Create an account</div>

 				<form>

 					<div class="orion-register-input-holder">

-						<input type="text" class="orion-text-input" value="username" title="Username or email" autocomplete="on" autofocus="autofocus" id="create_login">

+						<input type="text" class="orion-text-input" placeholder="username" title="Username or email" autocomplete="on" autofocus="autofocus" id="create_login">

 					</div>

 					<div class="orion-register-input-holder">

-						<input type="text" class="orion-text-input" value="password" title="password" autocomplete="on" id="create_password" aria-required="true">

+						<input type="password" class="orion-text-input" placeholder="password" title="password" autocomplete="on" id="create_password" aria-required="true">

 					</div>

 					<div class="orion-register-input-holder">

-						<input type="text" class="orion-text-input" value="retype password" title="retype password" autocomplete="on" name="passwordRetype" id="create_passwordRetype" aria-required="true">

+						<input type="password" class="orion-text-input" placeholder="retype password" title="retype password" autocomplete="on" name="passwordRetype" id="create_passwordRetype" aria-required="true">

 					</div>

 					<div class="orion-login-button-holder">

 						<input id="createButton" type="button" class="orion-login-button" value="Sign up" tabindex="0">

diff --git a/bundles/org.eclipse.orion.client.core/web/mixloginstatic/LoginWindow.js b/bundles/org.eclipse.orion.client.core/web/mixloginstatic/LoginWindow.js
index a9cad2b..992f7d6 100644
--- a/bundles/org.eclipse.orion.client.core/web/mixloginstatic/LoginWindow.js
+++ b/bundles/org.eclipse.orion.client.core/web/mixloginstatic/LoginWindow.js
@@ -225,19 +225,6 @@
 		document.getElementById('newUserHeaderShown').style.visibility = 'hidden';
 	}
 
-	function focusUserField(event) {
-		if (event.currentTarget.value === 'username') {
-			event.currentTarget.value = '';
-		}
-	}
-
-	function focusPasswordField(event) {
-		event.currentTarget.type = 'password';
-		if (event.currentTarget.value === 'password' || event.currentTarget.value === 'retype password') {
-			event.currentTarget.value = '';
-		}
-	}
-
 	function formatForNoUserCreation() {
 		document.getElementById('orionRegister').style.visibility = 'hidden';
 		document.getElementById('orionOpen').style.top = '188px';
@@ -304,7 +291,6 @@
 
 
 		// TODO: Temporary --- old page logic
-		document.getElementById("login").onclick = focusUserField;
 		document.getElementById("login").onkeypress = function(event) {
 			if (event.keyCode === 13) {
 				confirmLogin();
@@ -313,7 +299,6 @@
 			}
 		};
 
-		document.getElementById("password").onfocus = focusPasswordField;
 		document.getElementById("password").onkeypress = function(event) {
 			if (event.keyCode === 13) {
 				confirmLogin();
@@ -328,9 +313,6 @@
 
 		document.getElementById("registerButton").onclick = revealRegistration;
 
-		document.getElementById("create_login").onclick = focusUserField;
-
-		document.getElementById("create_password").onfocus = focusPasswordField;
 		document.getElementById("create_password").onkeyup = function(event) {
 			if (event.keyCode === 13) {
 				confirmCreateUser();
@@ -339,7 +321,6 @@
 			}
 		};
 
-		document.getElementById("create_passwordRetype").onfocus = focusPasswordField;
 		document.getElementById("create_passwordRetype").onkeyup = function(event) {
 			if (event.keyCode === 13) {
 				confirmCreateUser();