jQuery-value-hide-foo for the installation form as well

2 files changed, 34 insertions, 30 deletions

diff --git a/js/js.js b/js/js.js
index b7d94b5eb6a..948c3417381 100644
--- a/js/js.js
+++ b/js/js.js
@@ -23,19 +23,23 @@ $(document).ready(function() {
 		$('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);
-	});
+	// Hide and show input field values for login and installation form
+	var textuser = 'username';
+	var textpassword = 'password';
+	var textadmin = 'admin username';
+	var textdbuser = 'MySQL user';
+	var textdbpass = 'password';
+	var textdbname = 'database name';
+	$('#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); });
+	$('#admin').focus(function() { if($(this).attr('value') == textadmin) $(this).attr('value', ''); });
+	$('#admin').blur(function() { if($(this).attr('value') == '') $(this).attr('value', textadmin); });
+	$('#dbuser').focus(function() { if($(this).attr('value') == textdbuser) $(this).attr('value', ''); });
+	$('#dbuser').blur(function() { if($(this).attr('value') == '') $(this).attr('value', textdbuser); });
+	$('#dbpass').focus(function() { if($(this).attr('value') == textdbpass) $(this).attr('value', ''); });
+	$('#dbpass').blur(function() { if($(this).attr('value') == '') $(this).attr('value', textdbpass); });
+	$('#dbname').focus(function() { if($(this).attr('value') == textdbname) $(this).attr('value', ''); });
+	$('#dbname').blur(function() { if($(this).attr('value') == '') $(this).attr('value', textdbname); });
 });
diff --git a/templates/installation.php b/templates/installation.php
index 725c7f149ef..dc6dc5790fc 100644
--- a/templates/installation.php
+++ b/templates/installation.php
@@ -1,17 +1,17 @@
 <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="#" method="post">
 		<input type='hidden' name='install' value='true'/>
 		<fieldset>
-			<input type="text" name="login" value="admin username" />
-			<input type="password" name="pass" value="password" />
+			<input type="text" name="login" id="admin" value="admin username" />
+			<input type="password" name="pass" id="password" value="password" />
         </fieldset>
 		<fieldset>
 			<?php if(!$_['hasSQLite']): ?>
 				<legend><abbr title="to use SQLite instead, install it on your server">MySQL</abbr> Database</legend>
-				<input type="text" name="dbuser" value="MySQL user" />
-				<input type="password" name="dbpass" value="password" />
-				<input type="text" name="dbname" value="database name" />
+				<input type="text" name="dbuser" id="dbuser" value="MySQL user" />
+				<input type="password" name="dbpass" id="dbpass" value="password" />
+				<input type="text" name="dbname" id="dbname" value="database name" />
 			<?php endif;?>
 		</fieldset>
 		<fieldset id="advanced">
@@ -22,24 +22,24 @@
 					<input type="radio" name="dbtype" value='sqlite' id="sqlite" checked="checked" /><label class="sqlite" for="sqlite">SQLite</label>
 					<input type="radio" name="dbtype" value='mysql' id="mysql"><label class="mysql" for="mysql">MySQL</label>
 					<div id="use_mysql">
-						<input type="text" name="dbuser" value="MySQL user" />
-						<input type="password" name="dbpass" value="password" />
-						<input type="text" name="dbname" value="database name" />
+						<input type="text" name="dbuser" id="dbuser" value="MySQL user" />
+						<input type="password" name="dbpass" id="dbpass" value="password" />
+						<input type="text" name="dbname" id="dbname" value="database name" />
 				<?php endif;?>
 				<?php if($_['hasMySQL'] and !$_['hasSQLite']): ?>
-						<input type='hidden' name='dbtype' value='mysql'/>
+						<input type="hidden" name="dbtype" value="mysql" />
 				<?php endif;?>
 				<?php if(!$_['hasMySQL'] and $_['hasSQLite']): ?>
-						<input type='hidden' name='dbtype' value='sqlite'/>
+						<input type="hidden" name="dbtype" value="sqlite" />
 				<?php endif;?>
 				<?php if($_['hasMySQL'] and $_['hasSQLite']): ?>
-						<label class="left">Database host</label><input type="text" name="dbhost" value="localhost" />
-						<label class="left">Table prefix</label><input type="text" name="dbtableprefix" value="oc_" />
+						<label class="left">Database host</label><input type="text" name="dbhost" id="dbhost" value="localhost" />
+						<label class="left">Table prefix</label><input type="text" name="dbtableprefix" id="dbtableprefix" value="oc_" />
 					</div>
 				<?php endif;?>
 				<?php if($_['hasMySQL'] and !$_['hasSQLite']): ?>
-					<label class="left">Host</label><input type="text" name="dbhost" value="localhost" />
-					<label class="left">Table prefix</label><input type="text" name="dbtableprefix" value="oc_" />
+					<label class="left">Database host</label><input type="text" name="dbhost" id="dbhost" value="localhost" />
+					<label class="left">Table prefix</label><input type="text" name="dbtableprefix" id="dbtableprefix" value="oc_" />
 				<?php endif;?>
 			</div>
 		</fieldset>