Enh: Migrate to Bootstrap 5 for HumHub 1.18

.gitignore

@@ -3,4 +3,5 @@ nbproject
 .idea/*
 .gitmodules
 /composer.lock
-
+package-lock.json
+node_modules/*

Gruntfile.js

@@ -0,0 +1,38 @@
+module.exports = function (grunt) {
+
+    grunt.initConfig({
+        pkg: grunt.file.readJSON('package.json'),
+        cssmin: {
+            target: {
+                files: {
+                    'resources/css/sharebetween.min.css': ['resources/css/sharebetween.css']
+                }
+            }
+        },
+        sass: {
+            options: {
+                implementation: require('sass')
+            },
+            dev: {
+                files: {
+                    'resources/css/sharebetween.css': 'resources/css/sharebetween.scss'
+                }
+            }
+        },
+        watch: {
+            scripts: {
+                files: ['resources/css/*.scss'],
+                tasks: ['build'],
+                options: {
+                    spawn: false,
+                },
+            },
+        },
+    });
+
+    grunt.loadNpmTasks('grunt-sass');
+    grunt.loadNpmTasks('grunt-contrib-cssmin');
+    grunt.loadNpmTasks('grunt-contrib-watch');
+
+    grunt.registerTask('build', ['sass', 'cssmin']);
+};

controllers/ShareController.php

@@ -8,7 +8,7 @@
 use humhub\modules\space\models\Space;
 use humhub\modules\user\models\User;
 use humhub\modules\user\Module as UserModule;
-use humhub\widgets\ModalClose;
+use humhub\widgets\modal\ModalClose;
 use Yii;
 
 class ShareController extends \humhub\components\Controller

docs/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+1.1.0 (August 18, 2025)
+-----------------------
+- Enh #78: Migration to Bootstrap 5 for HumHub 1.18
+
 1.0.11 (May 28, 2025)
 ---------------------
 - Fix #75: Fix activity description

module.json

@@ -3,9 +3,9 @@
     "name": "Share content",
     "description": "Share content between Spaces in the simplest way possible.",
     "keywords": ["share", "between", "content"],
-    "version": "1.0.11",
+    "version": "1.1.0",
     "humhub": {
-        "minVersion": "1.14"
+        "minVersion": "1.18"
     },
     "screenshots": [
         "resources/screen1.png",

notifications/SharedContentCreated.php

@@ -13,7 +13,7 @@
 use humhub\modules\space\models\Space;
 use humhub\modules\user\models\User;
 use Yii;
-use yii\bootstrap\Html;
+use humhub\helpers\Html;
 
 class SharedContentCreated extends ContentCreated
 {

package.json

@@ -0,0 +1,23 @@
+{
+  "name": "humhub-modules-sharebetween",
+  "description": "HumHub Share Content Module",
+  "directories": {
+    "doc": "docs",
+    "test": "tests"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/humhub-contrib/sharebetween.git"
+  },
+  "bugs": {
+    "url": "https://github.com/humhub-contrib/sharebetween/issues"
+  },
+  "homepage": "https://github.com/humhub-contrib/sharebetween#readme",
+  "devDependencies": {
+    "grunt": "^1.5.3",
+    "grunt-contrib-cssmin": "^3.0.0",
+    "grunt-contrib-watch": "^1.1.0",
+    "grunt-sass": "^3.1.0",
+    "sass": "^1.83.0"
+  }
+}

resources/css/sharebetween.css

@@ -0,0 +1,20 @@
+.panel.sharebetween-wall-entry > .panel-body {
+  padding: 10px;
+}
+.panel.sharebetween-wall-entry > .panel-body > .wall-entry-header-info {
+  padding-bottom: 5px;
+  border-bottom: 2px solid var(--bs-border-color);
+}
+.panel.sharebetween-wall-entry > .panel-body > .wall-entry-header-info a {
+  color: var(--hh-text-color-main);
+}
+.panel.sharebetween-wall-entry > .panel-body > .wall-entry {
+  margin-top: 10px;
+}
+.panel.sharebetween-wall-entry > .panel-body > .wall-entry > .panel {
+  margin: 0;
+  box-shadow: none;
+}
+.panel.sharebetween-wall-entry > .panel-body > .wall-entry > .panel > .panel-body {
+  padding: 0;
+}

resources/css/sharebetween.less → resources/css/sharebetween.scss

@@ -3,9 +3,9 @@
     padding: 10px;
     > .wall-entry-header-info {
       padding-bottom: 5px;
-      border-bottom: 2px solid #eee;
+      border-bottom: 2px solid var(--bs-border-color);
       a {
-        color: #555;
+        color: var(--hh-text-color-main);
       }
     }
     > .wall-entry {

views/share/index.php

@@ -3,29 +3,23 @@
 use humhub\modules\content\models\Content;
 use humhub\modules\sharebetween\models\ShareForm;
 use humhub\modules\space\widgets\SpacePickerField;
-use humhub\modules\ui\form\widgets\ActiveForm;
-use humhub\widgets\ModalButton;
-use humhub\widgets\ModalDialog;
+use humhub\widgets\modal\ModalButton;
+use humhub\widgets\modal\Modal;
 use yii\helpers\Url;
 
 /* @var $model ShareForm */
 /* @var $content Content */
 /* @var $allowShareOnProfile bool */
 ?>
-<?php ModalDialog::begin(['header' => Yii::t('SharebetweenModule.base', '<strong>Share</strong> content')]); ?>
-<?php $form = ActiveForm::begin([]); ?>
-    <div class="modal-body">
-        <?= $form->field($model, 'spaces')->widget(SpacePickerField::class, [
-            'url' => Url::to(['/sharebetween/share/search-spaces', 'id' => $content->id]),
-            'minInput' => 0,
-        ])->label(false) ?>
-        <?php if ($allowShareOnProfile) : ?>
-            <?= $form->field($model, 'onProfile')->checkbox() ?>
-        <?php endif; ?>
-    </div>
-    <div class="modal-footer">
-        <?= ModalButton::submitModal() ?>
-        <?= ModalButton::cancel() ?>
-    </div>
-<?php ActiveForm::end() ?>
-<?php ModalDialog::end(); ?>
+<?php $form = Modal::beginFormDialog([
+        'title' => Yii::t('SharebetweenModule.base', '<strong>Share</strong> content'),
+        'footer' => ModalButton::cancel() . ' ' . ModalButton::save()->submit(),
+    ]); ?>
+    <?= $form->field($model, 'spaces')->widget(SpacePickerField::class, [
+        'url' => Url::to(['/sharebetween/share/search-spaces', 'id' => $content->id]),
+        'minInput' => 0,
+    ])->label(false) ?>
+    <?php if ($allowShareOnProfile) : ?>
+        <?= $form->field($model, 'onProfile')->checkbox() ?>
+    <?php endif; ?>
+<?php Modal::endFormDialog(); ?>

widgets/ShareLink.php

@@ -2,13 +2,14 @@
 
 namespace humhub\modules\sharebetween\widgets;
 
-use humhub\libs\Html;
+use humhub\helpers\Html;
 use humhub\modules\content\components\ContentActiveRecord;
 use humhub\modules\content\models\Content;
 use humhub\modules\sharebetween\models\Share;
 use humhub\modules\sharebetween\services\ShareService;
 use Yii;
 use yii\base\Widget;
+use yii\helpers\Url;
 
 class ShareLink extends Widget
 {
@@ -39,8 +40,11 @@ public function run()
             'span',
             Html::a(
                 Yii::t('SharebetweenModule.base', 'Share') . $this->getCounter(),
-                ['/sharebetween/share', 'id' => $this->record->content->id],
-                ['data-target' => '#globalModal'],
+                '#',
+                [
+                    'data-action-click' => 'ui.modal.load',
+                    'data-action-click-url' => Url::toRoute(['/sharebetween/share', 'id' => $this->record->content->id]),
+                ],
             ),
             ['class' => 'share-between-container'],
         );

widgets/views/wallEntryBodyLayout.php

@@ -7,7 +7,7 @@
 
 use humhub\modules\content\components\ContentActiveRecord;
 use humhub\modules\sharebetween\assets\Assets;
-use humhub\modules\ui\view\components\View;
+use humhub\components\View;
 
 /* @var $this View */
 /* @var $model ContentActiveRecord */

widgets/views/wallEntryHeader.php

@@ -5,12 +5,12 @@
  * @license https://www.humhub.com/licences
  */
 
-use humhub\libs\Html;
+use humhub\helpers\Html;
 use humhub\modules\content\components\ContentContainerActiveRecord;
 use humhub\modules\content\widgets\stream\WallStreamEntryOptions;
 use humhub\modules\sharebetween\models\Share;
 use humhub\modules\ui\icon\widgets\Icon;
-use humhub\widgets\Link;
+use humhub\widgets\bootstrap\Link;
 use humhub\widgets\TimeAgo;
 
 /* @var $model Share */
@@ -20,7 +20,7 @@
 $sourceContainer = $model->getContentRecord()->content->container;
 $currentContainer = $model->content->container;
 ?>
-<div class="wall-entry-header-info media-body">
+<div class="wall-entry-header-info flex-grow-1">
     <?= Icon::get('share') ?>
     <?= $sourceContainer instanceof ContentContainerActiveRecord
         ? Link::to($sourceContainer->getDisplayName(), $sourceContainer->createUrl())