mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary js & html ids

This commit is contained in:
Jörn Friedrich Dreyer 2013-07-24 18:02:36 +02:00
parent 18c565666e
commit 284fb86258
2 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/js/setup.js
View File

@ -11,42 +11,36 @@ $(document).ready(function() {
$('#selectDbType').buttonset(); $('#selectDbType').buttonset();
$('#datadirContent').hide(250); $('#datadirContent').hide(250);
$('#databaseField').hide(250); $('#databaseField').hide(250);
if($('#hasSQLite').val()=='true'){ if($('#hasSQLite').val()){
$('#use_other_db').hide(); $('#use_other_db').hide();
$('#dbhost').hide(); $('#use_oracle_db').hide();
$('#dbhostlabel').hide();
} }
$('#adminlogin').change(function(){ $('#adminlogin').change(function(){
$('#adminlogin').val($.trim($('#adminlogin').val())); $('#adminlogin').val($.trim($('#adminlogin').val()));
}); });
$('#sqlite').click(function() { $('#sqlite').click(function() {
$('#use_other_db').slideUp(250); $('#use_other_db').slideUp(250);
$('#dbhost').hide(250); $('#use_oracle_db').slideUp(250);
$('#dbhostlabel').hide(250);
}); });
$('#mysql').click(function() { $('#mysql').click(function() {
$('#use_other_db').slideDown(250); $('#use_other_db').slideDown(250);
$('#dbhost').show(250); $('#use_oracle_db').slideUp(250);
$('#dbhostlabel').show(250);
}); });
$('#pgsql').click(function() { $('#pgsql').click(function() {
$('#use_other_db').slideDown(250); $('#use_other_db').slideDown(250);
$('#dbhost').show(250); $('#use_oracle_db').slideUp(250);
$('#dbhostlabel').show(250);
}); });
$('#oci').click(function() { $('#oci').click(function() {
$('#use_other_db').slideDown(250); $('#use_other_db').slideDown(250);
$('#dbhost').show(250); $('#use_oracle_db').show(250);
$('#dbhostlabel').show(250);
}); });
$('#mssql').click(function() { $('#mssql').click(function() {
$('#use_other_db').slideDown(250); $('#use_other_db').slideDown(250);
$('#dbhost').show(250); $('#use_oracle_db').slideUp(250);
$('#dbhostlabel').show(250);
}); });
$('input[checked]').trigger('click'); $('input[checked]').trigger('click');

30
core/templates/installation.php
View File

@ -121,7 +121,7 @@
<?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/> <?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/>
<?php endif; ?> <?php endif; ?>
<?php endif; ?> <?php endif; ?>
<?php if($_['hasMSSQL']): ?> <?php if($_['hasMSSQL']): ?>
<input type='hidden' id='hasMSSQL' value='true'/> <input type='hidden' id='hasMSSQL' value='true'/>
<?php if(!$_['hasSQLite'] and !$_['hasMySQL'] and !$_['hasPostgreSQL'] and !$_['hasOracle']): ?> <?php if(!$_['hasSQLite'] and !$_['hasMySQL'] and !$_['hasPostgreSQL'] and !$_['hasOracle']): ?>
@ -131,7 +131,7 @@
<label class="mssql" for="mssql">MS SQL</label> <label class="mssql" for="mssql">MS SQL</label>
<input type="radio" name="dbtype" value='mssql' id="mssql" <?php OC_Helper::init_radio('dbtype', 'mssql', 'sqlite'); ?>/> <input type="radio" name="dbtype" value='mssql' id="mssql" <?php OC_Helper::init_radio('dbtype', 'mssql', 'sqlite'); ?>/>
<?php endif; ?> <?php endif; ?>
<?php endif; ?> <?php endif; ?>
</div> </div>
<?php if($hasOtherDB): ?> <?php if($hasOtherDB): ?>
@ -154,22 +154,22 @@
value="<?php p(OC_Helper::init_var('dbname')); ?>" value="<?php p(OC_Helper::init_var('dbname')); ?>"
autocomplete="off" pattern="[0-9a-zA-Z$_-]+" /> autocomplete="off" pattern="[0-9a-zA-Z$_-]+" />
</p> </p>
</div> <?php if($_['hasOracle']): ?>
<?php endif; ?> <div id="use_oracle_db">
<?php if($_['hasOracle']): ?> <p class="infield groupmiddle">
<div id="use_oracle_db"> <label for="dbtablespace" class="infield"><?php p($l->t( 'Database tablespace' )); ?></label>
<p class="infield groupmiddle"> <input type="text" name="dbtablespace" id="dbtablespace" placeholder=""
<label for="dbtablespace" class="infield"><?php p($l->t( 'Database tablespace' )); ?></label> value="<?php p(OC_Helper::init_var('dbtablespace')); ?>" autocomplete="off" />
<input type="text" name="dbtablespace" id="dbtablespace" placeholder="" </p>
value="<?php p(OC_Helper::init_var('dbtablespace')); ?>" autocomplete="off" /> </div>
<?php endif; ?>
<p class="infield groupbottom">
<label for="dbhost" class="infield"><?php p($l->t( 'Database host' )); ?></label>
<input type="text" name="dbhost" id="dbhost" placeholder=""
value="<?php p(OC_Helper::init_var('dbhost')); ?>" />
</p> </p>
</div> </div>
<?php endif; ?> <?php endif; ?>
<p class="infield groupbottom">
<label for="dbhost" class="infield" id="dbhostlabel"><?php p($l->t( 'Database host' )); ?></label>
<input type="text" name="dbhost" id="dbhost" placeholder=""
value="<?php p(OC_Helper::init_var('dbhost')); ?>" />
</p>
</fieldset> </fieldset>
<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" /></div> <div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" /></div>