Fix Marketplace dropdown

MIGRATE-DEV-BS5.md

@@ -141,6 +141,7 @@ If the footer contains a "Submit" button, the modal dialog must be included in t
 <?php Modal::endFormDialog()?>
 ```
 
+Search also for `<div class="modal-dialog` in the code to find modal dialogs not using the `Modal::beginDialog()` method.
 
 ## Forms
 

protected/humhub/modules/admin/widgets/SpaceMenu.php

@@ -28,7 +28,6 @@ class SpaceMenu extends TabMenu
      */
     public function init()
     {
-
         $this->addEntry(new MenuLink([
             'label' => Yii::t('AdminModule.space', 'Overview'),
             'url' => Url::toRoute(['/admin/space/index']),

protected/humhub/modules/marketplace/widgets/Settings.php

@@ -9,26 +9,26 @@
 namespace humhub\modules\marketplace\widgets;
 
 use humhub\modules\marketplace\models\Module;
+use humhub\modules\ui\icon\widgets\Icon;
 use humhub\modules\ui\menu\MenuLink;
-use humhub\modules\ui\menu\widgets\Menu;
+use humhub\modules\ui\menu\widgets\DropdownMenu;
 use Yii;
 
 /**
  * Widget for Marketplace settings dropdown menu
  */
-class Settings extends Menu
+class Settings extends DropdownMenu
 {
     public Module $module;
 
-    /**
-     * @inheritdoc
-     */
-    public $template = '@marketplace/widgets/views/settings';
-
     public function init()
     {
         parent::init();
 
+        if (!$this->label) {
+            $this->label = Icon::get('cog');
+        }
+
         $this->addEntry(new MenuLink([
             'label' => Yii::t('MarketplaceModule.base', 'General Settings'),
             'url' => ['/marketplace/browse/module-settings'],
@@ -58,6 +58,6 @@ class Settings extends Menu
      */
     public function getAttributes()
     {
-        return ['class' => 'marketplace-settings-dropdown'];
+        return ['class' => 'marketplace-settings-dropdown pull-right'];
     }
 }

protected/humhub/modules/marketplace/widgets/views/settings.php

@@ -1,31 +0,0 @@
-<?php
-/**
- * @link https://www.humhub.org/
- * @copyright Copyright (c) HumHub GmbH & Co. KG
- * @license https://www.humhub.com/licences
- */
-
-use humhub\helpers\Html;
-use humhub\modules\ui\menu\MenuEntry;
-use humhub\widgets\bootstrap\Button;
-
-/* @var MenuEntry[] $entries */
-/* @var array $options */
-?>
-<?= Html::beginTag('ul', $options) ?>
-<?= Html::beginTag('li', ['class' => 'dropdown']) ?>
-<?= Button::asLink()
-    ->icon('cog')
-    ->cssClass('dropdown-toggle')
-    ->tooltip(Yii::t('MarketplaceModule.base', 'Settings'))
-    ->options(['data-bs-toggle' => 'dropdown']) ?>
-
-<ul class="dropdown-menu dropdown-menu-end">
-    <?php foreach ($entries as $entry) : ?>
-        <li>
-            <?= $entry->render(['class' => 'dropdown-item']) ?>
-        </li>
-    <?php endforeach; ?>
-</ul>
-<?= Html::endTag('li') ?>
-<?= Html::endTag('ul') ?>

static/scss/_modules.scss

@@ -64,18 +64,8 @@
     }
 
     .marketplace-settings-dropdown {
-        float: right;
-        list-style: none;
-
-        .dropdown-toggle {
-            color: #02A1B1;
-            font-size: 22px;
-            line-height: 20px;
-            margin: 2px;
-
-            &:hover {
-                color: #1d8e9d;
-            }
+        .btn-sm, i {
+            font-size: 18px;
         }
     }
 

themes/HumHub/css/theme.css

@@ -15047,18 +15047,8 @@ img.bounceIn {
 .container-modules .card-module .card-footer.text-end a.btn:first-child {
   margin-left: 0;
 }
-.container-modules .marketplace-settings-dropdown {
-  float: right;
-  list-style: none;
-}
-.container-modules .marketplace-settings-dropdown .dropdown-toggle {
-  color: #02A1B1;
-  font-size: 22px;
-  line-height: 20px;
-  margin: 2px;
-}
-.container-modules .marketplace-settings-dropdown .dropdown-toggle:hover {
-  color: #1d8e9d;
+.container-modules .marketplace-settings-dropdown .btn-sm, .container-modules .marketplace-settings-dropdown .btn-group-sm > .btn, .container-modules .marketplace-settings-dropdown i {
+  font-size: 18px;
 }
 @media (max-width: 575.98px) {
   .container-modules .card {