diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2014-03-05 14:13:43 +0400 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2014-03-05 14:13:43 +0400 |
| commit | a8ae2f10b9a02ac50f7366de9aa7ff07c88f38ec (patch) | |
| tree | 7484b9144ca90171a98121e6513e5def21235960 /core | |
| parent | 7edd8df07f50b0a556889b276eaeeab37cb175be (diff) | |
| parent | 4ee4f0c3656724788baff3ab9749d08cbf52dbb5 (diff) | |
Merge pull request #7554 from owncloud/issue/7304
Fix position of eye icon on database password field
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/setup.js | 2 | ||||
| -rw-r--r-- | core/templates/installation.php | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/core/js/setup.js b/core/js/setup.js index 279b5fbebb9..96719540f96 100644 --- a/core/js/setup.js +++ b/core/js/setup.js @@ -36,6 +36,7 @@ $(document).ready(function() { $('#showAdvanced').click(function() { $('#datadirContent').slideToggle(250); + $('#databaseBackend').slideToggle(250); $('#databaseField').slideToggle(250); }); $("form").submit(function(){ @@ -73,6 +74,7 @@ $(document).ready(function() { if (currentDbType === 'sqlite' || (dbtypes.sqlite && currentDbType === undefined)){ $('#datadirContent').hide(250); + $('#databaseBackend').hide(250); $('#databaseField').hide(250); } diff --git a/core/templates/installation.php b/core/templates/installation.php index d9f3c38ab11..e2d296a713f 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -84,7 +84,7 @@ <?php endif; ?> <?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?> - <fieldset id='databaseField'> + <fieldset id='databaseBackend'> <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL']) $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?> <legend><?php p($l->t( 'Configure the database' )); ?></legend> @@ -100,8 +100,10 @@ <?php endif; ?> <?php endforeach; ?> </div> + </fieldset> <?php if($hasOtherDB): ?> + <fieldset id='databaseField'> <div id="use_other_db"> <p class="infield grouptop"> <label for="dbuser" class="infield"><?php p($l->t( 'Database user' )); ?></label> @@ -141,8 +143,8 @@ autocomplete="off" autocapitalize="off" autocorrect="off" /> </p> </div> + </fieldset> <?php endif; ?> - </fieldset> <?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> |