Skip to content

Commit b75ac96

Browse files
committed
Fix: Various visual issues since BS5
humhub/humhub-internal#992
1 parent 35d714f commit b75ac96

File tree

5 files changed

+17
-11
lines changed

5 files changed

+17
-11
lines changed

docs/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Changelog
44
1.4.3 - (Unreleased)
55
---------------------------
66
- Enh #164: Convert swagger docs to OpenAPI 3.0
7+
- Fix: Various visual issues since BS5
78

89
1.4.2 (November 11, 2025)
910
-------------------------

views/poll/edit.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?php
22

3-
use humhub\modules\content\widgets\richtext\RichTextField;
4-
use humhub\widgets\form\ActiveForm;
53
use humhub\helpers\Html;
4+
use humhub\modules\content\widgets\richtext\RichTextField;
65
use humhub\modules\polls\widgets\AddAnswerInput;
7-
use humhub\widgets\bootstrap\Button;
8-
use humhub\widgets\bootstrap\Alert;
96
use humhub\modules\ui\icon\widgets\Icon;
7+
use humhub\widgets\bootstrap\Alert;
8+
use humhub\widgets\bootstrap\Button;
9+
use humhub\widgets\form\ActiveForm;
1010

1111
/** @var $poll \humhub\modules\polls\models\Poll */
1212

@@ -15,7 +15,9 @@
1515

1616
<div data-poll="<?= $poll->id ?>" data-content-component="polls.Poll" data-content-key="<?= $poll->content->id ?>"
1717
class="content_edit" id="poll_edit_<?= $poll->id; ?>">
18-
<?= Alert::danger('<span class="errorMessage"></span>')->cssClass(['d-none']) ?>
18+
<?= Alert::danger('<span class="errorMessage"></span>')
19+
->cssClass(['d-none'])
20+
->closeButton(false) ?>
1921

2022
<?php $form = ActiveForm::begin(); ?>
2123

widgets/views/_answer.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,11 @@
5656
<?php if ($poll->isShowResult()) : ?>
5757
<div class="col-2 text-nowrap mt-3 p-0">
5858
<?= !$poll->anonymous && $voteCount
59-
? Link::asLink($voteText, $contentContainer->createUrl('/polls/poll/user-list-results', [
59+
? Link::to($voteText, $contentContainer->createUrl('/polls/poll/user-list-results', [
6060
'pollId' => $poll->id,
6161
'answerId' => $answer->id,
6262
]))
63+
->cssClass('link-accent')
6364
->options(['data-bs-target' => '#globalModal'])
6465
->tooltip($userlist)
6566
: $voteText ?>

widgets/views/entry.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

3+
use humhub\helpers\Html;
34
use humhub\modules\content\widgets\richtext\RichText;
45
use humhub\modules\polls\models\Poll;
5-
use humhub\helpers\Html;
6+
use humhub\widgets\bootstrap\Alert;
67
use humhub\widgets\bootstrap\Badge;
78
use humhub\widgets\bootstrap\Button;
8-
use humhub\widgets\bootstrap\Alert;
99

1010
humhub\modules\polls\assets\PollsAsset::register($this);
1111

@@ -36,7 +36,9 @@
3636

3737
<?php if(!$poll->isShowResult()) : ?>
3838
<br>
39-
<?= Alert::light(Yii::t('PollsModule.base', '<strong>Note:</strong> The result is hidden until the poll is closed by a moderator.'))->cssClass('m-0') ?>
39+
<?= Alert::light(Yii::t('PollsModule.base', '<strong>Note:</strong> The result is hidden until the poll is closed by a moderator.'))
40+
->cssClass('m-0')
41+
->closeButton(false) ?>
4042
<?php endif; ?>
4143

4244
<?php if (!$poll->hasUserVoted() && !Yii::$app->user->isGuest && !$poll->closed) : ?>

widgets/views/form.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?php
22

3+
use humhub\helpers\Html;
34
use humhub\modules\content\widgets\richtext\RichTextField;
45
use humhub\modules\content\widgets\WallCreateContentFormFooter;
56
use humhub\modules\polls\assets\PollsAsset;
67
use humhub\modules\polls\models\Poll;
78
use humhub\modules\polls\widgets\AddAnswerInput;
89
use humhub\widgets\form\ActiveForm;
9-
use humhub\helpers\Html;
1010

1111
/* @var $model Poll */
1212
/* @var $form ActiveForm */
@@ -25,7 +25,7 @@
2525
<?= Html::activeLabel($model, 'answersText', ['label' => Yii::t('PollsModule.base', 'Answers'), 'class' => 'control-label']); ?>
2626
<?= AddAnswerInput::widget(['name' => 'newAnswers[]', 'showTitle' => false]); ?>
2727

28-
<div class="container">
28+
<div class="container gx-0 overflow-x-hidden">
2929
<div class="row">
3030
<div class="col-md-6">
3131
<?= $form->field($model, 'allow_multiple')->checkbox() ?>

0 commit comments

Comments
 (0)