Migration to Bootstrap 5 for HumHub 1.18

Events.php

@@ -8,8 +8,10 @@
 
 namespace humhub\modules\devtools;
 
+use humhub\helpers\ControllerHelper;
+use humhub\modules\ui\menu\MenuLink;
+use humhub\widgets\TopMenu;
 use Yii;
-use yii\helpers\Url;
 
 class Events
 {
@@ -19,14 +21,17 @@ public static function onTopMenuInit($event)
             return true;
         }
 
-        $event->sender->addItem([
+        /* @var TopMenu $menu */
+        $menu = $event->sender;
+
+        $menu->addEntry(new MenuLink([
             'label' => Yii::t('DevtoolsModule.base', 'Devtools'),
             'id' => 'devtools',
-            'icon' => '<i class="fa fa-code"></i>',
-            'url' => Url::toRoute('/devtools/index'),
+            'icon' => 'code',
+            'url' => ['/devtools/index'],
             'sortOrder' => 100,
-            'isActive' => (Yii::$app->controller->module && Yii::$app->controller->module->id == 'devtools'),
-        ]);
+            'isActive' => ControllerHelper::isActivePath('devtools'),
+        ]));
     }
 
     public static function onConsoleApplicationInit($event)

assets/GiiAsset.php

@@ -12,7 +12,7 @@
 use humhub\assets\FontAwesomeAsset;
 use humhub\assets\Select2Asset;
 use humhub\components\assets\AssetBundle;
-use yii\bootstrap\BootstrapAsset;
+use yii\bootstrap5\BootstrapAsset;
 use yii\web\JqueryAsset;
 
 class GiiAsset extends AssetBundle

controllers/ClientController.php

@@ -8,10 +8,6 @@
 
 namespace humhub\modules\devtools\controllers;
 
-use humhub\components\Controller;
-use humhub\modules\devtools\models\forms\RichtextModel;
-use humhub\widgets\ModalDialog;
-use humhub\widgets\RichText;
 use Yii;
 
 /**

controllers/FormController.php

@@ -8,12 +8,8 @@
 
 namespace humhub\modules\devtools\controllers;
 
-use humhub\components\Controller;
-use humhub\modules\devtools\models\forms\RichtextModel;
 use humhub\modules\devtools\models\TestModel;
-use humhub\widgets\ModalClose;
-use humhub\widgets\ModalDialog;
-use humhub\widgets\RichText;
+use humhub\widgets\modal\ModalClose;
 use Yii;
 
 /**
@@ -32,6 +28,6 @@ public function actionIndex()
             return $this->renderAjax('result', ['model' => $model]);
         }
 
-        return ModalClose::widget(['error', 'Could not load form data!']);
+        return ModalClose::widget(['error' => 'Could not load form data!']);
     }
 }

controllers/IndexController.php

@@ -8,8 +8,6 @@
 
 namespace humhub\modules\devtools\controllers;
 
-use Yii;
-
 /**
  * Defines the configure actions.
  *

controllers/RichtextController.php

@@ -9,9 +9,10 @@
 namespace humhub\modules\devtools\controllers;
 
 use humhub\components\Controller;
-use humhub\modules\devtools\models\forms\RichtextModel;
-use humhub\widgets\ModalDialog;
 use humhub\modules\content\widgets\richtext\RichText;
+use humhub\modules\devtools\models\forms\RichtextModel;
+use humhub\widgets\modal\Modal;
+use humhub\widgets\modal\ModalButton;
 use Yii;
 
 /**
@@ -29,17 +30,17 @@ public function actionModal()
         $model = new RichtextModel();
 
         if ($model->load(Yii::$app->request->post())) {
-            return ModalDialog::widget([
-                'header' => Yii::t('DevtoolsModule.controllers_ShowcaseController', '<strong>Richtext</strong> result'),
+            return Modal::widget([
+                'title' => Yii::t('DevtoolsModule.controllers_ShowcaseController', '<strong>Richtext</strong> result'),
                 'body' => RichText::output($model->richtext),
-                'footer' => '<button class="btn btn-default" data-modal-close>Close</button>',
+                'footer' => ModalButton::cancel(Yii::t('base', 'Close')),
             ]);
         }
 
-        return ModalDialog::widget([
-            'header' => Yii::t('DevtoolsModule.controllers_ShowcaseController', '<strong>Richtext</strong> result'),
+        return Modal::widget([
+            'title' => Yii::t('DevtoolsModule.controllers_ShowcaseController', '<strong>Richtext</strong> result'),
             'body' => RichText::widget(['text' => 'Richtext could not be loaded']),
-            'footer' => '<button class="btn btn-default" data-modal-close>Close</button>',
+            'footer' => ModalButton::cancel(Yii::t('base', 'Close')),
         ]);
     }
 
@@ -48,17 +49,17 @@ public function actionPreset()
         $model = new RichtextModel();
 
         if ($model->load(Yii::$app->request->post())) {
-            return ModalDialog::widget([
-                'header' => Yii::t('DevtoolsModule.controllers_ShowcaseController', '<strong>Richtext</strong> result'),
+            return Modal::widget([
+                'title' => Yii::t('DevtoolsModule.controllers_ShowcaseController', '<strong>Richtext</strong> result'),
                 'body' => RichText::output($model->richtext, ['preset' => 'markdown']),
-                'footer' => '<button class="btn btn-default" data-modal-close>Close</button>',
+                'footer' => ModalButton::cancel(Yii::t('base', 'Close')),
             ]);
         }
 
-        return ModalDialog::widget([
-            'header' => Yii::t('DevtoolsModule.controllers_ShowcaseController', '<strong>Richtext</strong> result'),
+        return Modal::widget([
+            'title' => Yii::t('DevtoolsModule.controllers_ShowcaseController', '<strong>Richtext</strong> result'),
             'body' => RichText::widget(['text' => 'Richtext could not be loaded']),
-            'footer' => '<button class="btn btn-default" data-modal-close>Close</button>',
+            'footer' => ModalButton::cancel(Yii::t('base', 'Close')),
         ]);
     }
 
@@ -67,17 +68,17 @@ public function actionCustomPreset()
         $model = new RichtextModel();
 
         if ($model->load(Yii::$app->request->post())) {
-            return ModalDialog::widget([
-                'header' => Yii::t('DevtoolsModule.controllers_ShowcaseController', '<strong>Richtext</strong> result'),
+            return Modal::widget([
+                'title' => Yii::t('DevtoolsModule.controllers_ShowcaseController', '<strong>Richtext</strong> result'),
                 'body' => RichText::output($model->richtext, ['preset' => 'demo']),
-                'footer' => '<button class="btn btn-default" data-modal-close>Close</button>',
+                'footer' => ModalButton::cancel(Yii::t('base', 'Close')),
             ]);
         }
 
-        return ModalDialog::widget([
-            'header' => Yii::t('DevtoolsModule.controllers_ShowcaseController', '<strong>Richtext</strong> result'),
+        return Modal::widget([
+            'title' => Yii::t('DevtoolsModule.controllers_ShowcaseController', '<strong>Richtext</strong> result'),
             'body' => RichText::widget(['text' => 'Richtext could not be loaded']),
-            'footer' => '<button class="btn btn-default" data-modal-close>Close</button>',
+            'footer' => ModalButton::cancel(Yii::t('base', 'Close')),
         ]);
     }
 
@@ -86,17 +87,17 @@ public function actionExclude()
         $model = new RichtextModel();
 
         if ($model->load(Yii::$app->request->post())) {
-            return ModalDialog::widget([
-                'header' => Yii::t('DevtoolsModule.controllers_ShowcaseController', '<strong>Richtext</strong> result'),
+            return Modal::widget([
+                'title' => Yii::t('DevtoolsModule.controllers_ShowcaseController', '<strong>Richtext</strong> result'),
                 'body' => RichText::output($model->richtext, ['exclude' => ['emoji', 'mention', 'table']]),
-                'footer' => '<button class="btn btn-default" data-modal-close>Close</button>',
+                'footer' => ModalButton::cancel(Yii::t('base', 'Close')),
             ]);
         }
 
-        return ModalDialog::widget([
-            'header' => Yii::t('DevtoolsModule.controllers_ShowcaseController', '<strong>Richtext</strong> result'),
+        return Modal::widget([
+            'title' => Yii::t('DevtoolsModule.controllers_ShowcaseController', '<strong>Richtext</strong> result'),
             'body' => RichText::widget(['text' => 'Richtext could not be loaded']),
-            'footer' => '<button class="btn btn-default" data-modal-close>Close</button>',
+            'footer' => ModalButton::cancel(Yii::t('base', 'Close')),
         ]);
     }
 }

controllers/ShowcaseController.php

@@ -8,9 +8,8 @@
 
 namespace humhub\modules\devtools\controllers;
 
-use humhub\modules\devtools\models\forms\RichtextModel;
-use humhub\widgets\ModalDialog;
-use humhub\widgets\RichText;
+use humhub\widgets\modal\Modal;
+use humhub\widgets\modal\ModalButton;
 use Yii;
 
 /**
@@ -55,10 +54,10 @@ public function actionUserpickerRemote()
         $model = new \humhub\modules\devtools\models\forms\UserpickerForm();
 
         if ($model->load(Yii::$app->request->post())) {
-            return ModalDialog::widget([
-                'header' => Yii::t('DevtoolsModule.controllers_ShowcaseController', '<strong>Userpicker</strong> guid selection'),
+            return Modal::widget([
+                'title' => Yii::t('DevtoolsModule.controllers_ShowcaseController', '<strong>Userpicker</strong> guid selection'),
                 'body' => $model->getSelectionString(),
-                'footer' => '<button class="btn btn-default" data-modal-close>Close</button>',
+                'footer' => ModalButton::cancel(Yii::t('base', 'Close')),
             ]);
         }
     }

controllers/StatusController.php

@@ -8,10 +8,9 @@
 
 namespace humhub\modules\devtools\controllers;
 
-use humhub\widgets\ModalClose;
-use Yii;
-use humhub\components\Controller;
+use humhub\widgets\modal\ModalClose;
 use yii\helpers\Url;
+use Yii;
 
 class StatusController extends DevtoolsController
 {

docs/CHANGELOG.md

@@ -4,6 +4,7 @@ Changelog
 0.5.0 (unreleased)
 ---------------------
 - Enh #33: Changes for HumHub version 1.18 by rector
+- Enh #36: Migration to Bootstrap 5 for HumHub 1.18
 
 0.4.1 (unreleased)
 ---------------------

gii/templates/modules/simple/Events.php

@@ -1,7 +1,11 @@
 <?php /* @var $generator \humhub\modules\devtools\gii\generators\ModuleGenerator */?><?= "<?php\n"; ?>
 
-namespace  <?= $generator->getClassNamespace() ?>;
+namespace <?= $generator->getClassNamespace() ?>;
 
+use humhub\helpers\ControllerHelper;
+use humhub\modules\admin\widgets\AdminMenu;
+use humhub\modules\ui\menu\MenuLink;
+use humhub\widgets\TopMenu;
 use Yii;
 use yii\helpers\Url;
 
@@ -14,13 +18,16 @@ class Events
      */
     public static function onTopMenuInit($event)
     {
-        $event->sender->addItem([
+        /* @var TopMenu $menu */
+        $menu = $event->sender;
+
+        $menu->addEntry(new MenuLink([
             'label' => '<?= ucfirst((string) $generator->moduleID) ?>',
-            'icon' => '<i class="fa <?= $generator->icon ?>"></i>',
-            'url' => Url::to(['/<?= $generator->moduleID ?>/index']),
+            'icon' => '<?= $generator->icon ?>',
+            'url' => ['/<?= $generator->moduleID ?>/index'],
             'sortOrder' => 99999,
-            'isActive' => (Yii::$app->controller->module && Yii::$app->controller->module->id == '<?= $generator->moduleID ?>' && Yii::$app->controller->id == 'index'),
-        ]);
+            'isActive' => ControllerHelper::isActivePath('<?= $generator->moduleID ?>', 'index'),
+        ]));
     }
 
     /**
@@ -30,13 +37,15 @@ public static function onTopMenuInit($event)
      */
     public static function onAdminMenuInit($event)
     {
-        $event->sender->addItem([
-            'label' => '<?= ucfirst((string) $generator->moduleID); ?>',
-            'url' => Url::to(['/<?= $generator->moduleID; ?>/admin']),
-            'group' => 'manage',
-            'icon' => '<i class="fa <?= $generator->icon ?>"></i>',
-            'isActive' => (Yii::$app->controller->module && Yii::$app->controller->module->id == '<?= $generator->moduleID; ?>' && Yii::$app->controller->id == 'admin'),
+        /* @var AdminMenu $menu */
+        $menu = $event->sender;
+
+        $menu->addEntry(new MenuLink([
+            'label' => '<?= ucfirst((string) $generator->moduleID) ?>',
+            'url' => ['/<?= $generator->moduleID; ?>/admin'],
+            'icon' => '<?= $generator->icon ?>',
+            'isActive' => ControllerHelper::isActivePath('<?= $generator->moduleID ?>', 'admin'),
             'sortOrder' => 99999,
-        ]);
+        ]));
     }
 }

gii/templates/modules/simple/views/index/index.php

@@ -1,6 +1,6 @@
 <?php /* @var $generator \humhub\modules\devtools\gii\generators\ModuleGenerator */?><?= "<?php\n"; ?>
 
-use humhub\widgets\Button;
+use humhub\widgets\bootstrap\Button;
 
 // Register our module assets, this could also be done within the controller
 \<?= $generator->getClassNamespace('assets\Assets::register($this);'); ?><?= "\n" ?>

gii/views/module/form.php

@@ -6,6 +6,7 @@
  *
  */
 
+use humhub\helpers\Html;
 use humhub\modules\devtools\widgets\IconSelect;
 
 /* @var $this yii\web\View */
@@ -29,8 +30,8 @@
     <hr>
 
 
-    <div class="form-group">
-        <label class="control-label"><?=  Yii::t('DevtoolsModule.views_generators_module_form', 'Is this module installable on container level?')?></label>
+    <div class="mb-3">
+        <label class="form-label"><?=  Yii::t('DevtoolsModule.views_generators_module_form', 'Is this module installable on container level?')?></label>
         <br><br>
         <?= $form->field($generator, 'isSpaceModule')->checkbox(['class' => 'isContainerModule']) ?>
         <?= $form->field($generator, 'isUserModule')->checkbox(['class' => 'isContainerModule']) ?>
@@ -46,7 +47,7 @@
     <?= $form->field($generator, 'outputPath'); ?>
 </div>
 
-<script>
+<script <?= Html::nonce() ?>>
     var displayIf = function(checkBoxSelector, showClass) {
         $(checkBoxSelector).on('change', function() {
             displayCheck(checkBoxSelector, showClass);

views/client/index.php

@@ -6,7 +6,7 @@
  *
  */
 
-/* @var $this \humhub\modules\ui\view\components\View */
+/* @var $this \humhub\components\View */
 ?>
 
 <div class="alert alert-info">