From: Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>
Date: Mon, 18 Apr 2011 22:54:36 +0000 (+0200)
Subject: actually know what to put in which login field
X-Git-Tag: v3.0~267^2~558^2~41^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ecd68e0c6e9a1ef4f77f117c9a564f4c99630bab;p=nextcloud-server.git

actually know what to put in which login field
---

diff --git a/js/js.js b/js/js.js
index 2fb67f0ec06..b7d94b5eb6a 100644
--- a/js/js.js
+++ b/js/js.js
@@ -22,4 +22,20 @@ $(document).ready(function() {
 		$('label.sqlite').css('background-color', '#ddd');
 		$('label.mysql').css('background-color', '#fff');
 	});
+
+	// Hide and show input field values for login form
+	var textuser = "username";
+	var textpassword = "password";
+	$("#user").focus(function() {
+		if($(this).attr("value") == textuser) $(this).attr("value", "");
+	});
+	$("#user").blur(function() {
+		if($(this).attr("value") == "") $(this).attr("value", textuser);
+	});
+	$("#password").focus(function() {
+		if($(this).attr("value") == textpassword) $(this).attr("value", "");
+	});
+	$("#password").blur(function() {
+		if($(this).attr("value") == "") $(this).attr("value", textpassword);
+	});
 });
diff --git a/templates/installation.php b/templates/installation.php
index 73b9a67743f..725c7f149ef 100644
--- a/templates/installation.php
+++ b/templates/installation.php
@@ -3,7 +3,7 @@
 	<form action="#" method="post">
 		<input type='hidden' name='install' value='true'/>
 		<fieldset>
-			<input type="text" name="login" value="your email" />
+			<input type="text" name="login" value="admin username" />
 			<input type="password" name="pass" value="password" />
         </fieldset>
 		<fieldset>
diff --git a/templates/login.php b/templates/login.php
index 02ba70be52c..c0defdc2b08 100644
--- a/templates/login.php
+++ b/templates/login.php
@@ -1,13 +1,13 @@
 <div id="login">
-	<img src="<?php echo image_path("", "owncloud-logo-medium-white.png"); ?>" alt="ownCloud" />
+	<img src="<?php echo image_path('', 'owncloud-logo-medium-white.png'); ?>" alt="ownCloud" />
 	<form action="index.php" method="post">
 		<!-- <h1>Sign in :</h1> -->
 		<fieldset>
-			<?php if($_["error"]): ?>
+			<?php if($_['error']): ?>
 				Login failed!
 			<?php endif; ?>
-			<input type="text" name="user" value="" />
-			<input type="password" name="password" />
+			<input type="text" name="user" id="user" value="username" />
+			<input type="password" name="password" id="password" value="password" />
 			<input type="submit" value="Log in" />
 		</fieldset>
 	</form>