diff options
| -rw-r--r-- | core/css/styles.css | 2 | ||||
| -rw-r--r-- | core/templates/installation.php | 35 |
2 files changed, 22 insertions, 15 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 2fd2ad36ab3..39ba541fcaa 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -578,7 +578,7 @@ label.infield { } #show + label, #dbpassword + label, #personal-show + label { position: absolute !important; - height: 14px; + height: 20px; width: 24px; background-image: url("../img/actions/toggle.png"); background-repeat: no-repeat; diff --git a/core/templates/installation.php b/core/templates/installation.php index 6d73fb431f5..f934e3a86c2 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -46,15 +46,17 @@ <?php endif; ?> <fieldset id="adminaccount"> <legend><?php print_unescaped($l->t( 'Create an <strong>admin account</strong>' )); ?></legend> - <p class="infield grouptop"> - <input type="text" name="adminlogin" id="adminlogin" placeholder="" + <p class="grouptop"> + <input type="text" name="adminlogin" id="adminlogin" + placeholder="<?php p($l->t( 'Username' )); ?>" value="<?php p($_['adminlogin']); ?>" autocomplete="off" autocapitalize="off" autocorrect="off" autofocus required /> <label for="adminlogin" class="infield"><?php p($l->t( 'Username' )); ?></label> <img class="svg" src="<?php p(image_path('', 'actions/user.svg')); ?>" alt="" /> </p> - <p class="infield groupbottom"> - <input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" placeholder="" + <p class="groupbottom"> + <input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" + placeholder="<?php p($l->t( 'Password' )); ?>" value="<?php p($_['adminpass']); ?>" autocomplete="off" autocapitalize="off" autocorrect="off" required /> <label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label> @@ -105,40 +107,45 @@ <?php if($hasOtherDB): ?> <fieldset id='databaseField'> <div id="use_other_db"> - <p class="infield grouptop"> + <p class="grouptop"> <label for="dbuser" class="infield"><?php p($l->t( 'Database user' )); ?></label> - <input type="text" name="dbuser" id="dbuser" placeholder="" + <input type="text" name="dbuser" id="dbuser" + placeholder="<?php p($l->t( 'Database user' )); ?>" value="<?php p($_['dbuser']); ?>" autocomplete="off" autocapitalize="off" autocorrect="off" /> </p> - <p class="infield groupmiddle"> - <input type="password" name="dbpass" id="dbpass" placeholder="" data-typetoggle="#dbpassword" + <p class="groupmiddle"> + <input type="password" name="dbpass" id="dbpass" data-typetoggle="#dbpassword" + placeholder="<?php p($l->t( 'Database password' )); ?>" value="<?php p($_['dbpass']); ?>" autocomplete="off" autocapitalize="off" autocorrect="off" /> <label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label> <input type="checkbox" id="dbpassword" name="dbpassword" /> <label for="dbpassword"></label> </p> - <p class="infield groupmiddle"> + <p class="groupmiddle"> <label for="dbname" class="infield"><?php p($l->t( 'Database name' )); ?></label> - <input type="text" name="dbname" id="dbname" placeholder="" + <input type="text" name="dbname" id="dbname" + placeholder="<?php p($l->t( 'Database name' )); ?>" value="<?php p($_['dbname']); ?>" autocomplete="off" autocapitalize="off" autocorrect="off" pattern="[0-9a-zA-Z$_-]+" /> </p> <?php if($_['hasOracle']): ?> <div id="use_oracle_db"> - <p class="infield groupmiddle"> + <p class="groupmiddle"> <label for="dbtablespace" class="infield"><?php p($l->t( 'Database tablespace' )); ?></label> - <input type="text" name="dbtablespace" id="dbtablespace" placeholder="" + <input type="text" name="dbtablespace" id="dbtablespace" + placeholder="<?php p($l->t( 'Database tablespace' )); ?>" value="<?php p($_['dbtablespace']); ?>" autocomplete="off" autocapitalize="off" autocorrect="off" /> </p> </div> <?php endif; ?> - <p class="infield groupbottom"> + <p class="groupbottom"> <label for="dbhost" class="infield"><?php p($l->t( 'Database host' )); ?></label> - <input type="text" name="dbhost" id="dbhost" placeholder="" + <input type="text" name="dbhost" id="dbhost" + placeholder="<?php p($l->t( 'Database host' )); ?>" value="<?php p($_['dbhost']); ?>" autocomplete="off" autocapitalize="off" autocorrect="off" /> </p> |