From b497dc1027118d4776d9aca977fe04b416d86d64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Farr=C3=A9?= Date: Wed, 17 Dec 2025 20:22:00 +0000 Subject: [PATCH 1/2] Fix: `.row` HTML elements without `.container` overflow https://github.com/humhub/humhub-internal/issues/988 --- docs/CHANGELOG.md | 4 + module.json | 2 +- views/overview/list-categories.php | 24 ++-- views/overview/no-pages.php | 34 ++--- views/page/diff.php | 88 ++++++------ views/page/edit.php | 208 +++++++++++++++-------------- views/page/history.php | 94 ++++++------- views/page/view.php | 20 +-- 8 files changed, 244 insertions(+), 230 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 25749ae4..8e172284 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,10 @@ Changelog ========= +2.5.5 (Unreleased) +----------------------- +- Fix: `.row` HTML elements without `.container` overflow + 2.5.4 (December 12, 2025) ------------------------- - Fix #330: Update module resources path diff --git a/module.json b/module.json index 984d7611..981becae 100644 --- a/module.json +++ b/module.json @@ -3,7 +3,7 @@ "name": "Wiki", "description": "Create and edit pages with this powerful tool. Build a collaborative knowledge base, view and share information with your colleagues.", "keywords": ["wiki"], - "version": "2.5.4", + "version": "2.5.5", "humhub": { "minVersion": "1.18" }, diff --git a/views/overview/list-categories.php b/views/overview/list-categories.php index 75fae880..adb45e74 100644 --- a/views/overview/list-categories.php +++ b/views/overview/list-categories.php @@ -32,20 +32,22 @@ ?>
-
- 'wiki-page-content']) ?> -
-

module_label) ?>

- $contentContainer, 'cssClass' => 'float-start']) ?> -
- sm()->link(Url::toLastEdited($contentContainer))->cssClass(Helper::isEnterpriseTheme() ? 'd-lg-none' : '') ?> - icon('fa-plus')->sm()->link(Url::toWikiCreate($contentContainer))->visible($canCreate) ?> +
+
+ 'wiki-page-content']) ?> +
+

module_label) ?>

+ $contentContainer, 'cssClass' => 'float-start']) ?> +
+ sm()->link(Url::toLastEdited($contentContainer))->cssClass(Helper::isEnterpriseTheme() ? 'd-lg-none' : '') ?> + icon('fa-plus')->sm()->link(Url::toWikiCreate($contentContainer))->visible($canCreate) ?> +
-
- $contentContainer]) ?> + $contentContainer]) ?> - + +
diff --git a/views/overview/no-pages.php b/views/overview/no-pages.php index 195af5e6..343309d5 100644 --- a/views/overview/no-pages.php +++ b/views/overview/no-pages.php @@ -20,23 +20,23 @@
- -
- - -
-

- -

-
-

- link(Url::toWikiCreate($contentContainer)) ?> -

- -
- - - +
+
+ + +
+

+ +

+
+

+ link(Url::toWikiCreate($contentContainer)) ?> +

+ +
+ + +
diff --git a/views/page/diff.php b/views/page/diff.php index 61e0eecd..4f6a6f37 100644 --- a/views/page/diff.php +++ b/views/page/diff.php @@ -17,58 +17,60 @@ ?>
-
- 'wiki-page-content wiki-page-diff']) ?> +
+
+ 'wiki-page-content wiki-page-diff']) ?> - render('_view_header', [ - 'page' => $page, - 'buttons' => WikiMenu::LINK_REVERT, - 'revision' => $revision1 - ]) ?> + render('_view_header', [ + 'page' => $page, + 'buttons' => WikiMenu::LINK_REVERT, + 'revision' => $revision1 + ]) ?> -
-
- - isCurrentlyEditing) : ?> - - - - formatter->asDateTime($revision1->revision); ?> - - author->displayName), $revision1->author->getUrl(), ['class' => 'wiki-author-link']); ?> - - -
-
- - isCurrentlyEditing) : ?> - - - - formatter->asDateTime($revision2->revision); ?> - - author->displayName), $revision2->author->getUrl(), ['class' => 'wiki-author-link']); ?> - - +
+
+ + isCurrentlyEditing) : ?> + + + + formatter->asDateTime($revision1->revision); ?> + + author->displayName), $revision1->author->getUrl(), ['class' => 'wiki-author-link']); ?> + + +
+
+ + isCurrentlyEditing) : ?> + + + + formatter->asDateTime($revision2->revision); ?> + + author->displayName), $revision2->author->getUrl(), ['class' => 'wiki-author-link']); ?> + + +
-
-
+
-
-
-
diff --git a/views/page/edit.php b/views/page/edit.php index 2dfbd395..3c5296a4 100644 --- a/views/page/edit.php +++ b/views/page/edit.php @@ -29,131 +29,133 @@ ?>
-
- - 'wiki-page-edit', - 'cssClass' => 'wiki-page-content', - ]) ?> - -
-
- $model->page]) ?> - -
- link($model->page->isNewRecord ? Url::toOverview($model->container) : Url::toWiki($model->page)) ?> - action('wiki.Form.submit') ?> -
- -
-
getTitle() ?>
-
+
+
- false, - 'options' => [ - 'data-ui-widget' => 'wiki.Form', - 'data-change-category-confirm' => Yii::t('WikiModule.base', 'Are you really sure? All existing category page assignments will be removed!'), - 'data-is-category' => $model->page->isCategory, - 'data-ui-init' => '1', - ], - 'acknowledge' => true, - ]); ?> - - field($model, 'latestRevisionNumber')->hiddenInput()->label(false); ?> - -
- Warning!

Another user has updated this page since you have started editing it. Please confirm that you want to overwrite those changes.
:linkToCompare', - [':linkToCompare' => Button::asLink(Yii::t('WikiModule.base', 'Compare changes'))->icon('arrow-right')->action('compareOverwriting', $diffUrl)->cssClass('text-danger')], - ); ?> -
- field($model, 'backOverwriting')->hiddenInput()->label(false); ?> - field($model, 'confirmOverwriting')->checkbox()->label(); ?> - - submit() ?> - - action('backOverwriting')->icon('back')->loader(false); ?> + 'wiki-page-edit', + 'cssClass' => 'wiki-page-content', + ]) ?> -
- link($discardChangesUrl)->icon('close')->loader(true); ?> +
+
+ $model->page]) ?> + +
+ link($model->page->isNewRecord ? Url::toOverview($model->container) : Url::toWiki($model->page)) ?> + action('wiki.Form.submit') ?> +
+ +
+
getTitle() ?>
- - field($model, 'confirmOverwriting')->hiddenInput()->label(false); ?> - - style="display:none"> - - field($model->page, 'title') - ->textInput([ - 'placeholder' => Yii::t('WikiModule.base', 'New page title'), - 'disabled' => $model->isDisabledField('title'), - ])->label(false); ?> - - field($model->revision, 'content')->widget(WikiEditor::class)->label(false) ?> - - field($model->page, 'parent_page_id') ?> - widget(WikiPagePicker::class, [ - 'model' => $model->page, - 'maxInput' => 30, - 'disabled' => $model->isDisabledField('parent_page_id'), - ]) - : $category->hiddenInput() ?> - - beginCollapsibleFields(Yii::t('WikiModule.base', 'Advanced settings')); ?> - - canAdminister()) : ?> -
+ false, + 'options' => [ + 'data-ui-widget' => 'wiki.Form', + 'data-change-category-confirm' => Yii::t('WikiModule.base', 'Are you really sure? All existing category page assignments will be removed!'), + 'data-is-category' => $model->page->isCategory, + 'data-ui-init' => '1', + ], + 'acknowledge' => true, + ]); ?> + + field($model, 'latestRevisionNumber')->hiddenInput()->label(false); ?> + +
Warning!

Another user has updated this page since you have started editing it. Please confirm that you want to overwrite those changes.
:linkToCompare', + [':linkToCompare' => Button::asLink(Yii::t('WikiModule.base', 'Compare changes'))->icon('arrow-right')->action('compareOverwriting', $diffUrl)->cssClass('text-danger')], ); ?>
+ field($model, 'backOverwriting')->hiddenInput()->label(false); ?> + field($model, 'confirmOverwriting')->checkbox()->label(); ?> + + submit() ?> + + action('backOverwriting')->icon('back')->loader(false); ?> + +
+ link($discardChangesUrl)->icon('close')->loader(true); ?> +
+ + field($model, 'confirmOverwriting')->hiddenInput()->label(false); ?> - field($model->page, 'is_home')->checkbox([ - 'title' => Yii::t('WikiModule.base', 'Overwrite the wiki index start page?'), - 'disabled' => $model->isDisabledField('is_home'), - ]) ?> + style="display:none"> + + field($model->page, 'title') + ->textInput([ + 'placeholder' => Yii::t('WikiModule.base', 'New page title'), + 'disabled' => $model->isDisabledField('title'), + ])->label(false); ?> + + field($model->revision, 'content')->widget(WikiEditor::class)->label(false) ?> + + field($model->page, 'parent_page_id') ?> + widget(WikiPagePicker::class, [ + 'model' => $model->page, + 'maxInput' => 30, + 'disabled' => $model->isDisabledField('parent_page_id'), + ]) + : $category->hiddenInput() ?> + + beginCollapsibleFields(Yii::t('WikiModule.base', 'Advanced settings')); ?> + + canAdminister()) : ?> +
+ +
+ - field($model, 'isPublic')->widget(ContentVisibilitySelect::class, [ - 'readonly' => $model->isDisabledField('isPublic'), - ]) ?> + field($model->page, 'is_home')->checkbox([ + 'title' => Yii::t('WikiModule.base', 'Overwrite the wiki index start page?'), + 'disabled' => $model->isDisabledField('is_home'), + ]) ?> - field($model->page, 'admin_only')->checkbox([ - 'title' => Yii::t('WikiModule.base', 'Disable edit access for non wiki administrators?'), - 'disabled' => $model->isDisabledField('admin_only'), - ]) ?> + field($model, 'isPublic')->widget(ContentVisibilitySelect::class, [ + 'readonly' => $model->isDisabledField('isPublic'), + ]) ?> - field($model->page, 'is_container_menu')->checkbox([ - 'disabled' => $model->isDisabledField('is_container_menu'), - ]) ?> -
page->is_container_menu ? '' : 'class="d-none"' ?>> - field($model->page, 'container_menu_order')->textInput([ - 'disabled' => $model->isDisabledField('container_menu_order'), + field($model->page, 'admin_only')->checkbox([ + 'title' => Yii::t('WikiModule.base', 'Disable edit access for non wiki administrators?'), + 'disabled' => $model->isDisabledField('admin_only'), ]) ?> -
- field($model, 'hidden')->widget(ContentHiddenCheckbox::class) ?> + field($model->page, 'is_container_menu')->checkbox([ + 'disabled' => $model->isDisabledField('is_container_menu'), + ]) ?> +
page->is_container_menu ? '' : 'class="d-none"' ?>> + field($model->page, 'container_menu_order')->textInput([ + 'disabled' => $model->isDisabledField('container_menu_order'), + ]) ?> +
+ + field($model, 'hidden')->widget(ContentHiddenCheckbox::class) ?> - endCollapsibleFields(); ?> + endCollapsibleFields(); ?> - field($model, 'topics')->widget(TopicPicker::class, ['options' => ['disabled' => $model->isDisabledField('topics')]])->label(false) ?> + field($model, 'topics')->widget(TopicPicker::class, ['options' => ['disabled' => $model->isDisabledField('topics')]])->label(false) ?> -
+
- link($model->page->isNewRecord ? Url::toOverview($model->container) : Url::toWiki($model->page)) ?> - submit() ?> -
+ link($model->page->isNewRecord ? Url::toOverview($model->container) : Url::toWiki($model->page)) ?> + submit() ?> +
- + - + +
diff --git a/views/page/history.php b/views/page/history.php index e56d8c03..6a09c8c7 100644 --- a/views/page/history.php +++ b/views/page/history.php @@ -34,62 +34,64 @@ ?>
-
+
+
- 'wiki-page-content']) ?> + 'wiki-page-content']) ?> -
-
- $page]) ?> - $page, - 'buttons' => WikiMenu::LINK_BACK_TO_PAGE, - 'blocks' => [[WikiMenu::LINK_BACK_TO_PAGE], WikiMenu::BLOCK_START], - ]) ?> +
+
+ $page]) ?> + $page, + 'buttons' => WikiMenu::LINK_BACK_TO_PAGE, + 'blocks' => [[WikiMenu::LINK_BACK_TO_PAGE], WikiMenu::BLOCK_START], + ]) ?> +
+
-
-
-

title) ?>

+

title) ?>

+ +
    + + +
  • +
    revision, $revision->revision) : ''; ?>
    -
      - - -
    • -
      revision, $revision->revision) : ''; ?>
      +
      +

      + + title); ?> + +

      +
      + $revision->revision]) ?> + author): ?> + · author) ?> + + · cssClass('wiki-page-view-link') ?> +
      -
      -

      - - title); ?> - -

      -
      - $revision->revision]) ?> - author): ?> - · author) ?> - - · cssClass('wiki-page-view-link') ?>
      +
      • + + -
- - - +
+ $pagination]); ?> +
+ -
- $pagination]); ?> -
- + + action('wiki.History.compare') + ->cssClass('wiki-page-history-btn-compare') ?> + - - action('wiki.History.compare') - ->cssClass('wiki-page-history-btn-compare') ?> - - - + +
diff --git a/views/page/view.php b/views/page/view.php index f5ad0444..5a636473 100644 --- a/views/page/view.php +++ b/views/page/view.php @@ -16,17 +16,19 @@ ?>
-
- 'wiki-page-content']) ?> +
+
+ 'wiki-page-content']) ?> - render('_view_body', [ - 'page' => $page, - 'revision' => $revision, - 'canEdit' => $canEdit, - 'content' => $content, - ]) ?> + render('_view_body', [ + 'page' => $page, + 'revision' => $revision, + 'canEdit' => $canEdit, + 'content' => $content, + ]) ?> - + +
From 275357814d21161214a4ee19df6a2c9077fa77ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Farr=C3=A9?= Date: Wed, 17 Dec 2025 20:22:53 +0000 Subject: [PATCH 2/2] Add PR ID to CHANGELOG --- docs/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 8e172284..7207142e 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -3,7 +3,7 @@ Changelog 2.5.5 (Unreleased) ----------------------- -- Fix: `.row` HTML elements without `.container` overflow +- Fix #404: `.row` HTML elements without `.container` overflow 2.5.4 (December 12, 2025) -------------------------