mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-02-11 10:22:37 +01:00
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
@@ -398,7 +398,7 @@ if (!empty($morelogincontent)) {
|
||||
<?php if (!isset($conf->file->main_authentication) || $conf->file->main_authentication != 'googleoauth') { ?>
|
||||
<br>
|
||||
<div id="login-submit-wrapper">
|
||||
<input type="submit" class="butAction butActionLogin" value=" <?php echo $langs->trans('Connection'); ?> " tabindex="5" />
|
||||
<input type="submit" class="butAction butActionLogin noborderfocus" value=" <?php echo $langs->trans('Connection'); ?> " tabindex="5" />
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
|
||||
@@ -262,7 +262,7 @@ if (!empty($morelogincontent)) {
|
||||
<div id="login_line2" style="clear: both">
|
||||
|
||||
<!-- Button "Regenerate and Send password" -->
|
||||
<br><input type="submit" <?php echo $disabled; ?> class="butAction butActionLogin small" id="button_password" name="button_password" value="<?php echo $langs->trans('SendNewPassword'); ?>" tabindex="4" />
|
||||
<br><input type="submit" <?php echo $disabled; ?> class="butAction butActionLogin noborderfocus small" id="button_password" name="button_password" value="<?php echo $langs->trans('SendNewPassword'); ?>" tabindex="4" />
|
||||
|
||||
<br>
|
||||
<div class="center" style="margin-top: 15px;">
|
||||
|
||||
@@ -308,7 +308,7 @@ if (!empty($morelogincontent)) {
|
||||
<div id="login_line2" style="clear: both">
|
||||
|
||||
<!-- Button "Regenerate and Send password" -->
|
||||
<br><input type="submit" <?php echo $disabled; ?> class="butAction butActionLogin small" name="button_password" value="<?php echo $langs->trans('Save'); ?>" tabindex="4" />
|
||||
<br><input type="submit" <?php echo $disabled; ?> class="butAction butActionLogin noborderfocus small" name="button_password" value="<?php echo $langs->trans('Save'); ?>" tabindex="4" />
|
||||
|
||||
<br>
|
||||
<div class="center" style="margin-top: 15px;">
|
||||
|
||||
Reference in New Issue
Block a user