Fix position of eye icon on database password field

Fix #7304

diff --git a/core/js/setup.js b/core/js/setup.js
index 279b5fbebb929d1e4f9bdb367325a3b092e284e2..96719540f9610fbdf04ae9fa09f78c404ccc3cb2 100644 (file)
--- 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 d3adb34f41271b5fd10b5f5fd0fc61f6ddb23c29..a85b68f248ddd34c78f16a503e4b217dce2c6cfb 100644 (file)
--- 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>