Merge pull request #232 from humhub/enh/372-bs5-active-form

[v1.17] Update Active Form for Bootstrap 5
humhub · Sep 25, 2024 · dc65df7 · dc65df7
2 parents 5313ad8 + 1bae975
commit dc65df7
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
@@ -3,5 +3,5 @@ name: PHP CS Fixer
 on: push
 
 jobs:
-  tests:
+  fixers:
     uses: humhub/actions/.github/workflows/module-php-cs-fixer.yml@main
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -8,6 +8,7 @@ Changelog
 - Enh #227: Use PHP CS Fixer
 - Fix: Add autofocus on file or folder edit (for HumHub 1.17 - see https://github.com/humhub/humhub/issues/7136)
 - Fix #230: Optimize sql query to get files from the stream
+- Enh #232: Update Active Form for Bootstrap 5
 
 0.16.6 - March 14, 2024
 -------------------------

diff --git a/views/config-container/index.php b/views/config-container/index.php
@@ -1,9 +1,9 @@
 <?php
 
 use humhub\modules\cfiles\models\ConfigureForm;
+use humhub\modules\ui\form\widgets\ActiveForm;
 use humhub\modules\ui\form\widgets\ContentHiddenCheckbox;
 use humhub\widgets\Button;
-use yii\bootstrap\ActiveForm;
 
 /* @var $model ConfigureForm */
 ?>

diff --git a/views/config/index.php b/views/config/index.php
@@ -1,9 +1,9 @@
 <?php
 
 use humhub\modules\cfiles\models\ConfigureForm;
+use humhub\modules\ui\form\widgets\ActiveForm;
 use humhub\modules\ui\form\widgets\ContentHiddenCheckbox;
 use humhub\widgets\Button;
-use yii\bootstrap\ActiveForm;
 
 /* @var $model ConfigureForm */
 ?>

diff --git a/views/edit/modal_edit_file.php b/views/edit/modal_edit_file.php
@@ -3,11 +3,11 @@
 
 use humhub\modules\content\widgets\richtext\RichTextField;
 use humhub\modules\topic\widgets\TopicPicker;
+use humhub\modules\ui\form\widgets\ActiveForm;
 use humhub\modules\ui\form\widgets\ContentHiddenCheckbox;
 use humhub\modules\ui\form\widgets\ContentVisibilitySelect;
 use humhub\widgets\ModalButton;
 use humhub\widgets\ModalDialog;
-use yii\bootstrap\ActiveForm;
 
 /* @var $file \humhub\modules\cfiles\models\File */
 /* @var $submitUrl string */

diff --git a/views/edit/modal_edit_folder.php b/views/edit/modal_edit_folder.php
@@ -1,10 +1,10 @@
 <?php
 
+use humhub\modules\ui\form\widgets\ActiveForm;
 use humhub\modules\ui\form\widgets\ContentHiddenCheckbox;
 use humhub\modules\ui\form\widgets\ContentVisibilitySelect;
 use humhub\widgets\ModalButton;
 use humhub\widgets\ModalDialog;
-use yii\bootstrap\ActiveForm;
 
 /* @var $folder \humhub\modules\cfiles\models\Folder */
 /* @var $submitUrl string */

diff --git a/views/move/modal_move.php b/views/move/modal_move.php
@@ -1,7 +1,7 @@
 <?php
 
 use humhub\modules\cfiles\models\forms\MoveForm;
-use humhub\widgets\ActiveForm;
+use humhub\modules\ui\form\widgets\ActiveForm;
 use humhub\widgets\ModalButton;
 use humhub\widgets\ModalDialog;
 
@@ -34,4 +34,4 @@
         </div>
     <?php ActiveForm::end() ?>
 
-<?php ModalDialog::end()?>
+<?php ModalDialog::end()?>