From ccfa2dd24ce8313b9dede2d1c18761aa9e294e5c Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Fri, 30 Sep 2011 18:22:12 +0200
Subject:  Error when only oc_remember_login cookie set fixed. Filled username
 field when oc_username is set repaired. Problems with "advanced settings"
 button in installation wizard fixed. CSS improved - login and installation
 now looks more clean. Request password link removed (email feature not
 implemented yet). Database radio button bugs removed. It is possible to have
 an empty database password, now ownCloud will support this "security issue".
 Ignore Mac OS X ".DSstore" files. Fade in/out of login button and remember
 checkbox removed due to some display errors.

---
 core/js/setup.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'core/js/setup.js')

diff --git a/core/js/setup.js b/core/js/setup.js
index 0ed0ea69120..e16f9b6e329 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -1,8 +1,7 @@
 $(document).ready(function() {
 	$('#selectDbType').buttonset();
-	$('#datadirField').hide(250);
+	$('#datadirContent').hide(250);
 	if($('#hasSQLite').val()=='true'){
-		$('#databaseField').hide();
 		$('#use_other_db').hide();
 		$('#dbhost').hide();
 		$('#dbhostlabel').hide();
@@ -26,11 +25,10 @@ $(document).ready(function() {
 		$('#dbhostlabel').show(250);
 	});
 
+	$('input[checked]').trigger('click');
+
 	$('#showAdvanced').click(function() {
-		$('#datadirField').slideToggle(250);
-		if($('#hasSQLite').val()=='true'){
-			$('#databaseField').slideToggle(250);
-		}
+		$('#datadirContent').slideToggle(250);
 	});
 	$("form").submit(function(){
 		// Save form parameters
-- 
cgit v1.2.3


From 481a37fcf3ea574ad5e22ecb57cf0161081cf230 Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Mon, 3 Oct 2011 13:32:16 +0200
Subject: Show database only in advanced

---
 core/css/styles.css             |  1 -
 core/js/setup.js                |  2 ++
 core/templates/installation.php | 18 +++++++++---------
 index.php                       |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'core/js/setup.js')

diff --git a/core/css/styles.css b/core/css/styles.css
index 44331d1998b..4d9cb203774 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -67,7 +67,6 @@ input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-
 #body-login p.info a { font-weight:bold; color:#777; }
 
 #login { min-height:30em; margin:2em auto 0; border-bottom:1px solid #f8f8f8; background:#eee; }
-#login a#showAdvanced { color: #555; }
 #login form { width:22em; margin:2em auto 2em; padding:0; }
 #login form fieldset { background:0; border:0; margin-bottom:2em; padding:0; }
 #login form fieldset legend { font-weight:bold; }
diff --git a/core/js/setup.js b/core/js/setup.js
index e16f9b6e329..b765d41ba35 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -1,6 +1,7 @@
 $(document).ready(function() {
 	$('#selectDbType').buttonset();
 	$('#datadirContent').hide(250);
+	$('#databaseField').hide(250);
 	if($('#hasSQLite').val()=='true'){
 		$('#use_other_db').hide();
 		$('#dbhost').hide();
@@ -29,6 +30,7 @@ $(document).ready(function() {
 
 	$('#showAdvanced').click(function() {
 		$('#datadirContent').slideToggle(250);
+		$('#databaseField').slideToggle(250);
 	});
 	$("form").submit(function(){
 		// Save form parameters
diff --git a/core/templates/installation.php b/core/templates/installation.php
index e15e81191a9..c1bfbdf1763 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -21,7 +21,14 @@
 		<input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_Helper::init_var('adminlogin'); ?>" placeholder="<?php echo $l->t( 'Username' ); ?>" autocomplete="off" autofocus required />
 		<input type="password" name="adminpass" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" placeholder="<?php echo $l->t( 'Password' ); ?>" required />
 	</fieldset>
-	
+
+	<fieldset id="datadirField">
+		<legend><a id="showAdvanced"><?php echo $l->t( 'Advanced' ); ?> ▾</a></legend>
+		<div id="datadirContent">
+			<input type="text" name="directory" id="directory" value="<?php print OC_Helper::init_var('directory', $_['directory']); ?>" placeholder="<?php echo $l->t( 'Data folder' ); ?>" />
+		</div>
+	</fieldset>
+
 	<fieldset id='databaseField'>
 		<?php if($_['hasMySQL'] or $_['hasPostgreSQL']) $hasOtherDB = true; //other than SQLite ?>
 		<legend><?php echo $l->t( 'Configure the database' ); ?></legend>
@@ -66,15 +73,8 @@
 			<input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" placeholder="<?php echo $l->t( 'Database name' ); ?>" autocomplete="off" />
 		</div>
 		<?php endif; ?>
-
-	</fieldset>
-
-	<fieldset id="datadirField">
-		<legend><a id="showAdvanced"><?php echo $l->t( 'Advanced' ); ?> ▾</a></legend>
-		<div id="datadirContent">
 			<input type="text" name="dbhost" id="dbhost" value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" placeholder="<?php echo $l->t( 'Database host' ); ?>" />
-			<input type="text" name="directory" id="directory" value="<?php print OC_Helper::init_var('directory', $_['directory']); ?>" placeholder="<?php echo $l->t( 'Data folder' ); ?>" />
-		</div>
+
 	</fieldset>
 
 	<div class="buttons"><input type="submit" value="<?php echo $l->t( 'Finish setup' ); ?>" /></div>
diff --git a/index.php b/index.php
index fb8d1922dd4..072f526d8f9 100644
--- a/index.php
+++ b/index.php
@@ -28,7 +28,7 @@ require_once('lib/base.php');
 // Setup required :
 $not_installed = !OC_Config::getValue('installed', false);
 $install_called = (isset($_POST['install']) AND $_POST['install']=='true');
-if($not_installed) {
+if($not_installed OR true) {
 	OC_Util::addScript('setup');
 	require_once('setup.php');
 	exit();
-- 
cgit v1.2.3