Skip to content
Commits on Source (4)
......@@ -23,13 +23,13 @@ namespace ILIAS\Chatroom\Bans;
use ILIAS\Data;
use ILIAS\UI;
use Psr\Http\Message\ServerRequestInterface;
use ILIAS\HTTP\Services;
use ilArrayUtil;
use ilDateTime;
use ilDatePresentation;
use ilObjChatroomGUI;
use ilLanguage;
use ilCtrl;
use ilCtrlInterface;
use ILIAS\HTTP\GlobalHttpState;
class BannedUsersTable implements UI\Component\Table\DataRetrieval
{
......@@ -41,9 +41,9 @@ class BannedUsersTable implements UI\Component\Table\DataRetrieval
public function __construct(
private readonly int $room_id,
private readonly array $banned_users,
private readonly ilCtrl $ctrl,
private readonly ilCtrlInterface $ctrl,
private readonly ilLanguage $lng,
Services $http,
GlobalHttpState $http,
private readonly \ILIAS\UI\Factory $ui_factory
) {
$this->request = $http->request();
......
......@@ -92,6 +92,11 @@ class ilChatroomBanGUI extends ilChatroomGUIHandler
$room->unbanUser($users);
$this->mainTpl->setOnScreenMessage(
$this->mainTpl::MESSAGE_TYPE_SUCCESS,
$this->ilLng->txt('saved_successfully'),
true
);
$this->ilCtrl->redirect($this->gui, 'ban-show');
}
......
......@@ -145,7 +145,7 @@ class ilForumModeratorsGUI
$entries = $this->oForumModerators->getCurrentModerators();
if (count($usr_ids) === count($entries)) {
$this->tpl->setOnScreenMessage('failure', $this->lng->txt('frm_at_least_one_moderator'));
$this->tpl->setOnScreenMessage('failure', $this->lng->txt('frm_at_least_one_moderator'), true);
$this->ctrl->redirect($this, 'showModerators');
}
......
......@@ -866,8 +866,6 @@ class ilObjForumGUI extends ilObjectGUI implements ilDesktopItemHandling, ilForu
)->withViewControls($view_control);
}
$default_html = $this->renderer->render($vc_container);
$modals = $this->renderer->render($this->modal_collection);
$forwarder = new ilForumPageCommandForwarder(
......@@ -5922,8 +5920,9 @@ class ilObjForumGUI extends ilObjectGUI implements ilDesktopItemHandling, ilForu
$items[] = $this->uiFactory->button()->shy($this->lng->txt($lng_id), $url);
}
$action_menu = $this->uiFactory->dropdown()->standard($items);
$render_content = [$action_menu];
$dropdown = $this->uiFactory->dropdown()->standard($items);
$render_action_buttons = [$dropdown];
if (isset($primary_action, $primary_action_language_id)) {
if ($primary_action_language_id === 'activate_post') {
$action_button = $this->addActivationFormModal($node);
......@@ -5933,9 +5932,9 @@ class ilObjForumGUI extends ilObjectGUI implements ilDesktopItemHandling, ilForu
$primary_action
);
}
array_unshift($render_content, $action_button);
$tpl->setVariable('MAIN_ACTION', $this->uiRenderer->render($action_button));
}
$tpl->setVariable('COMMANDS', $this->uiRenderer->render($render_content));
$tpl->setVariable('DROPDOWN_ACTIONS', $this->uiRenderer->render($render_action_buttons));
}
}
......
......@@ -39,8 +39,16 @@
<!-- END attachments -->
</div>
</div>
<div class="ilFrmPostClear"></div><!-- BEGIN commands_block -->
<div class="ilFrmPostCommands ilForumInlineCommandContainer">{COMMANDS}</div><!-- END commands_block -->
<div class="ilFrmPostClear"></div>
<!-- BEGIN action_bar -->
<div class="il-item-actions l-bar__space-keeper">
<!-- BEGIN main_action --><div class="l-bar__element">{MAIN_ACTION}</div><!-- END main_action -->
<!-- BEGIN dropdown_actions --><div class="l-bar__element">{DROPDOWN_ACTIONS}</div><!-- END dropdown_actions -->
</div>
<!-- END action_bar -->
<!-- BEGIN commands_block
<div class="ilFrmPostCommands ilForumInlineCommandContainer">{COMMANDS}</div>--><!-- END commands_block -->
<div class="ilFrmPostClear"></div>
<!-- BEGIN edit_draft_anchor --><a id="{EDIT_DRAFT_ANCHOR}"></a><!-- END edit_draft_anchor -->
{DRAFT_FORM}
......
......@@ -260,6 +260,6 @@ li.ilPostingNeedsActivation {
display: flex;
}
.ilForumInlineCommandContainer > div {
margin-left: 10px;
.il-item-actions {
float: right;
}
\ No newline at end of file
......@@ -12707,8 +12707,8 @@ li.ilPostingNeedsActivation {
display: flex;
}
.ilForumInlineCommandContainer > div {
margin-left: 10px;
.il-item-actions {
float: right;
}
/* Modules/LearningModule */
......