Skip to content

Fix: Various visual issues since BS5 #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luke- merged 2 commits into from
Dec 29, 2025
Merged

Fix: Various visual issues since BS5 #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b75ac96
Fix: Various visual issues since BS5
marc-farre Dec 26, 2025
ca9d98c
Add PR ID to CHANGELOG
marc-farre Dec 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Changelog
1.4.3 - (Unreleased)
---------------------------
- Enh #164: Convert swagger docs to OpenAPI 3.0
- Fix #167: Various visual issues since BS5

1.4.2 (November 11, 2025)
-------------------------
Expand Down
12 changes: 7 additions & 5 deletions views/poll/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?php

use humhub\modules\content\widgets\richtext\RichTextField;
use humhub\widgets\form\ActiveForm;
use humhub\helpers\Html;
use humhub\modules\content\widgets\richtext\RichTextField;
use humhub\modules\polls\widgets\AddAnswerInput;
use humhub\widgets\bootstrap\Button;
use humhub\widgets\bootstrap\Alert;
use humhub\modules\ui\icon\widgets\Icon;
use humhub\widgets\bootstrap\Alert;
use humhub\widgets\bootstrap\Button;
use humhub\widgets\form\ActiveForm;

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

Expand All @@ -15,7 +15,9 @@

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

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

Expand Down
3 changes: 2 additions & 1 deletion widgets/views/_answer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,11 @@
<?php if ($poll->isShowResult()) : ?>
<div class="col-2 text-nowrap mt-3 p-0">
<?= !$poll->anonymous && $voteCount
? Link::asLink($voteText, $contentContainer->createUrl('/polls/poll/user-list-results', [
? Link::to($voteText, $contentContainer->createUrl('/polls/poll/user-list-results', [
'pollId' => $poll->id,
'answerId' => $answer->id,
]))
->cssClass('link-accent')
->options(['data-bs-target' => '#globalModal'])
->tooltip($userlist)
: $voteText ?>
Expand Down
8 changes: 5 additions & 3 deletions widgets/views/entry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

use humhub\helpers\Html;
use humhub\modules\content\widgets\richtext\RichText;
use humhub\modules\polls\models\Poll;
use humhub\helpers\Html;
use humhub\widgets\bootstrap\Alert;
use humhub\widgets\bootstrap\Badge;
use humhub\widgets\bootstrap\Button;
use humhub\widgets\bootstrap\Alert;

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

Expand Down Expand Up @@ -36,7 +36,9 @@

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

<?php if (!$poll->hasUserVoted() && !Yii::$app->user->isGuest && !$poll->closed) : ?>
Expand Down
4 changes: 2 additions & 2 deletions widgets/views/form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?php

use humhub\helpers\Html;
use humhub\modules\content\widgets\richtext\RichTextField;
use humhub\modules\content\widgets\WallCreateContentFormFooter;
use humhub\modules\polls\assets\PollsAsset;
use humhub\modules\polls\models\Poll;
use humhub\modules\polls\widgets\AddAnswerInput;
use humhub\widgets\form\ActiveForm;
use humhub\helpers\Html;

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

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