From dc382bc9ccb0735ebc63b8bc8d43ff8512ac171a Mon Sep 17 00:00:00 2001
From: vsapronov <vladimir.sapronov@gmail.com>
Date: Tue, 24 Sep 2013 23:31:47 -0400
Subject: autoconfig.php could have only some of parameters; installation.php
 generates UI accordingly

---
 core/templates/installation.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'core/templates/installation.php')

diff --git a/core/templates/installation.php b/core/templates/installation.php
index 8b087706801..ed8057452bd 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -61,6 +61,7 @@
 		</p>
 	</fieldset>
 
+    <?php if(!$_['directorySet']): ?>
 	<fieldset id="datadirField">
 		<legend><a id="showAdvanced"><?php p($l->t( 'Advanced' )); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend>
 		<div id="datadirContent">
@@ -70,7 +71,9 @@
 				value="<?php p(OC_Helper::init_var('directory', $_['directory'])); ?>" />
 		</div>
 	</fieldset>
+    <?php endif; ?>
 
+    <?php if(!$_['dbSet']): ?>
 	<fieldset id='databaseField'>
 		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL'])
 			$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
@@ -171,6 +174,7 @@
 		</div>
 		<?php endif; ?>
 	</fieldset>
+    <?php endif; ?>
 
 	<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" /></div>
 </form>
-- 
cgit v1.2.3


From 1efbf7774fe4eceeef2e40bf212c89c3ee76052c Mon Sep 17 00:00:00 2001
From: vsapronov <vladimir.sapronov@gmail.com>
Date: Sun, 29 Sep 2013 20:16:32 -0400
Subject: Fixed review issues

---
 core/templates/installation.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'core/templates/installation.php')

diff --git a/core/templates/installation.php b/core/templates/installation.php
index ed8057452bd..342383fdb28 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -61,7 +61,7 @@
 		</p>
 	</fieldset>
 
-    <?php if(!$_['directorySet']): ?>
+	<?php if(!$_['directoryIsSet']): ?>
 	<fieldset id="datadirField">
 		<legend><a id="showAdvanced"><?php p($l->t( 'Advanced' )); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend>
 		<div id="datadirContent">
@@ -71,9 +71,9 @@
 				value="<?php p(OC_Helper::init_var('directory', $_['directory'])); ?>" />
 		</div>
 	</fieldset>
-    <?php endif; ?>
+	<?php endif; ?>
 
-    <?php if(!$_['dbSet']): ?>
+	<?php if(!$_['dbIsSet']): ?>
 	<fieldset id='databaseField'>
 		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL'])
 			$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
@@ -174,7 +174,7 @@
 		</div>
 		<?php endif; ?>
 	</fieldset>
-    <?php endif; ?>
+	<?php endif; ?>
 
 	<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" /></div>
 </form>
-- 
cgit v1.2.3


From 46ca1eb91b3b653b52af408ac0d0047d02f0f798 Mon Sep 17 00:00:00 2001
From: vsapronov <vladimir.sapronov@gmail.com>
Date: Fri, 4 Oct 2013 20:46:00 -0400
Subject: Moving Advanced button out of datadirField fieldset

---
 core/templates/installation.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'core/templates/installation.php')

diff --git a/core/templates/installation.php b/core/templates/installation.php
index 342383fdb28..ef20d8672e9 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -61,9 +61,14 @@
 		</p>
 	</fieldset>
 
+	<?php if(!$_['directoryIsSet'] OR !$_['dbIsSet']): ?>
+	<fieldset id="advancedHeader">
+		<legend><a id="showAdvanced"><?php p($l->t( 'Advanced' )); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend>
+	</fieldset>
+	<?php endif; ?>
+
 	<?php if(!$_['directoryIsSet']): ?>
 	<fieldset id="datadirField">
-		<legend><a id="showAdvanced"><?php p($l->t( 'Advanced' )); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend>
 		<div id="datadirContent">
 			<label for="directory"><?php p($l->t( 'Data folder' )); ?></label>
 			<input type="text" name="directory" id="directory"
-- 
cgit v1.2.3