wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7554 from owncloud/issue/7304

Browse source 
Fix position of eye icon on database password field
This commit is contained in:
Morris Jobke 2014-03-05 11:13:43 +01:00
commit a8ae2f10b9
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/js/setup.js
View file

@ -36,6 +36,7 @@ $(document).ready(function() {
$('#showAdvanced').click(function() { $('#showAdvanced').click(function() {
$('#datadirContent').slideToggle(250); $('#datadirContent').slideToggle(250);
$('#databaseBackend').slideToggle(250);
$('#databaseField').slideToggle(250); $('#databaseField').slideToggle(250);
}); });
$("form").submit(function(){ $("form").submit(function(){
@ -73,6 +74,7 @@ $(document).ready(function() {
if (currentDbType === 'sqlite' || (dbtypes.sqlite && currentDbType === undefined)){ if (currentDbType === 'sqlite' || (dbtypes.sqlite && currentDbType === undefined)){
$('#datadirContent').hide(250); $('#datadirContent').hide(250);
$('#databaseBackend').hide(250);
$('#databaseField').hide(250); $('#databaseField').hide(250);
} }

6
core/templates/installation.php
View file

@ -84,7 +84,7 @@
<?php endif; ?> <?php endif; ?>
<?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?> <?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
<fieldset id='databaseField'> <fieldset id='databaseBackend'>
<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL']) <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL'])
$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?> $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
<legend><?php p($l->t( 'Configure the database' )); ?></legend> <legend><?php p($l->t( 'Configure the database' )); ?></legend>
@ -100,8 +100,10 @@
<?php endif; ?> <?php endif; ?>
<?php endforeach; ?> <?php endforeach; ?>
</div> </div>
</fieldset>
<?php if($hasOtherDB): ?> <?php if($hasOtherDB): ?>
<fieldset id='databaseField'>
<div id="use_other_db"> <div id="use_other_db">
<p class="infield grouptop"> <p class="infield grouptop">
<label for="dbuser" class="infield"><?php p($l->t( 'Database user' )); ?></label> <label for="dbuser" class="infield"><?php p($l->t( 'Database user' )); ?></label>
@ -141,8 +143,8 @@
autocomplete="off" autocapitalize="off" autocorrect="off" /> autocomplete="off" autocapitalize="off" autocorrect="off" />
</p> </p>
</div> </div>
</fieldset>
<?php endif; ?> <?php endif; ?>
</fieldset>
<?php endif; ?> <?php endif; ?>
<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>" /></div> <div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>" /></div>