Update Active Form for Bootstrap 5 (#418)

humhub · Sep 25, 2024 · ef6774e · ef6774e
1 parent 2bb9346
commit ef6774e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -8,6 +8,7 @@ Changelog
 - Fix #412: Fix active message after mark unread
 - Fix #15: When replying to a message, the conversation is marked as unread
 - Enh #417: Replace theme variables with CSS variables
+- Enh #418: Update Active Form for Bootstrap 5
 
 3.2.2 (July 9, 2024)
 --------------------

diff --git a/views/config/index.php b/views/config/index.php
@@ -1,8 +1,8 @@
 <?php
 
 use humhub\libs\Html;
+use humhub\modules\ui\form\widgets\ActiveForm;
 use humhub\widgets\Button;
-use yii\bootstrap\ActiveForm;
 
 /* @var $model \humhub\modules\mail\models\Config */
 ?>

diff --git a/views/mail/adduser.php b/views/mail/adduser.php
@@ -1,6 +1,6 @@
 <?php
 
-use yii\widgets\ActiveForm;
+use humhub\modules\ui\form\widgets\ActiveForm;
 use humhub\widgets\ModalDialog;
 use humhub\modules\user\widgets\UserPickerField;
 use humhub\widgets\ModalButton;

diff --git a/views/mail/editEntry.php b/views/mail/editEntry.php
@@ -7,10 +7,10 @@
 use humhub\modules\file\widgets\UploadProgress;
 use humhub\modules\mail\models\MessageEntry;
 use humhub\modules\mail\widgets\MailRichtextEditor;
+use humhub\modules\ui\form\widgets\ActiveForm;
 use humhub\widgets\Button;
 use humhub\widgets\ModalButton;
 use humhub\widgets\ModalDialog;
-use yii\bootstrap\ActiveForm;
 
 /* @var $entry MessageEntry */
 /* @var $fileHandlers BaseFileHandler[] */

diff --git a/views/tag/editConversationTagsModal.php b/views/tag/editConversationTagsModal.php
@@ -3,10 +3,10 @@
 use humhub\modules\mail\helpers\Url;
 use humhub\modules\mail\models\forms\ConversationTagsForm;
 use humhub\modules\mail\widgets\ConversationTagPicker;
+use humhub\modules\ui\form\widgets\ActiveForm;
 use humhub\modules\ui\view\components\View;
 use humhub\widgets\ModalButton;
 use humhub\widgets\ModalDialog;
-use yii\bootstrap\ActiveForm;
 
 /* @var $this View */
 /* @var $model ConversationTagsForm */
@@ -30,4 +30,4 @@
 
     </div>
     <?php ActiveForm::end() ?>
-<?php ModalDialog::end() ?>
+<?php ModalDialog::end() ?>
diff --git a/views/tag/manage.php b/views/tag/manage.php
@@ -3,11 +3,11 @@
 use humhub\modules\mail\helpers\Url;
 use humhub\modules\mail\models\forms\AddTag;
 use humhub\modules\mail\models\MessageTag;
+use humhub\modules\ui\form\widgets\ActiveForm;
 use humhub\modules\ui\view\components\View;
 use humhub\widgets\Button;
 use humhub\widgets\GridView;
 use humhub\widgets\ModalButton;
-use yii\bootstrap\ActiveForm;
 use yii\data\ActiveDataProvider;
 use yii\grid\ActionColumn;
 use yii\helpers\Html;