diff --git a/js/js.js b/js/js.js index a6470b99bf..a6765ec62d 100644 --- a/js/js.js +++ b/js/js.js @@ -1,9 +1,14 @@ $(document).ready(function() { // Hide the MySQL config div if needed : - if(!$('#mysql').is(':checked')) { + if(!$('#mysql').is(':checked') && $('#hasSQLite').val()=='true') { $('#use_mysql').hide(); } - + + $('#datadirField').hide(250); + if($('#hasSQLite').val()=='true'){ + $('#databaseField').hide(250); + } + $('#sqlite').click(function() { $('#use_mysql').slideUp(250); }); @@ -11,4 +16,11 @@ $(document).ready(function() { $('#mysql').click(function() { $('#use_mysql').slideDown(250); }); + + $('#showAdvanced').click(function() { + $('#datadirField').slideToggle(250); + if($('#hasSQLite').val()=='true'){ + $('#databaseField').slideToggle(250); + } + }); }); diff --git a/templates/installation.php b/templates/installation.php index 9d5eb0c4a5..880beb9a89 100644 --- a/templates/installation.php +++ b/templates/installation.php @@ -4,31 +4,41 @@
Welcome to ownCloud, your personnal cloud.
- To finish the installation, please follow the 3 remaining steps below.
+ To finish the installation, please follow the steps below.