replace .show, .hide, .fadeIn, use Badge widget

Author: felixhahnweilheim

resources/js/humhub.polls.js

@@ -40,7 +40,7 @@ humhub.module('polls', function (module, require, $) {
         var that = this;
         var $errorMessage = that.$.find('.errorMessage');
         this.loader();
-        $errorMessage.parent().hide();
+        $errorMessage.parent().addClass('d-none');
         client.submit(evt).then(function (response) {
             if (!response.errors) {
                 that.handleUpdateSuccess(response);
@@ -49,7 +49,7 @@ humhub.module('polls', function (module, require, $) {
                 $.each(response.errors, function (key, value) {
                     errors += value + '<br />';
                 });
-                $errorMessage.html(errors).parent().show();
+                $errorMessage.html(errors).parent().removeClass('d-none');
             }
         }).catch(Poll.handleUpdateError)
             .finally($.proxy(this.loader, this, false));
@@ -78,14 +78,14 @@ humhub.module('polls', function (module, require, $) {
         var $input = $newInputGroup.find('input');
 
         $input.val('');
-        $newInputGroup.hide();
+        $newInputGroup.addClass('d-none');
         $this.closest('.mb-3').after($newInputGroup);
         $this.children('span').removeClass('glyphicon-plus').addClass('glyphicon-trash');
         $this.off('click.humhub-action').on('click', function () {
             $this.closest('.mb-3').remove();
         });
         $this.removeAttr('data-action-click');
-        $newInputGroup.fadeIn('fast');
+        $newInputGroup.removeClass('d-none');
     };
 
     Poll.prototype.loader = function ($loader) {

widgets/views/entry.php

@@ -3,6 +3,7 @@
 use humhub\modules\content\widgets\richtext\RichText;
 use humhub\modules\polls\models\Poll;
 use humhub\helpers\Html;
+use humhub\widgets\bootstrap\Badge;
 
 humhub\modules\polls\assets\PollsAsset::register($this);
 
@@ -12,11 +13,11 @@
 <div data-poll="<?= $poll->id ?>" data-content-component="polls.Poll" data-content-key="<?= $poll->content->id ?>">
 
     <?php if ($poll->closed) : ?>
-        &nbsp;<span style="margin-left:3px;" class="label label-danger float-end"><?= Yii::t('PollsModule.base', 'Closed') ?></span>
+        &nbsp;<?= Badge::danger(Yii::t('PollsModule.base', 'Closed'))->style(['margin-left' => '3px'])->right() ?>
     <?php endif; ?>
 
     <?php if ($poll->anonymous) : ?>
-        &nbsp;<span class="label label-success float-end"><?= Yii::t('PollsModule.base', 'Anonymous') ?></span>
+        &nbsp;<?= Badge::success(Yii::t('PollsModule.base', 'Anonymous'))->right() ?>
     <?php endif; ?>
 
     <?= Html::beginForm($contentContainer->createUrl('/polls/poll/answer', ['pollId' => $poll->id])) ?>