From 284fb862589bb3a6441f464236abe735c6fe5dfc Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Wed, 24 Jul 2013 18:02:36 +0200 Subject: [PATCH] show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary js & html ids --- core/js/setup.js | 26 ++++++++++---------------- core/templates/installation.php | 30 +++++++++++++++--------------- 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/core/js/setup.js b/core/js/setup.js index 76812b29979..c0df1ed96b0 100644 --- a/core/js/setup.js +++ b/core/js/setup.js @@ -11,42 +11,36 @@ $(document).ready(function() { $('#selectDbType').buttonset(); $('#datadirContent').hide(250); $('#databaseField').hide(250); - if($('#hasSQLite').val()=='true'){ + if($('#hasSQLite').val()){ $('#use_other_db').hide(); - $('#dbhost').hide(); - $('#dbhostlabel').hide(); + $('#use_oracle_db').hide(); } $('#adminlogin').change(function(){ $('#adminlogin').val($.trim($('#adminlogin').val())); }); $('#sqlite').click(function() { $('#use_other_db').slideUp(250); - $('#dbhost').hide(250); - $('#dbhostlabel').hide(250); + $('#use_oracle_db').slideUp(250); }); $('#mysql').click(function() { $('#use_other_db').slideDown(250); - $('#dbhost').show(250); - $('#dbhostlabel').show(250); + $('#use_oracle_db').slideUp(250); }); - + $('#pgsql').click(function() { $('#use_other_db').slideDown(250); - $('#dbhost').show(250); - $('#dbhostlabel').show(250); + $('#use_oracle_db').slideUp(250); }); - + $('#oci').click(function() { $('#use_other_db').slideDown(250); - $('#dbhost').show(250); - $('#dbhostlabel').show(250); + $('#use_oracle_db').show(250); }); - + $('#mssql').click(function() { $('#use_other_db').slideDown(250); - $('#dbhost').show(250); - $('#dbhostlabel').show(250); + $('#use_oracle_db').slideUp(250); }); $('input[checked]').trigger('click'); diff --git a/core/templates/installation.php b/core/templates/installation.php index 6de67a83d42..77c455304d3 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -121,7 +121,7 @@ /> - + @@ -131,7 +131,7 @@ /> - + @@ -154,22 +154,22 @@ value="" autocomplete="off" pattern="[0-9a-zA-Z$_-]+" />

- - - -
-

- - + +

+

+ + +

+
+ +

+ +

-

- - -

-- 2.39.5