From 9e4fb257e39224b0860b171affa862c4bb1eda0c Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>
Date: Tue, 9 Aug 2011 22:43:58 +0200
Subject: [PATCH] proper advanced options

---
 core/css/styles.css             | 4 ++--
 core/templates/installation.php | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index 4cb630d4a9..246a5b130e 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -73,8 +73,8 @@ legend { padding:.2em; font-size:1.2em; }
 #login form { width:18em; margin:2em auto 5em; padding:0; }
 #login form fieldset { background-color:transparent; border:0; margin-bottom:2em; padding:0; }
 #login form fieldset legend { font-weight:bold; }
-#login form p { position:relative; padding:0; }
-#login form label { position:absolute; margin:.8em .8em; font-size:1.5em; color:#666; }
+#login form label { position:absolute; display:block; margin:.8em 0 .8em -5.5em; font-size:1.5em; color:#666; }
+
 #login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; }
 
 #login form ul.errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 4em 0; padding:1em 1em 1em 5em; }
diff --git a/core/templates/installation.php b/core/templates/installation.php
index b578ed94c3..41fc4526d6 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -59,8 +59,7 @@
 			<input type="text" name="dbuser" id="dbuser" value="<?php print OC_Helper::init_var('dbuser'); ?>" placeholder="<?php echo $l->t( 'Database user' ); ?>" />
 			<input type="password" name="dbpass" id="dbpass" value="<?php print OC_Helper::init_var('dbpass'); ?>" placeholder="<?php echo $l->t( 'Database password' ); ?>" />
 			<input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" placeholder="<?php echo $l->t( 'Database name' ); ?>" />
-			<input type="text" name="dbhost" id="dbhost" value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" placeholder="<?php echo $l->t( 'Host' ); ?>" />
-			<input type="text" name="dbtableprefix" id="dbtableprefix" value="<?php print OC_Helper::init_var('dbtableprefix', 'oc_'); ?>" placeholder="<?php echo $l->t( 'Table prefix' ); ?>" />
+			
 			
 		</div>
 		<?php endif; ?>
@@ -70,8 +69,10 @@
 	<a id='showAdvanced'><strong><?php echo $l->t( 'Advanced' ); ?> ▾</strong></a>
 
 	<fieldset id='datadirField'>
-		<legend><?php echo $l->t( 'Set data folder' ); ?></legend>
-		<input type="text" name="directory" id="directory" value="<?php print OC_Helper::init_var('directory', $_['directory']); ?>" placeholder="<?php echo $l->t( 'Data folder' ); ?>" required /></p>
+		<input type="text" name="dbhost" id="dbhost" value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" placeholder="<?php echo $l->t( 'Host' ); ?>" />
+		<input type="text" name="dbtableprefix" id="dbtableprefix" value="<?php print OC_Helper::init_var('dbtableprefix', 'oc_'); ?>" placeholder="<?php echo $l->t( 'Table prefix' ); ?>" />
+
+		<label for="directory"><?php echo $l->t( 'Data folder' ); ?></label><input type="text" name="directory" id="directory" value="<?php print OC_Helper::init_var('directory', $_['directory']); ?>" placeholder="<?php echo $l->t( 'Data folder' ); ?>" />
 	</fieldset>
 
 	<input type="submit" value="<?php echo $l->t( 'Finish setup' ); ?>" />