Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update button style on force password form #6490

Merged
merged 2 commits into from
Feb 7, 2024
Merged

Update button style on force password form #6490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb2a2ba
Update button style on force password form
yurabakhtin Aug 8, 2023
3417c51
Merge branch 'develop' into enh/17-buttons-change-password
luke- Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG-DEV.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
HumHub Changelog
================



1.16.0 (Unreleased)
-------------------
- Fix #6770: Improve migration error messages
Expand Down Expand Up @@ -57,3 +59,5 @@ HumHub Changelog
- Fix #6810: Top menu on small screens: the previous page remains active when the new page is in the drop-down submenu
- Fix #6830: Wrong view filename after module enabling
- Enh #6838: Fix LDAP encryption labels and allow ignore also part of DNs
- Enh #6490: Update button style on force password form

5 changes: 2 additions & 3 deletions protected/humhub/modules/user/views/must-change-password/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
use humhub\modules\user\models\Password;
use humhub\widgets\Button;
use yii\helpers\Url;
use yii\helpers\Html;
use yii\bootstrap\ActiveForm;
use humhub\widgets\SiteLogo;

Expand Down Expand Up @@ -35,11 +34,11 @@
<?= $form->field($model, 'newPasswordConfirm')->passwordInput(['maxlength' => 45]); ?>

<hr>
<?= Html::submitButton(Yii::t('UserModule.auth', 'Confirm'), ['class' => 'btn btn-primary pull-left', 'data-ui-loader' => ""]); ?>
<?= Button::primary(Yii::t('UserModule.auth', 'Confirm'))->submit()->left() ?>

<?php ActiveForm::end(); ?>

<?= Button::danger(Yii::t('UserModule.auth', 'Log out'))->link(Url::toRoute('/user/auth/logout'), false)->options(['data-method' => 'POST'])->right() ?>
<?= Button::defaultType(Yii::t('UserModule.auth', 'Log out'))->link(Url::toRoute('/user/auth/logout'), false)->options(['data-method' => 'POST'])->right() ?>

</div>
</div>
Expand Down